Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 66041: [EXPLORER] * Addendum to r66040: Fix the return types and remove unused parameters.
by dquintana＠svn.reactos.org 15 Jan '15

15 Jan '15

Author: dquintana Date: Thu Jan 15 17:58:16 2015 New Revision: 66041 URL: http://svn.reactos.org/svn/reactos?rev=66041&view=rev Log: [EXPLORER] * Addendum to r66040: Fix the return types and remove unused parameters. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Thu Jan 15 17:58:16 2015 @@ -417,7 +417,7 @@ return TRUE; } - LRESULT NotifyIconCmd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + BOOL NotifyIconCmd(WPARAM wParam, LPARAM lParam) { PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT) lParam; if (cpData->dwData == 1) @@ -1457,11 +1457,11 @@ return DrawBackground(hdc); } - LRESULT NotifyIconCmd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + BOOL NotifyIconCmd(WPARAM wParam, LPARAM lParam) { if (m_pager) { - return m_pager->NotifyIconCmd(uMsg, wParam, lParam, bHandled); + return m_pager->NotifyIconCmd(wParam, lParam); } return TRUE; @@ -1595,8 +1595,7 @@ BOOL TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) { - BOOL bDummy; - return pTrayNotify->NotifyIconCmd(0, wParam, lParam, bDummy); + return pTrayNotify->NotifyIconCmd(wParam, lParam); } BOOL

1 0

[dquintana] 66040: [EXPLORER] * Fix the notify window not resizing itself when the number of icons changes. * Add error prints when AlignControls fails and exits early. * Rename the Shell_NotifyIco...
by dquintana＠svn.reactos.org 15 Jan '15

15 Jan '15

Author: dquintana Date: Thu Jan 15 17:43:03 2015 New Revision: 66040 URL: http://svn.reactos.org/svn/reactos?rev=66040&view=rev Log: [EXPLORER] * Fix the notify window not resizing itself when the number of icons changes. * Add error prints when AlignControls fails and exits early. * Rename the Shell_NotifyIcon handler methods to something more appropriate. CORE-9061 #resolve Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Jan 15 17:43:03 2015 @@ -338,8 +338,7 @@ CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock, CTrayNotifyWnd** ppTrayNotify); BOOL -TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, -IN LPARAM lParam); +TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); BOOL TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock); Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Thu Jan 15 17:43:03 2015 @@ -417,7 +417,7 @@ return TRUE; } - LRESULT NotifyMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT NotifyIconCmd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT) lParam; if (cpData->dwData == 1) @@ -426,6 +426,7 @@ NOTIFYICONDATA *iconData; HWND parentHWND; RECT windowRect; + BOOL ret = FALSE; parentHWND = GetParent(); parentHWND = ::GetParent(parentHWND); ::GetClientRect(parentHWND, &windowRect); @@ -433,23 +434,30 @@ data = (PSYS_PAGER_COPY_DATA) cpData->lpData; iconData = &data->nicon_data; + TRACE("NotifyIconCmd received. Code=%d\n", data->notify_code); switch (data->notify_code) { case NIM_ADD: - return Toolbar.AddButton(iconData); + ret = Toolbar.AddButton(iconData); + break; case NIM_MODIFY: - return Toolbar.UpdateButton(iconData); + ret = Toolbar.UpdateButton(iconData); + break; case NIM_DELETE: - return Toolbar.RemoveButton(iconData); + ret = Toolbar.RemoveButton(iconData); + break; default: - TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); - break; - } + TRACE("NotifyIconCmd received with unknown code %d.\n", data->notify_code); + return FALSE; + } + SendMessage(parentHWND, WM_SIZE, 0, MAKELONG(windowRect.right - windowRect.left, - windowRect.bottom - windowRect.top)); + windowRect.bottom - windowRect.top)); + + return ret; } return TRUE; @@ -1449,11 +1457,11 @@ return DrawBackground(hdc); } - LRESULT NotifyMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT NotifyIconCmd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_pager) { - return m_pager->NotifyMsg(uMsg, wParam, lParam, bHandled); + return m_pager->NotifyIconCmd(uMsg, wParam, lParam, bHandled); } return TRUE; @@ -1585,10 +1593,10 @@ } BOOL -TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) +TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) { BOOL bDummy; - return pTrayNotify->NotifyMsg(0, wParam, lParam, bDummy); + return pTrayNotify->NotifyIconCmd(0, wParam, lParam, bDummy); } BOOL Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Jan 15 17:43:03 2015 @@ -1316,6 +1316,7 @@ { if (!GetClientRect(&rcClient)) { + ERR("Could not get client rect lastErr=%d\n", GetLastError()); return; } } @@ -1326,7 +1327,10 @@ the tray notification control */ dwp = BeginDeferWindowPos(3); if (dwp == NULL) + { + ERR("BeginDeferWindowPos failed. lastErr=%d\n", GetLastError()); return; + } /* Limit the Start button width to the client width, if neccessary */ StartSize = m_StartButton.GetSize(); @@ -1345,7 +1349,10 @@ StartSize.cy, SWP_NOZORDER | SWP_NOACTIVATE); if (dwp == NULL) + { + ERR("DeferWindowPos for start button failed. lastErr=%d\n", GetLastError()); return; + } } /* Determine the size that the tray notification window needs */ @@ -1381,7 +1388,10 @@ TraySize.cy, SWP_NOZORDER | SWP_NOACTIVATE); if (dwp == NULL) + { + ERR("DeferWindowPos for notification area failed. lastErr=%d\n", GetLastError()); return; + } } /* Resize/Move the rebar control */ @@ -2188,7 +2198,8 @@ { if (m_TrayNotify) { - return TrayNotify_NotifyMsg(m_TrayNotifyInstance, wParam, lParam); + TRACE("WM_COPYDATA notify message received. Handling...\n"); + return TrayNotify_NotifyIconCmd(m_TrayNotifyInstance, wParam, lParam); } return TRUE; }

1 0

[aandrejevic] 66039: [NTVDM] Implement INT 21h, AX = 38h (Get/Set Country-dependent Information). Patch by Pierre Schweitzer. Thanks!
by aandrejevic＠svn.reactos.org 14 Jan '15

14 Jan '15

Author: aandrejevic Date: Wed Jan 14 22:22:05 2015 New Revision: 66039 URL: http://svn.reactos.org/svn/reactos?rev=66039&view=rev Log: [NTVDM] Implement INT 21h, AX = 38h (Get/Set Country-dependent Information). Patch by Pierre Schweitzer. Thanks! Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Wed Jan 14 22:22:05 2015 @@ -1469,6 +1469,8 @@ SYSTEMTIME SystemTime; PCHAR String; PDOS_INPUT_BUFFER InputBuffer; + PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer; + INT Return; /* Check the value in the AH register */ switch (getAH()) @@ -1992,6 +1994,65 @@ break; } + /* Get/Set Country-dependent Information */ + case 0x38: + { + CountryCodeBuffer = (PDOS_COUNTRY_CODE_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); + + if (getAL() == 0x00) + { + /* Get */ + Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE, + &CountryCodeBuffer->TimeFormat, + sizeof(CountryCodeBuffer->TimeFormat) / sizeof(TCHAR)); + if (Return == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(LOWORD(GetLastError())); + break; + } + + Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, + &CountryCodeBuffer->CurrencySymbol, + sizeof(CountryCodeBuffer->CurrencySymbol) / sizeof(TCHAR)); + if (Return == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(LOWORD(GetLastError())); + break; + } + + Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, + &CountryCodeBuffer->ThousandSep, + sizeof(CountryCodeBuffer->ThousandSep) / sizeof(TCHAR)); + if (Return == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(LOWORD(GetLastError())); + break; + } + + Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, + &CountryCodeBuffer->DecimalSep, + sizeof(CountryCodeBuffer->DecimalSep) / sizeof(TCHAR)); + if (Return == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(LOWORD(GetLastError())); + break; + } + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + } + + break; + } + /* Create Directory */ case 0x39: { Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Wed Jan 14 22:22:05 2015 @@ -158,6 +158,14 @@ DWORD StackLocation; DWORD EntryPoint; } DOS_EXEC_PARAM_BLOCK, *PDOS_EXEC_PARAM_BLOCK; + +typedef struct _DOS_COUNTRY_CODE_BUFFER +{ + WORD TimeFormat; + WORD CurrencySymbol; + WORD ThousandSep; + WORD DecimalSep; +} DOS_COUNTRY_CODE_BUFFER, *PDOS_COUNTRY_CODE_BUFFER; #pragma pack(pop)

1 0

[dreimer] 66038: [RAPPS] Improve the ReactOS Aplications Manager download dialog by Ismael Ferreras Morezuelas aka swyter CORE-9056 #resolve #comment Committed, thx for help ^^
by dreimer＠svn.reactos.org 14 Jan '15

14 Jan '15

Author: dreimer Date: Wed Jan 14 21:56:27 2015 New Revision: 66038 URL: http://svn.reactos.org/svn/reactos?rev=66038&view=rev Log: [RAPPS] Improve the ReactOS Aplications Manager download dialog by Ismael Ferreras Morezuelas aka swyter CORE-9056 #resolve #comment Committed, thx for help ^^ Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -87,14 +87,14 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ð¡Ð²Ð°Ð»ÑÐ½Ðµ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 66 Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -88,14 +88,14 @@ PUSHBUTTON "Storno", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "StahovÃ¡nÃ..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Storno", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Storno", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Herunterladen..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Abbrechen", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "Download..." +CAPTION "Downloading..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Cancel", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -86,14 +86,14 @@ PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Descargando..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_DISABLED | NOT WS_BORDER, 0 + PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "TÃ©lÃ©charger..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Annuler", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -85,14 +85,14 @@ PUSHBUTTON "×××××", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "×××¨××..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "×××××", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "×××××", IDCANCEL, 83, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "Annulla", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download in corso" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annulla", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Annulla", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ãã¦ã³ãã¼ã..." FONT 9, "MS UI Gothic" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Lastet ned..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -91,14 +91,14 @@ PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÅciÄgnij..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Anuluj", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Anuluj", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -85,14 +85,14 @@ PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -89,14 +89,14 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Se descarcÄâ¦" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -83,14 +83,14 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -88,14 +88,14 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "SÅ¥ahujem ..." // StiahnuÅ¥ ??? FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -87,14 +87,14 @@ PUSHBUTTON "Anulo", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Shkarko..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Anulo", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Anulo", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -90,14 +90,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ladda ner..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -85,14 +85,14 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ä°ndiriliyor" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ä°ptal", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Ä°ptal", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -91,14 +91,14 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -85,14 +85,14 @@ PUSHBUTTON "åæ¶", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "æ£å¨ä¸è½½..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "åæ¶", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "åæ¶", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Wed Jan 14 21:56:27 2015 @@ -85,14 +85,14 @@ PUSHBUTTON "åæ¶", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "æ£å¨ä¸è¼..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "åæ¶", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "åæ¶", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66

1 0

[hpoussin] 66037: [NTOS:EX] Implement NtSystemDebugControl
by hpoussin＠svn.reactos.org 14 Jan '15

14 Jan '15

Author: hpoussin Date: Wed Jan 14 20:48:06 2015 New Revision: 66037 URL: http://svn.reactos.org/svn/reactos?rev=66037&view=rev Log: [NTOS:EX] Implement NtSystemDebugControl Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Wed Jan 14 20:48:06 2015 @@ -60,6 +60,47 @@ ULONG OutputBufferLength, PULONG ReturnLength) { - /* FIXME: TODO */ - return STATUS_SUCCESS; + switch (ControlCode) + { + case SysDbgQueryModuleInformation: + case SysDbgQueryTraceInformation: + case SysDbgSetTracepoint: + case SysDbgSetSpecialCall: + case SysDbgClearSpecialCalls: + case SysDbgQuerySpecialCalls: + case SysDbgQueryVersion: + case SysDbgReadVirtual: + case SysDbgWriteVirtual: + case SysDbgReadPhysical: + case SysDbgWritePhysical: + case SysDbgReadControlSpace: + case SysDbgWriteControlSpace: + case SysDbgReadIoSpace: + case SysDbgWriteIoSpace: + case SysDbgReadMsr: + case SysDbgWriteMsr: + case SysDbgReadBusData: + case SysDbgWriteBusData: + case SysDbgCheckLowMemory: + case SysDbgGetTriageDump: + return STATUS_NOT_IMPLEMENTED; + case SysDbgBreakPoint: + case SysDbgEnableKernelDebugger: + case SysDbgDisableKernelDebugger: + case SysDbgGetAutoKdEnable: + case SysDbgSetAutoKdEnable: + case SysDbgGetPrintBufferSize: + case SysDbgSetPrintBufferSize: + case SysDbgGetKdUmExceptionEnable: + case SysDbgSetKdUmExceptionEnable: + case SysDbgGetKdBlockEnable: + case SysDbgSetKdBlockEnable: + return KdSystemDebugControl( + ControlCode, + InputBuffer, InputBufferLength, + OutputBuffer, OutputBufferLength, + ReturnLength, KeGetPreviousMode()); + default: + return STATUS_INVALID_INFO_CLASS; + } }

1 0

[hbelusca] 66036: [FREELDR]: Addendum to PXE r66034: don't read after Path buffer validity.
by hbelusca＠svn.reactos.org 13 Jan '15

13 Jan '15

Author: hbelusca Date: Tue Jan 13 23:19:21 2015 New Revision: 66036 URL: http://svn.reactos.org/svn/reactos?rev=66036&view=rev Log: [FREELDR]: Addendum to PXE r66034: don't read after Path buffer validity. Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Tue Jan 13 23:19:21 2015 @@ -142,7 +142,7 @@ if (_OpenFile == NO_FILE || FileId != _OpenFile) return EBADF; - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.LowPart = _FileSize; Information->CurrentAddress.LowPart = _FilePosition; @@ -153,22 +153,27 @@ { t_PXENV_TFTP_GET_FSIZE sizeData; t_PXENV_TFTP_OPEN openData; - ULONG i; + SIZE_T PathLen, i; if (_OpenFile != NO_FILE) return EIO; if (OpenMode != OpenReadOnly) return EACCES; - for (i = 0; i < sizeof(_OpenFileName) - 1; i++) + /* Retrieve the path length without NULL terminator */ + PathLen = (Path ? min(strlen(Path), sizeof(_OpenFileName) - 1) : 0); + + /* Zero out the file name */ + RtlZeroMemory(_OpenFileName, sizeof(_OpenFileName)); + + /* Lowercase the path and always use slashes as separators */ + for (i = 0; i < PathLen; i++) { if (Path[i] == '\\') _OpenFileName[i] = '/'; else _OpenFileName[i] = tolower(Path[i]); } - while (i < sizeof(_OpenFileName)) - _OpenFileName[i++] = '\0'; RtlZeroMemory(&sizeData, sizeof(sizeData)); sizeData.ServerIPAddress = _ServerIP; @@ -183,7 +188,7 @@ if (_FileSize < 1024 * 1024) { _CachedFile = FrLdrTempAlloc(_FileSize, TAG_PXE_FILE); - // Don't check for allocation failure, we support _CachedFile = NULL + // Don't check for allocation failure, we support _CachedFile == NULL } _CachedLength = 0;

1 0

[hpoussin] 66035: [FREELDR] PXE: support backward seeking
by hpoussin＠svn.reactos.org 13 Jan '15

13 Jan '15

Author: hpoussin Date: Tue Jan 13 20:08:23 2015 New Revision: 66035 URL: http://svn.reactos.org/svn/reactos?rev=66035&view=rev Log: [FREELDR] PXE: support backward seeking Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Tue Jan 13 20:08:23 2015 @@ -263,8 +263,13 @@ return EINVAL; if (!_CachedFile && Position->LowPart < _FilePosition) - // We don't support backward seek without caching - return EINVAL; + { + // Close and reopen the file to go to position 0 + if (PxeClose(FileId) != ESUCCESS) + return EIO; + if (PxeOpen(_OpenFileName, OpenReadOnly, &FileId) != ESUCCESS) + return EIO; + } RtlZeroMemory(&readData, sizeof(readData)); readData.Buffer.segment = ((UINT32)_Packet & 0xf0000) / 16;

1 0

[hpoussin] 66034: [FREELDR] PXE: always use slashes for subdirectories and use lower casing
by hpoussin＠svn.reactos.org 13 Jan '15

13 Jan '15

Author: hpoussin Date: Tue Jan 13 20:08:18 2015 New Revision: 66034 URL: http://svn.reactos.org/svn/reactos?rev=66034&view=rev Log: [FREELDR] PXE: always use slashes for subdirectories and use lower casing Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Tue Jan 13 20:08:18 2015 @@ -29,6 +29,7 @@ static IP4 _ServerIP = { 0, }; static ULONG _OpenFile = NO_FILE; +static CHAR _OpenFileName[128]; static ULONG _FileSize = 0; static ULONG _FilePosition = 0; static ULONG _PacketPosition = 0; @@ -152,15 +153,26 @@ { t_PXENV_TFTP_GET_FSIZE sizeData; t_PXENV_TFTP_OPEN openData; + ULONG i; if (_OpenFile != NO_FILE) return EIO; if (OpenMode != OpenReadOnly) return EACCES; + for (i = 0; i < sizeof(_OpenFileName) - 1; i++) + { + if (Path[i] == '\\') + _OpenFileName[i] = '/'; + else + _OpenFileName[i] = tolower(Path[i]); + } + while (i < sizeof(_OpenFileName)) + _OpenFileName[i++] = '\0'; + RtlZeroMemory(&sizeData, sizeof(sizeData)); sizeData.ServerIPAddress = _ServerIP; - strncpy((CHAR*)sizeData.FileName, Path, sizeof(sizeData.FileName)); + RtlCopyMemory(sizeData.FileName, _OpenFileName, sizeof(_OpenFileName)); if (!CallPxe(PXENV_TFTP_GET_FSIZE, &sizeData)) { ERR("Failed to get '%s' size\n", Path); @@ -177,7 +189,7 @@ RtlZeroMemory(&openData, sizeof(openData)); openData.ServerIPAddress = _ServerIP; - strncpy((CHAR*)openData.FileName, Path, sizeof(openData.FileName)); + RtlCopyMemory(openData.FileName, _OpenFileName, sizeof(_OpenFileName)); openData.PacketSize = sizeof(_Packet); if (!CallPxe(PXENV_TFTP_OPEN, &openData))

1 0

[hpoussin] 66033: [FREELDR] Support failing to load some boot drivers In that case, simply skip it and try the next one.
by hpoussin＠svn.reactos.org 13 Jan '15

13 Jan '15

Author: hpoussin Date: Tue Jan 13 20:08:14 2015 New Revision: 66033 URL: http://svn.reactos.org/svn/reactos?rev=66033&view=rev Log: [FREELDR] Support failing to load some boot drivers In that case, simply skip it and try the next one. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Jan 13 20:08:14 2015 @@ -301,6 +301,7 @@ PLIST_ENTRY NextBd; PBOOT_DRIVER_LIST_ENTRY BootDriver; BOOLEAN Success; + BOOLEAN ret = TRUE; // Walk through the boot drivers list NextBd = LoaderBlock->BootDriverListHead.Flink; @@ -321,24 +322,28 @@ 0, &BootDriver->LdrEntry); - // If loading failed - cry loudly - //FIXME: Maybe remove it from the list and try to continue? - if (!Success) + if (Success) { - ERR("Can't load boot driver '%wZ'!", &BootDriver->FilePath); + // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore + BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer); + BootDriver->FilePath.Buffer = PaToVa(BootDriver->FilePath.Buffer); + BootDriver->LdrEntry = PaToVa(BootDriver->LdrEntry); + } + else + { + // Loading failed - cry loudly + ERR("Can't load boot driver '%wZ'!\n", &BootDriver->FilePath); UiMessageBox("Can't load boot driver '%wZ'!", &BootDriver->FilePath); - return FALSE; + ret = FALSE; + + // Remove it from the list and try to continue + RemoveEntryList(NextBd); } - // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore - BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer); - BootDriver->FilePath.Buffer = PaToVa(BootDriver->FilePath.Buffer); - BootDriver->LdrEntry = PaToVa(BootDriver->LdrEntry); - NextBd = BootDriver->Link.Flink; } - return TRUE; + return ret; } PVOID

1 0

[jimtabor] 66032: [Win32ss] - Remove hack to work around issue CORE-9039. - Bypass two more DDE message calls from callback. Remove unneeded code.
by jimtabor＠svn.reactos.org 12 Jan '15

12 Jan '15

Author: jimtabor Date: Mon Jan 12 22:50:12 2015 New Revision: 66032 URL: http://svn.reactos.org/svn/reactos?rev=66032&view=rev Log: [Win32ss] - Remove hack to work around issue CORE-9039. - Bypass two more DDE message calls from callback. Remove unneeded code. Modified: trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Mon Jan 12 22:50:12 2015 @@ -94,14 +94,6 @@ RtlCopyMemory(Common, ResultPointer, ArgumentLength); - ///// HAX! - if ( Common->size == 0xdeadbeef ) - { - ERR("DDE Post callback failed! 2 status %p\n",Status); - IntCbFreeMemory(Argument); - return 0; - } - size = Common->size; *lParam = Common->lParam; *Buffer = Common->pvData; @@ -164,14 +156,6 @@ } RtlMoveMemory(Common, ResultPointer, ArgumentLength); - - ///// HAX! - if ( Common->size == 0xdeadbeef ) - { - ERR("DDE Get callback failed! 2 status %p\n",Status); - IntCbFreeMemory(Argument); - return FALSE; - } pMsg->lParam = Common->lParam; @@ -220,6 +204,12 @@ } TRACE("Invalid DDE Client Window handle\n"); return FALSE; + } + + if ( Msg == WM_DDE_REQUEST || Msg == WM_DDE_UNADVISE ) + { + // Do not bother to callback after validation. + return TRUE; } if ( Msg == WM_DDE_TERMINATE ) @@ -290,7 +280,7 @@ break; } break; - } + } default: break; } @@ -385,11 +375,6 @@ PWND pWndServer; PDDE_PROP pddeProp; - if (Msg == WM_DDE_ACK) - { - TRACE("Sending WM_DDE_ACK Client hwnd %p\n",pWnd->head.h); - } - if (pWnd->head.pti->ppi != gptiCurrent->ppi) { TRACE("Sending long DDE 0x%x\n",Msg); Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Mon Jan 12 22:50:12 2015 @@ -276,7 +276,6 @@ else { ERR("DDE Post CB Return bad msg 0x%x Size %d\n",Common->message,Common->size); - Common->size = 0xdeadbeef; // HACKSSS!! Return status does not work! Status = STATUS_UNSUCCESSFUL; } @@ -301,7 +300,6 @@ if (!Ret) { ERR("DDE Get CB Return bad msg 0x%x\n",Common->message); - Common->size = 0xdeadbeef; // HACKSSS!! Return status does not work! Status = STATUS_UNSUCCESSFUL; } return ZwCallbackReturn(Arguments, ArgumentLength, Status);

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