Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 33401: Fix some task switch window bugs
by weiden＠svn.reactos.org 10 May '08

10 May '08

Author: weiden Date: Fri May 9 20:45:08 2008 New Revision: 33401 URL: http://svn.reactos.org/svn/reactos?rev=33401&view=rev Log: Fix some task switch window bugs Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/tbsite.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -217,7 +217,7 @@ hr = IDropTargetHelper_DragEnter(This->DropTargetHelper, This->hwndTarget, pDataObject, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr)) @@ -274,7 +274,7 @@ HRESULT hr; hr = IDropTargetHelper_DragOver(This->DropTargetHelper, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr)) @@ -350,7 +350,7 @@ hr = IDropTargetHelper_Drop(This->DropTargetHelper, pDataObject, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr) && This->CanDrop) Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -26,7 +26,7 @@ /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ -#define DUMP_TASKS 0 +#define DUMP_TASKS 1 static const TCHAR szTaskSwitchWndClass[] = TEXT("MSTaskSwWClass"); static const TCHAR szRunningApps[] = TEXT("Running Applications"); @@ -135,17 +135,6 @@ #define TSW_TOOLBAR_SUBCLASS_ID 1 #define MAX_TASKS_COUNT (0x7FFF) - -#define MAKE_TASKITEM_PTR(ti) ((DWORD_PTR)ti) -#define MAKE_TASKGROUP_PTR(tg) (((DWORD_PTR)tg) | 1) -#define IS_TASKGROUP_PTR(p) ((((DWORD_PTR)p) & 1) != 0) -#define GET_TASKITEM_PTR(lp) ((PTASK_ITEM)(((DWORD_PTR)lp) & ~1)) -#define GET_TASKGROUP_PTR(lp) ((PTASK_GROUP)(((DWORD_PTR)lp) & ~1)) - -#define MAKE_TASKITEM_CMD_ID(id) ((INT)(id)) -#define MAKE_TASKGROUP_CMD_ID(id) ((INT)(id) | (1 << 15)) -#define IS_TASKGROUP_CMD_ID(id) ((((INT)(id)) & (1 << 15)) != 0) -#define GET_INDEX_FROM_CMD_ID(id) ((INT)(id) & MAX_TASKS_COUNT) static VOID TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This, IN BOOL bRedrawDisabled); @@ -286,7 +275,7 @@ NewIndex = CurrentGroup->Index + 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentGroup->Index + 1, - MAKE_TASKGROUP_CMD_ID(NewIndex))) + NewIndex)) { CurrentGroup->Index = NewIndex; } @@ -319,7 +308,7 @@ NewIndex = CurrentTaskItem->Index + 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentTaskItem->Index + 1, - MAKE_TASKITEM_CMD_ID(NewIndex))) + NewIndex)) { CurrentTaskItem->Index = NewIndex; } @@ -352,7 +341,7 @@ NewIndex = CurrentGroup->Index - 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentGroup->Index - 1, - MAKE_TASKGROUP_CMD_ID(NewIndex))) + NewIndex)) { CurrentGroup->Index = NewIndex; } @@ -385,7 +374,7 @@ NewIndex = CurrentTaskItem->Index - 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentTaskItem->Index - 1, - MAKE_TASKITEM_CMD_ID(NewIndex))) + NewIndex)) { CurrentTaskItem->Index = NewIndex; } @@ -570,7 +559,7 @@ tbBtn.iBitmap = 0; tbBtn.fsState = TBSTATE_ENABLED | TBSTATE_ELLIPSES; tbBtn.fsStyle = BTNS_CHECK | BTNS_NOPREFIX | BTNS_SHOWTEXT; - tbBtn.dwData = MAKE_TASKITEM_PTR(TaskItem); + tbBtn.dwData = TaskItem->Index; tbBtn.iString = (DWORD_PTR)TaskSwitchWnd_GetWndTextFromTaskItem(This, TaskItem); @@ -579,7 +568,7 @@ iIndex = TaskSwitchWnd_CalculateTaskItemNewButtonIndex(This, TaskItem); ASSERT(iIndex >= 0); - tbBtn.idCommand = MAKE_TASKITEM_CMD_ID(iIndex); + tbBtn.idCommand = iIndex; TaskSwitchWnd_BeginUpdate(This); @@ -719,6 +708,7 @@ } /* Remove the group from the list */ + ASSERT(TaskGroup == CurrentGroup); *PrevLink = TaskGroup->Next; /* Free the task group */ @@ -819,39 +809,44 @@ return NULL; } - if (This->AllocatedTaskItems <= This->TaskItemCount) - { - if (This->TaskItemCount != 0) - { - PTASK_ITEM NewArray; - WORD NewArrayLength; - - NewArrayLength = This->AllocatedTaskItems + TASK_ITEM_ARRAY_ALLOC; - - NewArray = HeapReAlloc(hProcessHeap, - 0, - This->TaskItems, - NewArrayLength * sizeof(*This->TaskItems)); - if (NewArray != NULL) - { - This->AllocatedTaskItems = NewArrayLength; - This->TaskItems = NewArray; - } - else - return NULL; + ASSERT(This->AllocatedTaskItems >= This->TaskItemCount); + + if (This->TaskItemCount != 0) + { + PTASK_ITEM NewArray; + SIZE_T NewArrayLength, ActiveTaskItemIndex; + + NewArrayLength = This->AllocatedTaskItems + TASK_ITEM_ARRAY_ALLOC; + + NewArray = HeapReAlloc(hProcessHeap, + 0, + This->TaskItems, + NewArrayLength * sizeof(*This->TaskItems)); + if (NewArray != NULL) + { + if (This->ActiveTaskItem != NULL) + { + /* Fixup the ActiveTaskItem pointer */ + ActiveTaskItemIndex = This->ActiveTaskItem - This->TaskItems; + This->ActiveTaskItem = NewArray + ActiveTaskItemIndex; + } + This->AllocatedTaskItems = (WORD)NewArrayLength; + This->TaskItems = NewArray; } else - { - This->TaskItems = HeapAlloc(hProcessHeap, - 0, - TASK_ITEM_ARRAY_ALLOC * sizeof(*This->TaskItems)); - if (This->TaskItems != NULL) - { - This->AllocatedTaskItems = TASK_ITEM_ARRAY_ALLOC; - } - else - return NULL; - } + return NULL; + } + else + { + This->TaskItems = HeapAlloc(hProcessHeap, + 0, + TASK_ITEM_ARRAY_ALLOC * sizeof(*This->TaskItems)); + if (This->TaskItems != NULL) + { + This->AllocatedTaskItems = TASK_ITEM_ARRAY_ALLOC; + } + else + return NULL; } return This->TaskItems + This->TaskItemCount++; @@ -964,6 +959,43 @@ } } +static PTASK_ITEM +FindTaskItemByIndex(IN OUT PTASK_SWITCH_WND This, + IN INT Index) +{ + PTASK_ITEM TaskItem, LastItem; + + TaskItem = This->TaskItems; + LastItem = TaskItem + This->TaskItemCount; + while (TaskItem != LastItem) + { + if (TaskItem->Index == Index) + return TaskItem; + + TaskItem++; + } + + return NULL; +} + +static PTASK_GROUP +FindTaskGroupByIndex(IN OUT PTASK_SWITCH_WND This, + IN INT Index) +{ + PTASK_GROUP CurrentGroup; + + CurrentGroup = This->TaskGroups; + while (CurrentGroup != NULL) + { + if (CurrentGroup->Index == Index) + break; + + CurrentGroup = CurrentGroup->Next; + } + + return CurrentGroup; +} + static BOOL TaskSwitchWnd_AddTask(IN OUT PTASK_SWITCH_WND This, IN HWND hWnd) @@ -1211,9 +1243,9 @@ uiMin = GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE)); - if (NewBtnSize < uiMin) + if (NewBtnSize < (LONG)uiMin) NewBtnSize = uiMin; - if (NewBtnSize > uiMax) + if (NewBtnSize > (LONG)uiMax) NewBtnSize = uiMax; This->ButtonSize.cx = NewBtnSize; @@ -1392,7 +1424,7 @@ /* Register the shell hook */ This->ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK")); - hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); if (hShell32 != NULL) { REGSHELLHOOK RegShellHook; @@ -1405,8 +1437,6 @@ RegShellHook(This->hWnd, 3); /* 1 if no NT! We're targeting NT so we don't care! */ } - - FreeLibrary(hShell32); } /* Add all windows to the toolbar */ @@ -1434,7 +1464,7 @@ This->IsDestroying = TRUE; /* Unregister the shell hook */ - hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); if (hShell32 != NULL) { REGSHELLHOOK RegShellHook; @@ -1447,8 +1477,6 @@ RegShellHook(This->hWnd, FALSE); } - - FreeLibrary(hShell32); } TaskSwitchWnd_DeleteAllTasks(This); @@ -1604,16 +1632,21 @@ HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; HMODULE hUser32; + PTASK_GROUP TaskGroup; + PTASK_ITEM TaskItem; #if TASK_USE_DRAWCAPTIONTEMP != 0 UINT uidctFlags = DC_TEXT | DC_ICON | DC_NOSENDMSG; #endif - - if (!IS_TASKGROUP_PTR(nmtbcd->nmcd.lItemlParam)) - { - PTASK_ITEM TaskItem = GET_TASKITEM_PTR(nmtbcd->nmcd.lItemlParam); + TaskItem = FindTaskItemByIndex(This, + (INT)nmtbcd->nmcd.dwItemSpec); + TaskGroup = FindTaskGroupByIndex(This, + (INT)nmtbcd->nmcd.dwItemSpec); + if (TaskGroup == NULL && TaskItem != NULL) + { + ASSERT(TaskItem != NULL); if (TaskItem != NULL && IsWindow(TaskItem->hWnd)) { @@ -1717,14 +1750,9 @@ } } - else - { - PTASK_GROUP TaskGroup = GET_TASKGROUP_PTR(nmtbcd->nmcd.lItemlParam); - - if (TaskGroup != NULL) - { - /* FIXME: Implement painting for task groups */ - } + else if (TaskGroup != NULL) + { + /* FIXME: Implement painting for task groups */ } return Ret; Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… ============================================================================== --- trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -202,10 +202,17 @@ if (SUCCEEDED(hRet)) { /* Now let's read the CLSID from the stream and see if it's our task band */ +#if defined(IStream_Read) hRet = IStream_Read(pStm, &clsid, sizeof(clsid), &ulRead); +#else + ulRead = sizeof(clsid); + hRet = IStream_Read(pStm, + &clsid, + sizeof(clsid)); +#endif if (SUCCEEDED(hRet) && ulRead == sizeof(clsid)) { if (IsEqualGUID(&clsid, @@ -350,7 +357,7 @@ shell behavior! */ if (This->WindowEventHandler != NULL) { - DbgPrint("Calling IWindowEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar); + /*DbgPrint("Calling IWindowEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar);*/ hRet = IWindowEventHandler_ProcessMessage(This->WindowEventHandler, hWnd, uMsg, Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Fri May 9 20:45:08 2008 @@ -1,5 +1,9 @@ #ifndef __TODO_H #define __TODO_H + +#ifdef INTERFACE +#undef INTERFACE +#endif /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}}; Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -159,7 +159,7 @@ { if (Horizontal) { - if (szMax.cy + This->LineSizes[i].cy + This->LineSpacing > + if (szMax.cy + This->LineSizes[i].cy + (LONG)This->LineSpacing > pSize->cy - (2 * TRAY_CLOCK_WND_SPACING_Y)) { break; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -1010,8 +1010,7 @@ sizeof(bmp), &bmp) != 0) { - Size.cx += max(bmp.bmWidth, - GetSystemMetrics(SM_CXMINIMIZED)); + Size.cx += bmp.bmWidth; Size.cy += max(bmp.bmHeight, GetSystemMetrics(SM_CYCAPTION)); }

1 0

[janderwald] 33400: - when menu position cannot be found insert new item at the end - reduces winetest failures from 1550 to 1250 - behaviour verified on Windows Vista
by janderwald＠svn.reactos.org 09 May '08

09 May '08

Author: janderwald Date: Fri May 9 13:11:40 2008 New Revision: 33400 URL: http://svn.reactos.org/svn/reactos?rev=33400&view=rev Log: - when menu position cannot be found insert new item at the end - reduces winetest failures from 1550 to 1250 - behaviour verified on Windows Vista Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 9 13:11:40 2008 @@ -953,8 +953,9 @@ } if (SubMenu == NULL) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; + /* default to last position of menu */ + SubMenu = MenuObject; + pos = MenuObject->MenuInfo.MenuItemCount; }

1 0

[dreimer] 33399: Well... I forgot to revert some files... sry
by dreimer＠svn.reactos.org 09 May '08

09 May '08

Author: dreimer Date: Fri May 9 12:45:46 2008 New Revision: 33399 URL: http://svn.reactos.org/svn/reactos?rev=33399&view=rev Log: Well... I forgot to revert some files... sry Modified: trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Fri May 9 12:45:46 2008 @@ -71,7 +71,6 @@ ret = NULL; } } - TRACE("returning %p\n", ret); return ret; } @@ -97,7 +96,6 @@ InterlockedIncrement(&linkedBase->ref); TRACE("%p's ref count is %d\n", context, linkContext->ref); } - TRACE("returning %p\n", context); return context; } @@ -125,7 +123,7 @@ contextSize); } -PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) +PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize) { PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); @@ -244,7 +242,7 @@ list->contextInterface->free(toReplace); } else - list_add_head(&list->contexts, entry); + list_add_tail(&list->contexts, entry); LeaveCriticalSection(&list->cs); } return context; Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Fri May 9 12:45:46 2008 @@ -266,10 +266,10 @@ return ret; } -static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, - DWORD dwFlags, const void *pvData); - -static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, +static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); + +static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, DWORD *pcbData) { @@ -284,9 +284,10 @@ return ret; } -static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, - void *pvData, DWORD *pcbData) -{ +static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ + PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context; PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; @@ -301,17 +302,20 @@ if (ret) { if (!pvData) + { *pcbData = blob.cbData; + ret = TRUE; + } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; - ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; + ret = TRUE; } } else @@ -321,12 +325,12 @@ { case CERT_SHA1_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, - context->pbCrlEncoded, context->cbCrlEncoded, pvData, + pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, pcbData); break; case CERT_MD5_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, - context->pbCrlEncoded, context->cbCrlEncoded, pvData, + pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, pcbData); break; default: @@ -367,22 +371,19 @@ } else { - if (pCRLContext->hCertStore) - ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, - pvData, pcbData); - else - *(DWORD *)pvData = 0; + *(DWORD *)pvData = + CertStore_GetAccessState(pCRLContext->hCertStore); ret = TRUE; } break; default: - ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, + ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData, pcbData); } return ret; } -static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, +static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = @@ -459,7 +460,8 @@ SetLastError(E_INVALIDARG); return FALSE; } - ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); + ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags, + pvData); TRACE("returning %d\n", ret); return ret; } @@ -517,7 +519,10 @@ if (!pTimeToVerify) { - GetSystemTimeAsFileTime(&fileTime); + SYSTEMTIME sysTime; + + GetSystemTime(&sysTime); + SystemTimeToFileTime(&sysTime, &fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)

1 0

[dreimer] 33398: Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck Update XCOPY from wine.
by dreimer＠svn.reactos.org 09 May '08

09 May '08

Author: dreimer Date: Fri May 9 12:37:21 2008 New Revision: 33398 URL: http://svn.reactos.org/svn/reactos?rev=33398&view=rev Log: Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck Update XCOPY from wine. Added: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/No.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/include/psdk/ddeml.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/test.h trunk/reactos/include/reactos/wine/winuser.h Added: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,78 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Danish language support + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldigt parameter «%s»; brug «xcopy /?» for hjelp\n" + STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" + STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" + STRING_COPY, "%d fil(er) kopieret\n" + STRING_QISDIR, "Er «%s» et filnavn eller katalog\n" \ + "på destinationen?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" + STRING_OPENFAIL, "Kunne ikke åbne «%s»\n" + STRING_READFAIL, "Kunne ikke læse «%s»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +\n\ +Syntaks:\n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +hvor:\n\ +[/I] Antag at destinationen er et katalog hvis destinationen ikke\n\ + \tfindes og 2 eller flere filer bliver kopieret\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, også tomme kataloger\n\ +[/Q] Vær stille : vis ikke filnavne under kopiering\n\ +[/F] Fil hele kilde- og målnavn under kopiering\n\ +[/L] Simulér operationen; vis kun, gør intet\n\ +[/W] Spørg før koperingen starter\n\ +[/T] Lav tom katalogstruktur; kopier ikke filer\n\ +[/Y] Spørg ikke om filer skal overskrives\n\ +[/-Y] Spørg før om filer skal overskrives\n\ +[/P] Spørg om hver enkelt fil der skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Kopier kun filer som allerede findes på destinationen\n\ +[/R] Overskriv filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Fortsæt selv om det opstår fejl under kopieringen\n\ +[/A] Kopier ikke filer som er markeret som arkiv\n\ +[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering \n\ +[/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ + \t\tden opgivne dato.\n\ + \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ + \t\tdestinationen er ældre end kilden\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -20,10 +20,10 @@ */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n" STRING_INVPARM, "Invalid parameter '%s' - Use xcopy /? for help\n" STRING_PAUSE, "Press <enter> to begin copying\n" @@ -76,4 +76,4 @@ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n" -END +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼öÀÇ °¹¼ö - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" STRING_INVPARM, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼ö '%s' - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" @@ -73,8 +73,8 @@ [/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ [/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â \n\ \ÆÄÀÏ¸¸ º¹»ç \n\ -[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ -\t\tIf no date is supplied, only copy if destination is older\n\ -\t\tthan source\n\n" +[/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ +\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù \n\ +\t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" -END +} Added: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/No.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Norwegian Bokmål language support + * + * Copyright (C) 2008 Alexander N. Sørnes <alex(a)thehandofagony.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 + */ + + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldig parameter «%s»; bruk «xcopy /?» for hjelp\n" + STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" + STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n" + STRING_COPY, "%d fil(er) kopiert\n" + STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n" \ + "i målet?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Skrive over «%s»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" + STRING_OPENFAIL, "Klarte ikke åpne «%s»\n" + STRING_READFAIL, "Klarte ikke lese «%s»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +\n\ +Syntax:\n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\ + \tflere filer blir kopiert\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\ +[/Q] Stille modus: ikke vis filnavn under kopiering\n\ +[/F] Fil hele kilde- og målnavn under kopiering\n\ +[/L] Simuler operasjonen; vis bare hva som ville blitt kopiert\n\ +[/W] Spør for koperingen starter\n\ +[/T] Lag tom katalogstruktur; ikke kopier filer\n\ +[/Y] Ikke spør når filer skal overskrives\n\ +[/-Y] Spør før filer skal overskrives\n\ +[/P] Spør for hver kildefil som skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Bare kopier filer som allerede finnes i målet\n\ +[/R] Skriv over filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Fortsett selv om det oppstår feil under kopieringen\n\ +[/A] Ikke kopier filer som er markert som arkiv\n\ +[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\ +[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ + \t\tden oppgitte datoen.\n\ + \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ + \t\teldre i målet enn i kilden\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" STRING_INVPARM, "Nieznany parameter '%s' - uruchom xcopy /? aby wywietliæ pomoc\n" STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" @@ -76,4 +76,4 @@ \t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\ \t\tnowsze ni¿ w katalogu docelowym\n\n" -END +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\ ïîäðîáíîãî îïèñàíèÿ.\n" @@ -79,4 +79,4 @@ [/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\ òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n" -END +} Added: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Slovenian language support + * + * Copyright (C) 2008 Rok Mandeljc + * + * 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 + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy /?\n" + STRING_INVPARM, "Neveljaven parameter '%s' - za pomoÄ uporabite xcopy /?\n" + STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" + STRING_SIMCOPY, "Prekopiral bom %d datotek\n" + STRING_COPY, "Prekopiral sem %d datotek\n" + STRING_QISDIR, "Ali je '%s' ime ciljne datoteke \n" \ + "ali mape?\n" \ + "(D - Datoteka, M - Mapa)\n" + STRING_SRCPROMPT,"%s? (Da|Ne)\n" + STRING_OVERWRITE,"Ali naj prepiÅ¡em %s? (Da|Ne|Vse)\n" + STRING_COPYFAIL, "Kopiranje '%s' v '%s' ni uspelo (koda napake: %d)\n" + STRING_OPENFAIL, "Napaka pri odpiranju '%s'\n" + STRING_READFAIL, "Napaka pri branju '%s'\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "V" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "M" + + STRING_HELP, +"XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\ +\n\ +Sintaksa:\n\ +XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi, \n\ +\da je cilj mapa\n\ +[/S] Kopiraj mape in podmape\n\ +[/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\ +[/Q] Ne izpisuj imen med kopiranjem (tiho).\n\ +[/F] Med kopiranjem izpiÅ¡i polno izvorno in ciljno pot\n\ +[/L] Simuliraj operacijo; prikaÅ¾i imena datotek, ki bi jih kopiral\n\ +[/W] VkljuÄi poziv pred zaÄetkom kopiranja\n\ +[/T] Ustvari mape, vendar ne kopiraj datotek\n\ +[/Y] OnemogoÄi poziv ob prepisovanju datotek\n\ +[/-Y] OmogoÄi poziv ob prepisovanju datotek\n\ +[/P] Poziv pred kopiranjem vsake datoteke\n\ +[/N] Pri kopiranju uporabi kratka imena\n\ +[/U] Kopiraj samo datoteke, ki Å¾e obstajajo na cilju\n\ +[/R] PrepiÅ¡i datoteke, ki so oznaÄene samo za branje\n\ +[/H] V kopiranje vkljuÄu tudi skrite in sistemske datoteke\n\ +[/C] Nadaljuj tudi, Äe pride do napake med kopiranjem\n\ +[/A] Kopiraj samo datoteke, ki imajo atribut arhiva\n\ +[/M] Kopiraj samo datoteke, ki imajo atribut arhiva ter odstrani atribut\n\ +\tarhiva\n\ +[/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\ +\t\tÄe datum ni podan, gre za kopiranje datotek, katerih obstojeÄi cilj je\n\ +\t\tod izvora\n\n" + +} + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -23,11 +23,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Bg.rc" +#include "Da.rc" #include "De.rc" #include "El.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ru.rc" +#include "Si.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -794,7 +794,7 @@ /* ========================================================================= * Routine copied from cmd.exe md command - - * This works recursivly. so creating dir1\dir2\dir3 will create dir1 and + * This works recursively. so creating dir1\dir2\dir3 will create dir1 and * dir2 if they do not already exist. * ========================================================================= */ static BOOL XCOPY_CreateDirectory(const WCHAR* path) Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -71,6 +71,7 @@ ret = NULL; } } + TRACE("returning %p\n", ret); return ret; } @@ -96,6 +97,7 @@ InterlockedIncrement(&linkedBase->ref); TRACE("%p's ref count is %d\n", context, linkContext->ref); } + TRACE("returning %p\n", context); return context; } @@ -123,7 +125,7 @@ contextSize); } -PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize) +PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) { PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); @@ -242,7 +244,7 @@ list->contextInterface->free(toReplace); } else - list_add_tail(&list->contexts, entry); + list_add_head(&list->contexts, entry); LeaveCriticalSection(&list->cs); } return context; Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -266,10 +266,10 @@ return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, - DWORD dwFlags, const void *pvData); - -static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); + +static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, DWORD *pcbData) { @@ -284,10 +284,9 @@ return ret; } -static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, - void *pvData, DWORD *pcbData) -{ - PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context; +static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; @@ -302,20 +301,17 @@ if (ret) { if (!pvData) - { *pcbData = blob.cbData; - ret = TRUE; - } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; + ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; - ret = TRUE; } } else @@ -325,12 +321,12 @@ { case CERT_SHA1_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; case CERT_MD5_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; default: @@ -371,19 +367,22 @@ } else { - *(DWORD *)pvData = - CertStore_GetAccessState(pCRLContext->hCertStore); + if (pCRLContext->hCertStore) + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, + pvData, pcbData); + else + *(DWORD *)pvData = 0; ret = TRUE; } break; default: - ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData, + ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, pcbData); } return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = @@ -460,8 +459,7 @@ SetLastError(E_INVALIDARG); return FALSE; } - ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags, - pvData); + ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); TRACE("returning %d\n", ret); return ret; } @@ -519,10 +517,7 @@ if (!pTimeToVerify) { - SYSTEMTIME sysTime; - - GetSystemTime(&sysTime); - SystemTimeToFileTime(&sysTime, &fileTime); + GetSystemTimeAsFileTime(&fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0) Modified: trunk/reactos/include/psdk/ddeml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddeml.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ddeml.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddeml.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -192,6 +192,7 @@ #define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) #define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) #define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK) +#define XTYP_MONITOR (0x00F0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) #define XTYP_MASK 0x00F0 #define XTYP_SHIFT 4 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -3998,6 +3998,22 @@ PCWSTR lpFilePath; } ASSEMBLY_FILE_DETAILED_INFORMATION,*PASSEMBLY_FILE_DETAILED_INFORMATION; typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; + +#define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1 +#define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE 2 +#define ACTIVATION_CONTEXT_PATH_TYPE_URL 3 +#define ACTIVATION_CONTEXT_PATH_TYPE_ASSEMBLYREF 4 + +#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1 +#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2 +#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION 3 +#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION 4 +#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION 5 +#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6 +#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 +#define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 +#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 + #endif /* (WIN32_WINNT >= 0x0501) */ typedef struct _PROCESSOR_POWER_POLICY_INFO { Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -2475,6 +2475,8 @@ #define OBJID_CURSOR 0xFFFFFFF7 #define OBJID_ALERT 0xFFFFFFF6 #define OBJID_SOUND 0xFFFFFFF5 +#define OBJID_QUERYCLASSNAMEIDX 0xFFFFFFF4 +#define OBJID_NATIVEOM 0xFFFFFF0 #define GUI_CARETBLINKING 0x00000001 #define GUI_INMOVESIZE 0x00000002 #define GUI_INMENUMODE 0x00000004 Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -59,6 +59,7 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); +extern void winetest_wait_child_process( HANDLE process ); #ifdef STANDALONE #define START_TEST(name) \ @@ -342,6 +343,32 @@ return winetest_argc; } +void winetest_wait_child_process( HANDLE process ) +{ + DWORD exit_code = 1; + + if (WaitForSingleObject( process, 30000 )) + fprintf( stdout, "%s: child process wait failed\n", current_test->name ); + else + GetExitCodeProcess( process, &exit_code ); + + if (exit_code) + { + if (exit_code > 255) + { + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + InterlockedIncrement( &failures ); + } + else + { + fprintf( stdout, "%s: %u failures in child process\n", + current_test->name, exit_code ); + while (exit_code-- > 0) + InterlockedIncrement(&failures); + } + } +} + /* Find a test by name */ static const struct test *find_test( const char *name ) { Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -30,6 +30,15 @@ #define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492) #endif +/* MapVirtualKey translation types */ +#define MAPVK_VK_TO_VSC 0 +#define MAPVK_VSC_TO_VK 1 +#define MAPVK_VK_TO_CHAR 2 +#define MAPVK_VSC_TO_VK_EX 3 +#define MAPVK_VK_TO_VSC_EX 4 + +#define WM_SETVISIBLE 0x0009 + #define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))

1 0

[dreimer] 33397: Update of Winetests of non autosynched Dlls. Done by Kamil Horniceck
by dreimer＠svn.reactos.org 09 May '08

09 May '08

Author: dreimer Date: Fri May 9 12:35:45 2008 New Revision: 33397 URL: http://svn.reactos.org/svn/reactos?rev=33397&view=rev Log: Update of Winetests of non autosynched Dlls. Done by Kamil Horniceck Added: trunk/rostests/winetests/advapi32/cred.c (with props) trunk/rostests/winetests/advapi32/lsa.c (with props) trunk/rostests/winetests/advapi32/service.c (with props) trunk/rostests/winetests/gdi32/generated.c (with props) trunk/rostests/winetests/gdi32/icm.c (with props) trunk/rostests/winetests/gdi32/path.c (with props) trunk/rostests/winetests/gdi32/pen.c (with props) trunk/rostests/winetests/kernel32/actctx.c (with props) trunk/rostests/winetests/kernel32/debugger.c (with props) trunk/rostests/winetests/kernel32/loader.c (with props) trunk/rostests/winetests/kernel32/resource.c (with props) trunk/rostests/winetests/kernel32/resource.rc (with props) trunk/rostests/winetests/kernel32/toolhelp.c (with props) trunk/rostests/winetests/kernel32/version.c (with props) trunk/rostests/winetests/kernel32/volume.c (with props) trunk/rostests/winetests/msacm32/msacm.c (with props) trunk/rostests/winetests/msacm32/msacm32.rbuild (with props) trunk/rostests/winetests/msacm32/testlist.c (with props) trunk/rostests/winetests/shell32/shfldr_netplaces.c (with props) trunk/rostests/winetests/user32/broadcast.c (with props) trunk/rostests/winetests/user32/combo.c (with props) trunk/rostests/winetests/user32/cursoricon.c (with props) trunk/rostests/winetests/user32/generated.c (with props) trunk/rostests/winetests/user32/scroll.c (with props) trunk/rostests/winetests/user32/static.c (with props) trunk/rostests/winetests/user32/test_mono.bmp (with props) Modified: trunk/rostests/winetests/advapi32/advapi32.rbuild trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/crypt_lmhash.c trunk/rostests/winetests/advapi32/crypt_md4.c trunk/rostests/winetests/advapi32/crypt_md5.c trunk/rostests/winetests/advapi32/crypt_sha.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/testlist.c trunk/rostests/winetests/advpack/advpack.rbuild trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/browseui/autocomplete.c trunk/rostests/winetests/browseui/browseui.rbuild trunk/rostests/winetests/cabinet/cabinet.rbuild trunk/rostests/winetests/cabinet/fdi.c trunk/rostests/winetests/comcat/comcat.rbuild trunk/rostests/winetests/comctl32/comctl32.rbuild trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comdlg32/comdlg32.rbuild trunk/rostests/winetests/comdlg32/printdlg.c trunk/rostests/winetests/directory.rbuild trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/brush.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/gdi32.rbuild trunk/rostests/winetests/gdi32/gdiobj.c trunk/rostests/winetests/gdi32/mapping.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/palette.c trunk/rostests/winetests/gdi32/testlist.c trunk/rostests/winetests/hlink/hlink.rbuild trunk/rostests/winetests/icmp/icmp.rbuild trunk/rostests/winetests/imm32/imm32.c trunk/rostests/winetests/imm32/imm32.rbuild trunk/rostests/winetests/kernel32/alloc.c trunk/rostests/winetests/kernel32/atom.c trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/directory.c trunk/rostests/winetests/kernel32/drive.c trunk/rostests/winetests/kernel32/environ.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/kernel32.rbuild trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/mailslot.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/testlist.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/timer.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/lz32/lz32.rbuild trunk/rostests/winetests/mapi32/mapi32.rbuild trunk/rostests/winetests/mlang/mlang.rbuild trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/mshtml.rbuild trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/heap.c trunk/rostests/winetests/msvcrt/msvcrt.rbuild trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/time.c trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shell32/shell32.rbuild trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/clipboard.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/dialog.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/resource.c trunk/rostests/winetests/user32/resource.rc trunk/rostests/winetests/user32/sysparams.c trunk/rostests/winetests/user32/testlist.c trunk/rostests/winetests/user32/text.c trunk/rostests/winetests/user32/user32.rbuild trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c trunk/rostests/winetests/user32/wsprintf.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/advapi… Added: trunk/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/cred.c… Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… Modified: trunk/rostests/winetests/advapi32/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/crypt_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/crypt_sha.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Added: trunk/rostests/winetests/advapi32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/lsa.c?… Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… Added: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… Modified: trunk/rostests/winetests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/testli… Modified: trunk/rostests/winetests/advpack/advpack.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… Modified: trunk/rostests/winetests/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/browse… Modified: trunk/rostests/winetests/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/cabinet… Modified: trunk/rostests/winetests/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?r… Modified: trunk/rostests/winetests/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.r… Modified: trunk/rostests/winetests/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… Modified: trunk/rostests/winetests/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/comdlg… Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… Modified: trunk/rostests/winetests/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/brush.c?r… Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… Modified: trunk/rostests/winetests/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdiobj.c?… Added: trunk/rostests/winetests/gdi32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/generated… Added: trunk/rostests/winetests/gdi32/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/icm.c?rev… Modified: trunk/rostests/winetests/gdi32/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/mapping.c… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… Added: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… Added: trunk/rostests/winetests/gdi32/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/pen.c?rev… Modified: trunk/rostests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/testlist.… Modified: trunk/rostests/winetests/hlink/hlink.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.rbu… Modified: trunk/rostests/winetests/icmp/icmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/icmp/icmp.rbuil… Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… Modified: trunk/rostests/winetests/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.rbu… Added: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/alloc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/alloc.… Modified: trunk/rostests/winetests/kernel32/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/atom.c… Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Added: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/direct… Modified: trunk/rostests/winetests/kernel32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/drive.… Modified: trunk/rostests/winetests/kernel32/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/enviro… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/kernel… Added: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/mailsl… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… Added: trunk/rostests/winetests/kernel32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Added: trunk/rostests/winetests/kernel32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/timer.… Added: trunk/rostests/winetests/kernel32/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/toolhe… Added: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Added: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume… Modified: trunk/rostests/winetests/lz32/lz32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lz32.rbuil… Modified: trunk/rostests/winetests/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/mapi32.r… Modified: trunk/rostests/winetests/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.rbu… Added: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… Added: trunk/rostests/winetests/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm32… Added: trunk/rostests/winetests/msacm32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/testlis… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Modified: trunk/rostests/winetests/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml.r… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=33… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=3… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… Modified: trunk/rostests/winetests/msvcrt/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/heap.c?r… Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… Modified: trunk/rostests/winetests/shell32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/generat… Modified: trunk/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Added: trunk/rostests/winetests/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis… Added: trunk/rostests/winetests/user32/broadcast.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/broadcas… Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboar… Added: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… Added: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… Added: trunk/rostests/winetests/user32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/generate… Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… Modified: trunk/rostests/winetests/user32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource… Modified: trunk/rostests/winetests/user32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource… Added: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… Added: trunk/rostests/winetests/user32/static.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/static.c… Modified: trunk/rostests/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/sysparam… Added: trunk/rostests/winetests/user32/test_mono.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/test_mon… Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… Modified: trunk/rostests/winetests/user32/text.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/text.c?r… Modified: trunk/rostests/winetests/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/user32.r… Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… Modified: trunk/rostests/winetests/user32/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/wsprintf…

1 0

[cfinck] 33396: Convert the remaining ANSI-only stuff to TCHAR
by cfinck＠svn.reactos.org 09 May '08

09 May '08

Author: cfinck Date: Fri May 9 08:33:12 2008 New Revision: 33396 URL: http://svn.reactos.org/svn/reactos?rev=33396&view=rev Log: Convert the remaining ANSI-only stuff to TCHAR Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Fri May 9 08:33:12 2008 @@ -29,6 +29,12 @@ #ifndef IDC_STATIC #define IDC_STATIC ((DWORD)-1) +#endif + +#ifdef UNICODE +#define CF_TCHAR CF_UNICODETEXT +#else +#define CF_TCHAR CF_TEXT #endif #define CALC_VERSION TEXT("1.06") @@ -137,8 +143,8 @@ DWORD degr; DWORD action; HWND hStatWnd; - char *Clipboard; - char *ClipPtr; + TCHAR *Clipboard; + TCHAR *ClipPtr; unsigned int last_operator; unsigned int prev_operator; TCHAR sDecimal[8]; Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri May 9 08:33:12 2008 @@ -854,11 +854,8 @@ buffer = (TCHAR *)GlobalLock(clipbuffer); _tcscpy(buffer, ptr); GlobalUnlock(clipbuffer); -#ifdef UNICODE - SetClipboardData(CF_UNICODETEXT,clipbuffer); -#else - SetClipboardData(CF_TEXT,clipbuffer); -#endif + + SetClipboardData(CF_TCHAR, clipbuffer); CloseClipboard(); } } @@ -868,23 +865,23 @@ TCHAR display[sizeof(calc.buffer)]; SendDlgItemMessage(hWnd, IDC_TEXT_OUTPUT, WM_GETTEXT, (WPARAM)SIZEOF(display), (LPARAM)display); - if (calc.base == IDC_RADIO_DEC && strchr(calc.buffer, '.') == NULL) + if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, '.') == NULL) display[_tcslen(display)-calc.sDecimal_len] = TEXT('\0'); CopyMemToClipboard(display); } -static char *ReadClipboard(void) -{ - char *buffer = NULL; +static TCHAR *ReadClipboard(void) +{ + TCHAR *buffer = NULL; if (OpenClipboard(NULL)) { - HANDLE hData = GetClipboardData(CF_TEXT); - char *fromClipboard; + HANDLE hData = GetClipboardData(CF_TCHAR); + TCHAR *fromClipboard; if (hData != NULL) { - fromClipboard = (char *)GlobalLock(hData); - if (strlen(fromClipboard)) - buffer = _strupr(_strdup(fromClipboard)); + fromClipboard = (TCHAR *)GlobalLock(hData); + if (_tcslen(fromClipboard)) + buffer = _tcsupr(_tcsdup(fromClipboard)); GlobalUnlock( hData ); } CloseClipboard(); @@ -894,8 +891,9 @@ static void handle_clipboard_input(HWND hwnd) { - char *ptr = calc.ClipPtr; - int ch, x; + TCHAR *ptr = calc.ClipPtr; + TCHAR ch; + INT x; ch = *ptr++; if (ch == '\\') @@ -1522,7 +1520,7 @@ EnableMenuItem(GetSubMenu(GetMenu(hWnd), 0), IDM_EDIT_PASTE, MF_BYCOMMAND| - (IsClipboardFormatAvailable(CF_TEXT) ? + (IsClipboardFormatAvailable(CF_TCHAR) ? MF_ENABLED : MF_GRAYED)); break; case WM_EXITMENULOOP:

1 0

[dchapyshev] 33395: - Add new languages
by dchapyshev＠svn.reactos.org 09 May '08

09 May '08

Author: dchapyshev Date: Fri May 9 08:06:29 2008 New Revision: 33395 URL: http://svn.reactos.org/svn/reactos?rev=33395&view=rev Log: - Add new languages Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Fri May 9 08:06:29 2008 @@ -53,8 +53,13 @@ {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern",enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)",enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)",enUSPages,enUSErrorEntries, enUSStrings }, @@ -74,6 +79,7 @@ {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings },

1 0

[dchapyshev] 33394: - Add new layouts to bootcd - Add new languages
by dchapyshev＠svn.reactos.org 09 May '08

09 May '08

Author: dchapyshev Date: Fri May 9 08:06:00 2008 New Revision: 33394 URL: http://svn.reactos.org/svn/reactos?rev=33394&view=rev Log: - Add new layouts to bootcd - Add new languages Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri May 9 08:06:00 2008 @@ -168,8 +168,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text",0x00000000,"Polish (Programmers)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5035" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout File",0x00000000,"kbdbr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Text",0x00000000,"Portuguese (Brazilian ABNT2)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5126" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout File",0x00000000,"kbdpo.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text",0x00000000,"Portuguese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text",0x00000000,"Portuguese (Portugal)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5019" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout File",0x00000000,"kbdro.dll" @@ -204,6 +208,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010422","Layout Text",0x00000000,"Ukrainian (Student)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010422","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5141" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000423","Layout File",0x00000000,"kbdblr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000423","Layout Text",0x00000000,"Belarusian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000423","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5052" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout File",0x00000000,"kbdest.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Text",0x00000000,"Estonian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5042" @@ -220,6 +228,18 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042a","Layout Text",0x00000000,"Vietnamese" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5118" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout File",0x00000000,"kbdarme.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Text",0x00000000,"Armenian Eastern" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5120" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout File",0x00000000,"kbdazel.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Text",0x00000000,"Azeri Latin" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5117" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout File",0x00000000,"kbdaze.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout Text",0x00000000,"Azeri Cyrillic" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5115" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout File",0x00000000,"kbdmac.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Text",0x00000000,"Macedonian (FYRO)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5109" @@ -227,6 +247,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File",0x00000000,"kbdgeo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,"Georgian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout File",0x00000000,"kbdkaz.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout Text",0x00000000,"Kazakh" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5113" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000843","Layout File",0x00000000,"kbduzb.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000843","Layout Text",0x00000000,"Uzbek (Cyrillic)" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri May 9 08:06:00 2008 @@ -140,8 +140,13 @@ dll\directx\wine\d3d9\d3d9.dll 1 dll\keyboard\kbdal\kbdal.dll 1 +dll\keyboard\kbdarme\kbdarme.dll 1 +dll\keyboard\kbdaze\kbdaze.dll 1 +dll\keyboard\kbdazel\kbdazel.dll 1 dll\keyboard\kbdbgm\kbdbgm.dll 1 dll\keyboard\kbdbgt\kbdbgt.dll 1 +dll\keyboard\kbdblr\kbdblr.dll 1 +dll\keyboard\kbdbr\kbdbr.dll 1 dll\keyboard\kbdbga\kbdbga.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1 dll\keyboard\kbdbur\kbdbur.dll 1 @@ -165,6 +170,7 @@ dll\keyboard\kbdic\kbdic.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdkaz\kbdkaz.dll 1 dll\keyboard\kbdlt\kbdlt.dll 1 dll\keyboard\kbdlv\kbdlv.dll 1 dll\keyboard\kbdmac\kbdmac.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 9 08:06:00 2008 @@ -102,8 +102,13 @@ [Language] 0000041C = "Albanian" 00000401 = "Arabic" +0000042B = "Armenian Eastern" +0000082C = "Azeri Cyrillic" +0000042C = "Azeri Latin" +00000423 = "Belarusian" 00000813 = "Belgian (Dutch)" 0000080C = "Belgian (French)" +00000416 = "Brazilian" 00000402 = "Bulgarian" 00000455 = "Burmese" 00000C0C = "Canadian (French)" @@ -124,6 +129,7 @@ 0000040F = "Icelandic" 00000410 = "Italian" 00000411 = "Japanese" +0000043F = "Kazakh" 00000412 = "Korean" 00000426 = "Latvian" 00000427 = "Lithuanian" @@ -150,6 +156,10 @@ [KeyboardLayout] 0000041C = "Albanian" +0000042B = "Armenian Eastern" +0000082C = "Azeri Cyrillic" +0000042C = "Azeri Latin" +00000423 = "Belarusian" 00040402 = "Bulgarian BDS 5237-1978" 00020402 = "Bulgarian phonetic classic" 00030402 = "Bulgarian phonetic BDS 5237-2006" @@ -180,11 +190,13 @@ 0000040F = "Icelandic" 00000410 = "Italian" 00000411 = "Japanese" +0000043F = "Kazakh" 00000426 = "Latvian" 00000427 = "Lithuanian" 0000042F = "Macedonian (FYRO)" 00000414 = "Norwegian" 00000415 = "Polish (programmer's)" +00010416 = "Portuguese (Brazilian ABNT2)" 00000816 = "Portuguese (Portugal)" 00000418 = "Romanian" 00000419 = "Russian" @@ -243,6 +255,7 @@ 00000413 = kbdne.dll 00000414 = kbdno.dll 00000415 = kbdpl1.dll +00010416 = kbdbr.dll 00000816 = kbdpo.dll 00000418 = kbdro.dll 00000419 = kbdru.dll @@ -255,11 +268,16 @@ 00000809 = kbduk.dll 00000422 = kbdur.dll 00010422 = kbdurs.dll +00000423 = kbdblr.dll 00000425 = kbdest.dll 00000426 = kbdlv.dll 0000042A = kbdvntc.dll +0000042B = kbdarme.dll +0000042C = kbdazel.dll +0000082C = kbdaze.dll 0000042F = kbdmac.dll 00000437 = kbdgeo.dll +0000043F = kbdkaz.dll 00000843 = kbduzb.dll 00000444 = kbdtat.dll 00011009 = kbdcan.dll

1 0

[cfinck] 33393: Fix build (no idea why my rbuild didn't notice the "unicode" attribute change...)
by cfinck＠svn.reactos.org 09 May '08

09 May '08

Author: cfinck Date: Fri May 9 07:59:55 2008 New Revision: 33393 URL: http://svn.reactos.org/svn/reactos?rev=33393&view=rev Log: Fix build (no idea why my rbuild didn't notice the "unicode" attribute change...) Modified: trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri May 9 07:59:55 2008 @@ -1532,7 +1532,7 @@ return FALSE; } -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd) { MSG msg;

1 0

[dreimer] 33392: Bug 3217: shdocvw translation patch by Seungju Kim (admin@manateeshome.com) Bug 3228: Update for few slovak RCs by Mario Kacmar (kario@szm.sk) Some fixes and translation updates for winhelp and wordpad synched from wine Netherland Translation for charmap from Wouter Thierens
by dreimer＠svn.reactos.org 09 May '08

09 May '08

Author: dreimer Date: Fri May 9 07:45:47 2008 New Revision: 33392 URL: http://svn.reactos.org/svn/reactos?rev=33392&view=rev Log: Bug 3217: shdocvw translation patch by Seungju Kim (admin(a)manateeshome.com) Bug 3228: Update for few slovak RCs by Mario Kacmar (kario(a)szm.sk) Some fixes and translation updates for winhelp and wordpad synched from wine Netherland Translation for charmap from Wouter Thierens Added: trunk/reactos/base/applications/charmap/lang/nl-NL.rc (with props) trunk/reactos/base/applications/network/ipconfig/lang/sk-SK.rc (with props) trunk/reactos/base/applications/wordpad/Da.rc (with props) Removed: trunk/reactos/base/applications/winhelp/lang/pt-PT.rc trunk/reactos/base/applications/winhelp/lang/va-VA.rc Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/winhelp/hlpfile.c trunk/reactos/base/applications/winhelp/lang/ko-KO.rc trunk/reactos/base/applications/winhelp/lang/nl-NL.rc trunk/reactos/base/applications/winhelp/rsrc.rc trunk/reactos/base/applications/winhelp/winhelp.c trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc Added: trunk/reactos/base/applications/charmap/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/charmap/lang/nl-NL.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,0 +1,35 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Speciale tekens" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Lettertype:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Te kopiëren tekens:", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Selecteren", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Kopiëren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + //AUTOCHECKBOX "Geavanceerde weergave", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Over Speciale tekens" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Speciale tekens v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Sluiten", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "Over..." +END Propchange: trunk/reactos/base/applications/charmap/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -16,6 +16,7 @@ #include "lang/it-IT.rc" #include "lang/ko-KO.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -47,7 +47,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Správca zariadení v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Správca zariadení v0.1\nCopyright (C) 2006\nod Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Zavrie", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -16,6 +16,8 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" + Added: trunk/reactos/base/applications/network/ipconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,0 +1,69 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 07-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Vysielací" + IDS_P2P "Rovný s rovným" + IDS_MIXED "Zmieaný" + IDS_HYBRID "Hybridný" + IDS_UNKNOWN "Neznámy" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Iný adaptér" + IDS_ETH "Adaptér siete Ethernet" + IDS_TOKEN "Adaptér siete Token Ring" + IDS_FDDI "Adaptér FDDI" + IDS_PPP "Adaptér PPP" + IDS_LOOP "Adaptér pre spätnú sluèku" + IDS_SLIP "Adaptér SLIP" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nPOUITIE:\n \ + ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adapter |\n \ + /setclassid adapter [classid] ]\n \ + \n \ + where\n \ + adapter Connection name\n \ + (wildcard characters * and ? allowed, see examples)\n \ + \n \ + Options:\n \ + /? Display this help message\n \ + /all Display full configuration information.\n \ + /release Release the IP address for the specified adapter.\n \ + /renew Renew the IP address for the specified adapter.\n \ + /flushdns Purges the DNS Resolver cache.\n \ + /registerdns Refreshes all DHCP leases and re-registers DNS names.\n \ + /displaydns Display the contents of the DNS Resolver Cache.\n \ + /showclassid Displays all the dhcp class IDs allowed for adapter.\n \ + /setclassid Modifies the dhcp class id.\n \ + \n \ + The default is to display only the IP address, subnet mask and\n \ + default gateway for each adapter bound to TCP/IP.\n \ + \n \ + For Release and Renew, if no adapter name is specified, then the IP address\n \ + leases for all adapters bound to TCP/IP will be released or renewed.\n \ + \n \ + For Setclassid, if no ClassId is specified, then the ClassId is removed.\n \ + \n \ + Príklady:\n \ + > ipconfig ... Show information.\n \ + > ipconfig /all ... Show detailed information\n \ + > ipconfig /renew ... renew all adapters\n \ + > ipconfig /renew EL* ... renew any connection that has its\n \ + name starting with EL\n \ + > ipconfig /release *Con* ... release all matching connections,\n \ + napr. ""Lokálne pripojenie 1"" alebo\n \ + ""Lokálne pripojenie 2""\n" +END Propchange: trunk/reactos/base/applications/network/ipconfig/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhelp/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/hlpfile.c [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1542,7 +1542,7 @@ case BALTIC_CHARSET: cpg = 1257; break; case VIETNAMESE_CHARSET: cpg = 1258; break; case RUSSIAN_CHARSET: cpg = 1251; break; -// case EE_CHARSET: cpg = 1250; break; + case EE_CHARSET: cpg = 1250; break; case THAI_CHARSET: cpg = 874; break; case JOHAB_CHARSET: cpg = 1361; break; case MAC_CHARSET: ck = "mac"; break; Modified: trunk/reactos/base/applications/winhelp/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/ko-KO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/ko-KO.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -82,3 +82,26 @@ STID_FILE_NOT_FOUND_s "%sÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù'. ÀÌ ÆÄÀÏÀ» Á÷Á¢ Ã£°Ú½À´Ï±î?" STID_NO_RICHEDIT "richedit ±¸ÇöÀ» Ã£À»¼ö ¾÷½À´Ï´Ù.. Ãë¼ÒÁß" } + +CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "ÁÖ¼®...", MNID_CTXT_ANNOTATE + MENUITEM "º¹»ç", MNID_CTXT_COPY + MENUITEM "ÀÎ¼â...", MNID_CTXT_PRINT + POPUP "±Û²Ã" + BEGIN + MENUITEM "Á¼°Ô", MNID_CTXT_FONTS_SMALL + MENUITEM "º¸Åë", MNID_CTXT_FONTS_NORMAL + MENUITEM "³Ð°Ô", MNID_CTXT_FONTS_LARGE + END + POPUP "µµ¿ò¸» Ç×»ó º¸ÀÌ±â" + BEGIN + MENUITEM "±âº»", MNID_CTXT_HELP_DEFAULT + MENUITEM "º¸ÀÌ±â", MNID_CTXT_HELP_VISIBLE + MENUITEM "¾È º¸ÀÌ±â", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "½Ã½ºÅÛ »ö»ó »ç¿ë", MNID_CTXT_SYSTEM_COLORS + END +END Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/nl-NL.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -79,3 +79,26 @@ STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" } + +CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotering...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiëren", MNID_CTXT_COPY + MENUITEM "Print...", MNID_CTXT_PRINT + POPUP "Lettertypes" + BEGIN + MENUITEM "Klein", MNID_CTXT_FONTS_SMALL + MENUITEM "Normaal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Groot", MNID_CTXT_FONTS_LARGE + END + POPUP "Help altijd zichtbaar" + BEGIN + MENUITEM "Standaard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Zichtbaar", MNID_CTXT_HELP_VISIBLE + MENUITEM "Onzichtbaar", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS + END +END Removed: trunk/reactos/base/applications/winhelp/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/pt-PT.rc (removed) @@ -1,81 +1,0 @@ -/* - * Help Viewer - * Portuguese Language Support - * - * Copyright 1996 Ulrich Schmid - * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2003 Marcelo Duarte - * Copyright 2004 Américo José Melo - * - * 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 - */ - -/* Menu */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -MAIN_MENU MENU -BEGIN - POPUP "&Ficheiro" - BEGIN - MENUITEM "&Abrir...", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Imprimir", MNID_FILE_PRINT - MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "Sai&r", MNID_FILE_EXIT - END - POPUP "&Editar" - BEGIN - MENUITEM "&Copiar...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE - END - POPUP "In&dicador" - BEGIN - MENUITEM "&Definir...", MNID_BKMK_DEFINE - END - POPUP "Aj&uda" - BEGIN - MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Acerca do WINE", MNID_HELP_WINE -#endif - END -END - -/* Strings */ - -STRINGTABLE DISCARDABLE -BEGIN -STID_WINE_HELP, "Ajuda WINE" -STID_WHERROR, "ERRO" -STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" -STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_CONTENTS, "&Conteúdo" -STID_SEARCH, "&Procurar" -STID_BACK, "&Voltar" -STID_HISTORY, "&Histórico" -STID_TOPICS, "&Tópicos" -STID_ALL_FILES, "Todos os ficheiros (*.*)" -STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -END Removed: trunk/reactos/base/applications/winhelp/lang/va-VA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/va-VA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/va-VA.rc (removed) @@ -1,76 +1,0 @@ -/* - * Help Viewer - * - * Copyright 1996 Ulrich Schmid - * Rumantsch Ladin (Vallader) by mbaur(a)g26.ethz.ch - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * 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 - */ - -/* Menu */ - -/* -* language : switzerland romanch -* not supported today -*/ -MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_DEFAULT -{ - POPUP "&Datoteca" { - MENUITEM "&Rivir", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Stampar tema", MNID_FILE_PRINT - MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "&Finir", MNID_FILE_EXIT - } - POPUP "&Lavurar" { - MENUITEM "Capchar", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE - } - POPUP "&Marca" { - MENUITEM "&Definir...", MNID_BKMK_DEFINE - } - POPUP "&Agüd" { - MENUITEM "&Douvrar l'agüd", MNID_HELP_HELPON - MENUITEM "Adüna da&vant", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "Davart &WINE", MNID_HELP_WINE -#endif - } -} - -/* Strings */ - -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT -{ -WINE_HELP, "WINE agüd" -WHERROR, "SBAGL" -WARNING, "ATTENZIUN" -INFO, "INFUORMAZIUN" -NOT_IMPLEMENTED, "Na implementa" -HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'agüd `%s'" -CONTENTS, "&Cuntgnü" -SEARCH, "&Tscherchar" -BACK, "&Inavo" -HISTORY, "&Fin qua" -TOPICS, "T&opics" -ALL_FILES, "Tuot las datotecas (*.*)" -HELP_FILES_HLP, "Datotecas d'agüd (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -} Modified: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/rsrc.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -46,7 +46,6 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" -//#include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/winhelp/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/winhelp.c [iso-8859-1] Fri May 9 07:45:47 2008 @@ -782,7 +782,7 @@ { if (link->window == -1) wi = win->info; - else if ((link->window >= 0) && (link->window < hlpfile->numWindows)) + else if (link->window < hlpfile->numWindows) wi = &hlpfile->windows[link->window]; else { Added: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Da.rc (added) +++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,0 +1,237 @@ +/* + * Copyright 2008 by Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Åben ...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Gemme\tCtrl+S", ID_FILE_SAVE + MENUITEM "Gemme &som ...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Udskriv ...\tCtrl+P", ID_PRINT + MENUITEM "&Forhåndsvisning ...", ID_PREVIEW + MENUITEM "&Side indstillinger ...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Afslut", ID_FILE_EXIT + END + POPUP "R&ediger" + BEGIN + MENUITEM "&Fortryd\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Gendag\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Klip\tCtrl+X", ID_EDIT_CUT + MENUITEM "K&opier\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Indsæt\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR + MENUITEM "&Marker alt\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Søg efter ...\tCrtl+F", ID_FIND + MENUITEM "Søg efter &næste\tF3", ID_FIND_NEXT + MENUITEM "E&rstat ...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY + MENUITEM "Æ&ndret", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Ekstra" + BEGIN + MENUITEM "&Information om markeret område", ID_EDIT_SELECTIONINFO + MENUITEM "Tegn&format", ID_EDIT_CHARFORMAT + MENUITEM "Stan&dard tegnformat", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Afsnitsformat", ID_EDIT_PARAFORMAT + MENUITEM "&Hent tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Vis" + BEGIN + MENUITEM "Værk&tøjslinie", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatteringlinie", ID_TOGGLE_FORMATBAR + MENUITEM "&Lineal", ID_TOGGLE_RULER + MENUITEM "&Statuslinie", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Alternativer ...", ID_VIEWPROPERTIES + END + POPUP "&Indsæt" + BEGIN + MENUITEM "&Dato og tid ...", ID_DATETIME + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Skrifttype ...", ID_FONTSETTINGS + MENUITEM "&Bullets" ID_BULLET + MENUITEM "&Afsnit ..." ID_PARAFORMAT + MENUITEM "&Tabulatorer ..." ID_TABSTOPS + POPUP "&Baggrund" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "&Huskeseddel\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Hjælp" + BEGIN + MENUITEM "&Om Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Klip" ID_EDIT_CUT + MENUITEM "K&opier" ID_EDIT_COPY + MENUITEM "&Indsæt" ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullets" ID_BULLET + MENUITEM "&Afsnit ..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Dato og tid" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Tilgængelige formater",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ny" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Ny dokumenttype",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Annuller",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Formater afsnit" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indryk", 0, 10, 10, 120, 68 + LTEXT "Venstre", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Højre", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "Første linie", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Justering", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulatorer" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Tabulatorstop", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Fjern all&e", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Liniebrydning", 0, 10, 10, 130, 85 + RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "Værktøjslinier", 0, 150, 10, 120, 85 + CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statuslinie", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rig tekstformat (*.rtf)" + STRING_TEXT_FILES_TXT, "Tekstdokument (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-tekstdokument (*.txt)" + STRING_ALL_FILES, "Alle filer (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Rig tekstdokument" + STRING_NEWFILE_TXT, "Tekstdokument" + STRING_NEWFILE_TXT_UNICODE, "Tekstdokument (Unicode)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Venstrestillet" + STRING_ALIGN_RIGHT, "Højrestillet" + STRING_ALIGN_CENTER, "Midterstillet" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Printerfiler (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Alternativer" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Rig tekst" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Udskriv" + STRING_PREVIEW_NEXTPAGE, "Næste side" + STRING_PREVIEW_PREVPAGE, "Forrige side" + STRING_PREVIEW_TWOPAGES, "To sider" + STRING_PREVIEW_ONEPAGE, "Én side" + STRING_PREVIEW_CLOSE, "Luk" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Gemme ændringer i «%s»?" + STRING_SEARCH_FINISHED, "Færdig med at søge i dokumentet." + STRING_LOAD_RICHED_FAILED, "Kunne ikke indlæse RichEdit-biblioteket." + STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som " \ + "vil medføre at al formatering går tabt. Er du " \ + "sikker på at du vil fortsætte?" + STRING_INVALID_NUMBER, "Ugyldigt talformat" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understøttet" +END Propchange: trunk/reactos/base/applications/wordpad/Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -64,6 +64,7 @@ /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" +#include "Da.rc" #include "De.rc" #include "En.rc" #include "Fr.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Fri May 9 07:45:47 2008 @@ -2419,6 +2419,7 @@ set_caption(NULL); set_bar_states(); set_fileformat(SF_RTF); + SendMessageW(hEditorWnd, EM_EMPTYUNDOBUFFER, 0, 0); hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 - LTEXT "Nasledujúce aktualizácie môu by odstránené automaticky. Aktualizáciu odintalujete vybratím zo zonamu a kliknutím na tlaèidlo Odstráni.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Nasledujúce aktualizácie môu by odstránené automaticky. Aktualizáciu odintalujete vybratím zo zoznamu a kliknutím na tlaèidlo Odstráni.",-1,36,7,PROPSHEETWIDTH-48,22 LTEXT "Nájs:",-1,PROPSHEETPADDING,33,30,8 EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP LTEXT "Zobrazi:",-1,250,33,30,8 @@ -106,8 +106,8 @@ CAPTION "Vytvori odkaz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 - LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + LTEXT "Tento sprievodca Vám pomôe vytvori odkazy na miestne alebo\nsieové programy, súbory, prieèinky, poèítaèe, alebo internetové\nadresy.", -1, 120, 15, 200, 30 + LTEXT "Zadajte umiestnenie poloky:", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "&Preh¾adáva...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kliknite na tlaèidlo Ïalej pre pokraèovanie.", -1, 120, 97, 162, 10 @@ -118,7 +118,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + LTEXT "&Napíte názov pre tento odkaz:", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT LTEXT "Kliknite na tlaèidlo Dokonèi pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END @@ -159,13 +159,13 @@ IDS_ERROR "Chyba" IDS_UNABLEREAD_UNINSTSTR "Unable to read UninstallString. This entry is invalid or has been created by an MSI installer." IDS_UNABLEOPEN_UNINSTKEY "Unable to open Uninstall Key" - IDS_APPLIST "Currently installed programs" - IDS_UPDATESLIST "Currently installed updates" + IDS_APPLIST "Aktuálne naintalované programy" + IDS_UPDATESLIST "Aktuálne naintalované aktualizácie" IDS_LARGEICONS "Ve¾ké ikony" IDS_LIST "Zoznam" IDS_DETAILS "Podrobnosti" IDS_CREATE_SHORTCUT "Vytvori odkaz" - IDS_ERROR_NOT_FOUND "Súbor %s nebol najdený." + IDS_ERROR_NOT_FOUND "Súbor %s nebol nájdený." IDS_UNABLEREAD_INFORMATION "Unable to open Information Keys" IDS_NO_INFORMATION "iadne informácie" IDS_NONE_APP "Nie sú naintalované iadne programy." Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -9,29 +9,29 @@ CAPTION "Nastavenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + LTEXT "Vyberte sluby, ktoré chcete priradi ku kadému vstupnému jazyku uvedenému v zozname.\nPouite tlaèidlá Prida a Odstráni k úprave zoznamu.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "Pred&voli", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Prida...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "O&dstráni...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "Vl&astnosti...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Preferencie", -1, 7, 185, 240, 36 + PUSHBUTTON "Nastavenie &klávesov...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Key Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "To turn off Caps Lock", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "Press the CAPS &LOCK key", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP - AUTORADIOBUTTON "Press the SHI&FT key", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Hot keys for input languages", -1, 7, 37, 258, 95 +CAPTION "Rozírené nastavenia klávesov" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Vypnutie funkcie Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Stlaèením klávesu CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP //ten kláves, nie tá klávesa + AUTORADIOBUTTON " Stlaèením klávesu SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Klávesové skratky pre vstupné jazyky", -1, 7, 37, 258, 95 LTEXT "Akcia", -1, 14, 47, 60, 9 - RTEXT "&Key sequence", -1, 177, 47, 79, 9 + RTEXT "&Postupnos klávesov", -1, 177, 47, 79, 9 LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Change Key Sequence...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + PUSHBUTTON "&Zmeni postupnos klávesov...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Zrui", IDCANCEL, 146, 140, 70, 14 END @@ -80,7 +80,7 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Text Services and Input Languages" + IDS_CPLSYSTEMNAME "Textové sluby a vstupné jazyky" IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." IDS_KEYBOARD "Klávesnica" IDS_NONE "(None)" Modified: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 10-02-2008 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 10-02-2008 + * LAST CHANGE: 07-05-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -21,6 +22,6 @@ BEGIN IDS_QUERY_REBOOT_TEXT "Pre dokonèenie intalácie je potrebné retartova poèítaè. Chcete pokraèova?" IDS_QUERY_REBOOT_CAPTION "Retartova" - IDS_INF_FILE "Setup Information" + IDS_INF_FILE "Informácie o intalácii" END Modified: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ko.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,26 +1,12 @@ /* - * Copyright 2005 YunSong Hwang - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + *Korean Translation by manatails007(www.manatails007.org) Seungju Kim */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT 100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "¸ðÁú¶ó ¾×Æ¼ºê ¿¢½º ÄÁÆ®·Ñ ´Ù¿î·ÎµåÁß" +CAPTION "Mozilla ActiveX ÄÁÆ®·Ñ ´Ù¿î·Îµå Áß" FONT 8, "MS Shell Dlg" { CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 @@ -30,7 +16,7 @@ STRINGTABLE BEGIN - 1001 "ÀÌ Ç®±×¸²Àº ¾×Æ¼ºê¿¢½º ºê¶ó¿ìÀú °´Ã¼¸¦ ¿ä±¸ÇÕ´Ï´Ù.\n" \ - "±×·¯³ª ¸ðÁú¶ó ¾×Æ¼ºê ¿¢½º ÄÁÆ®·ÑÀÌ ÇöÀç ¼³Ä¡µÇ¾îÀÖÁö ¾Ê½À´Ï´Ù.\n" \ - "´ç½ÅÀº ´Ù¿î·ÎµåÇØ¼ ¼³Ä¡ÇÏ°Ú½À´Ï±î?" + 1001 "ÀÌ ÇÁ·Î±×·¥Àº Mozilla ActiveX ºê¶ó¿ìÀú °´Ã¼¸¦ ¿ä±¸ÇÕ´Ï´Ù.\n" \ + "±×·¯³ª Mozilla ActiveX ÄÁÆ®·ÑÀÌ ÇöÀç ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù.\n" \ + "´Ù¿î·ÎµåÇØ¼ ¼³Ä¡ÇÏ½Ã°Ú½À´Ï±î?" END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,7 +1,7 @@ -/* - * Kario (kario(a)szm.sk) - * partially translated - * 26-12-2007 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * NOTE : partially translated + * TRANSLATED : 26-12-2007 + * LAST CHANGE: 07-05-2008 */ /* @@ -312,11 +312,11 @@ CAPTION "Spusti ako" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 + LTEXT "Ktoré pouívate¾ské konto chcete poui k spusteniu tohto programu?", -1, 10, 20, 220, 20 CHECKBOX "Aktuálny pouívate¾ %s", 14000, 10, 45, 150, 10 LTEXT "Chráni poèítaè a údaje pred neoprávnenými aktivitami programu", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 + CHECKBOX "Nasledujúci pouívate¾:", 14002, 10, 100, 90, 10 LTEXT "Meno pouívate¾a:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -608,9 +608,9 @@ IDS_OVERWRITEFILE_TEXT "Tento prieèinok u obsahuje súbor s názvom '%1'.\n\nChcete ho nahradi?" IDS_OVERWRITEFILE_CAPTION "Potvrdenie prepísania súboru" IDS_OVERWRITEFOLDER_TEXT "Tento prieèinok u obsahuje prieèinok s názvom '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + "Ak budú ma súbory v cie¾ovom prieèinku rovnaké názvy ako súbory\n"\ + "vo vybranom prieèinku, tak budú nahradené. Stále chcete presunú\n"\ + "alebo skopírova prieèinok?" /* message box strings */ IDS_RESTART_TITLE "Retartova" @@ -663,8 +663,8 @@ FCIDM_SHVIEW_NEWFOLDER "&Prieèinok" FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Monosti prieèinka" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" + IDS_RECYCLEBIN_LOCATION "Umiestnenia Koa" //Recycle Bin Location + IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" IDS_PICK_ICON_TITLE "Choose Icon" IDS_PICK_ICON_FILTER "Súbory ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" IDS_OPEN_WITH_FILTER "Spustite¾né súbory\0*.exe\0" Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Fri May 9 07:45:47 2008 @@ -1,6 +1,7 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 09-02-2008 - * THANKS TO : Filip Navara and Kamil Hornicek +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 09-02-2008 + * LAST CHANGE: 07-05-2008 + * THANKS TO : Filip Navara and Kamil Hornicek and all good people ;-) */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -79,7 +80,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Lokalizácia systému by mala súhlasi s jazykom aplikácií, "\ - "ktoré chcete pouíva. Localizácia urèí ako budú zobrazené "\ + "ktoré chcete pouíva. Lokalizácia urèí ako budú zobrazené "\ "èísla, meny a údaje kalendára.", IDC_STATIC, 53, 7, 253, 20 LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pre zmenu lokalizácie systému kliknite na Zmeni.", @@ -204,7 +205,7 @@ BEGIN IDS_SYS_TOOLS "Systémové nástroje" IDS_CMT_CHARMAP "Mapa znakov" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_KBSWITCH "Prepínaè rozloenia klávesnice" END @@ -244,7 +245,7 @@ IDS_SHORT_CHARMAP "Mapa znakov.lnk" IDS_SHORT_MAGNIFY "Lupa.lnk" IDS_SHORT_RDESKTOP "Vzdialená pracovná plocha.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_KBSWITCH "Prepínaè rozloenia klávesnice.lnk" END STRINGTABLE

1 0

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