Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 25298: activate openfile dialog (doesn't load files yet)
by cwittich＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: cwittich Date: Fri Jan 5 02:19:11 2007 New Revision: 25298 URL: http://svn.reactos.org/svn/reactos?rev=25298&view=rev Log: activate openfile dialog (doesn't load files yet) Modified: trunk/reactos/base/applications/wordpad/editwnd.c trunk/reactos/base/applications/wordpad/mainwnd.c trunk/reactos/base/applications/wordpad/opensave.c trunk/reactos/base/applications/wordpad/precomp.h Modified: trunk/reactos/base/applications/wordpad/editwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/editwnd.c (original) +++ trunk/reactos/base/applications/wordpad/editwnd.c Fri Jan 5 02:19:11 2007 @@ -147,7 +147,7 @@ Info->OpenInfo = OpenInfo; hWndEditor = CreateMDIWindow(szEditWndClass, - OpenInfo->lpImageName, + OpenInfo->lpDocumentName, WS_MAXIMIZE, CW_USEDEFAULT, CW_USEDEFAULT, Modified: trunk/reactos/base/applications/wordpad/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/mainwnd.c (original) +++ trunk/reactos/base/applications/wordpad/mainwnd.c Fri Jan 5 02:19:11 2007 @@ -160,8 +160,8 @@ WORD CmdId, HWND hControl) { - //static TCHAR szFileName[MAX_PATH]; - //static TCHAR szImageName[MAX_PATH]; + static TCHAR szFileName[MAX_PATH]; + static TCHAR szDocumentName[MAX_PATH]; UNREFERENCED_PARAMETER(hControl); @@ -176,7 +176,7 @@ LoadAndFormatString(hInstance, IDS_DEFAULT_NAME, - &OpenInfo.lpImageName, + &OpenInfo.lpDocumentName, ++Info->ImagesCreated); Ret = DialogBox(hInstance, @@ -200,21 +200,21 @@ case ID_OPEN: { -/* OPEN_EDIT_INFO OpenInfo; + OPEN_EDIT_INFO OpenInfo; if (DoOpenFile(Info->hSelf, - szFileName, / * full file path * / - szImageName)) / * file name * / + szFileName, /* full file path */ + szDocumentName)) /* file name */ { OpenInfo.CreateNew = FALSE; - OpenInfo.Open.lpImagePath = szFileName; - OpenInfo.lpImageName = szImageName; + OpenInfo.lpDocumentPath = szFileName; + OpenInfo.lpDocumentName = szDocumentName; CreateEditWindow(Info, &OpenInfo); } -*/ + } break; Modified: trunk/reactos/base/applications/wordpad/opensave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/opensave.c (original) +++ trunk/reactos/base/applications/wordpad/opensave.c Fri Jan 5 02:19:11 2007 @@ -30,7 +30,10 @@ { DWORD err; - static TCHAR Filter[] = _T("RichText files (*.rtf)\0*.rtf\0"); + static TCHAR Filter[] = _T("All documents (*.txt,*.rtf)\0*.txt;*.rtf\0") \ + _T("Rich Text Document (*.rtf)\0*.rtf\0") \ + _T("Text Document (*.txt)\0*.txt\0"); + ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; @@ -56,7 +59,8 @@ DoSaveFile(HWND hwnd) { TCHAR szFileName[MAX_PATH] = _T(""); - static TCHAR Filter[] = _T("RichText files (*.rtf)\0*.rtf\0"); + static TCHAR Filter[] = _T("Rich Text Document (*.rtf)\0*.rtf\0") \ + _T("Text Document (*.txt)\0*.txt\0"); ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; Modified: trunk/reactos/base/applications/wordpad/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/precomp.h (original) +++ trunk/reactos/base/applications/wordpad/precomp.h Fri Jan 5 02:19:11 2007 @@ -47,9 +47,9 @@ union { UINT DocType; /* new */ - LPTSTR lpImagePath; /* open */ + LPTSTR lpDocumentPath; /* open */ }; - LPTSTR lpImageName; + LPTSTR lpDocumentName; } OPEN_EDIT_INFO, *POPEN_EDIT_INFO;

1 0

[gedmurphy] 25297: Eric's cute control made me smile, so I've added some text to the windows. Note, as we can't use SetWindowText for these caption, the text must be drawn on manually (which makes for some icky code). This 'should' mean we can remove DC_TEXT in DrawCaption to get rid of those squares. However, removing these removes the gradient. Eric, any ideas other than painting over the white squares?
by gedmurphy＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: gedmurphy Date: Fri Jan 5 02:03:38 2007 New Revision: 25297 URL: http://svn.reactos.org/svn/reactos?rev=25297&view=rev Log: Eric's cute control made me smile, so I've added some text to the windows. Note, as we can't use SetWindowText for these caption, the text must be drawn on manually (which makes for some icky code). This 'should' mean we can remove DC_TEXT in DrawCaption to get rid of those squares. However, removing these removes the gradient. Eric, any ideas other than painting over the white squares? Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Fri Jan 5 02:03:38 2007 @@ -122,3 +122,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Images (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Fri Jan 5 02:03:38 2007 @@ -116,3 +116,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Immagini (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Fri Jan 5 02:03:38 2007 @@ -120,3 +120,13 @@ IDS_BACKGROUND_COMDLG_FILTER "æ (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Fri Jan 5 02:03:38 2007 @@ -142,3 +142,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Fri Jan 5 02:03:38 2007 @@ -124,3 +124,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Ìàëþíêè (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Fri Jan 5 02:03:38 2007 @@ -114,3 +114,13 @@ IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu bodù" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Fri Jan 5 02:03:38 2007 @@ -118,3 +118,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Fri Jan 5 02:03:38 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 LTEXT "Select an image to use as your desktop wallpaper:", IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 @@ -23,7 +23,7 @@ GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Installed screensavers:",IDC_STATIC,13, 24, 150, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 @@ -71,7 +71,7 @@ LTEXT "More",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Colors",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 @@ -90,11 +90,11 @@ END END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLNAME "Display" IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." - + IDS_NONE "(None)" IDS_CENTER "Center" IDS_STRETCH "Stretch" @@ -116,3 +116,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Fri Jan 5 02:03:38 2007 @@ -121,3 +121,13 @@ IDS_COLOR_32BIT "La más alta (32 bits)" IDS_PIXEL "%lu por %lu píxeles" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Fri Jan 5 02:03:38 2007 @@ -120,3 +120,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Åéêüíåò (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Fri Jan 5 02:03:38 2007 @@ -108,3 +108,13 @@ IDS_BACKGROUND_COMDLG_FILTER "Képek (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Fri Jan 5 02:03:38 2007 @@ -114,3 +114,13 @@ IDS_COLOR_32BIT "Ware kleuren (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Fri Jan 5 02:03:38 2007 @@ -59,7 +59,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "To miejsce pozosta³o celowo puste",IDC_STATIC,66, - 1590,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -115,3 +115,13 @@ IDS_COLOR_32BIT "True Color (32 Bitów)" IDS_PIXEL "%lux%lu pikseli" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Fri Jan 5 02:03:38 2007 @@ -39,6 +39,10 @@ RECT rcDialogButton; + LOGFONT CaptionFont; + LOGFONT DialogFont; + LOGFONT MenuFont; + } PREVIEW_DATA, *PPREVIEW_DATA; @@ -173,34 +177,63 @@ PAINTSTRUCT ps; RECT rc; + static TCHAR szInAct[32]; + static TCHAR szAct[32]; + static TCHAR szWinTxt[32]; + static TCHAR szMessBox[32]; + static TCHAR szMessText[32]; + static TCHAR szButText[4]; + pPreviewData = (PPREVIEW_DATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_CREATE: + { + NONCLIENTMETRICS NonClientMetrics; + pPreviewData = (PPREVIEW_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PREVIEW_DATA)); - if (pPreviewData) - { - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); - pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); - pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); - pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); - pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); - - pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); - pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); - - pPreviewData->cyCaption = 20; //GetSystemMetrics(SM_CYCAPTION); - } + if (!pPreviewData) + return -1; + + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); + pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); + pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); + pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); + pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); + + pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); + pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); + + pPreviewData->cyCaption = 20; //GetSystemMetrics(SM_CYCAPTION); + + /* load font info */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + pPreviewData->CaptionFont = NonClientMetrics.lfCaptionFont; + pPreviewData->MenuFont = NonClientMetrics.lfMenuFont; + pPreviewData->DialogFont = NonClientMetrics.lfMessageFont; + + LoadString(hApplet, IDS_INACTWIN, szInAct, sizeof(szInAct)); + LoadString(hApplet, IDS_ACTWIN, szAct, sizeof(szAct)); + LoadString(hApplet, IDS_WINTEXT, szWinTxt, sizeof(szWinTxt)); + LoadString(hApplet, IDS_MESSBOX, szMessBox, sizeof(szMessBox)); + LoadString(hApplet, IDS_MESSTEXT, szMessText, sizeof(szMessText)); + LoadString(hApplet, IDS_BUTTEXT, szButText, sizeof(szButText)); + break; + } case WM_SIZE: OnSize(LOWORD(lParam), HIWORD(lParam), pPreviewData); break; case WM_PAINT: + { + RECT tmpRc; + hdc = BeginPaint(hwnd, &ps); /* Desktop */ @@ -210,19 +243,40 @@ DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); DrawCaption(hwnd, hdc, &pPreviewData->rcInactiveCaption, DC_GRADIENT | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE); + CopyMemory(&tmpRc, &pPreviewData->rcInactiveCaption, sizeof(RECT)); + tmpRc.left += 4; + tmpRc.top += 2; + SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont)); + SetTextColor(hdc, RGB(212,208,200)); + DrawText(hdc, szInAct, lstrlen(szInAct), &tmpRc, DT_LEFT); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); /* Active Window */ DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); DrawCaption(hwnd, hdc, &pPreviewData->rcActiveCaption, DC_ACTIVE | DC_GRADIENT | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE); + CopyMemory(&tmpRc, &pPreviewData->rcActiveCaption, sizeof(RECT)); + tmpRc.left += 4; + tmpRc.top += 2; + SetTextColor(hdc, RGB(255,255,255)); // FIXME: don't hardcode colors + SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont)); + DrawText(hdc, szAct, lstrlen(szAct), &tmpRc, DT_LEFT); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); /* FIXME: Draw the menu bar */ CopyRect(&rc, &pPreviewData->rcActiveClient); DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); FillRect(hdc, &rc, pPreviewData->hbrWindow); - /* FIXME: Draw the client text */ + /* Draw the client text */ + CopyMemory(&tmpRc, &pPreviewData->rcActiveClient, sizeof(RECT)); + tmpRc.left += 4; + tmpRc.top += 2; + SetTextColor(hdc, RGB(0,0,0)); + SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); + DrawText(hdc, szWinTxt, lstrlen(szWinTxt), &tmpRc, DT_LEFT); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); /* Draw the scroll bar */ DrawScrollbar(hdc, &pPreviewData->rcActiveScroll); @@ -232,13 +286,35 @@ DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); DrawCaption(hwnd, hdc, &pPreviewData->rcDialogCaption, DC_ACTIVE | DC_GRADIENT | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE); + CopyMemory(&tmpRc, &pPreviewData->rcDialogCaption, sizeof(RECT)); + tmpRc.left += 4; + tmpRc.top += 2; + SetTextColor(hdc, RGB(255,255,255)); + SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont)); + DrawText(hdc, szMessBox, lstrlen(szMessBox), &tmpRc, DT_LEFT); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); + + /* draw the dialog text */ + CopyMemory(&tmpRc, &pPreviewData->rcDialogClient, sizeof(RECT)); + tmpRc.left += 4; + tmpRc.top += 2; + SetTextColor(hdc, RGB(0,0,0)); + SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); + DrawText(hdc, szMessText, lstrlen(szMessText), &tmpRc, DT_LEFT); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); /* Draw Button */ DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); + CopyMemory(&tmpRc, &pPreviewData->rcDialogButton, sizeof(RECT)); + tmpRc.top += 6; + SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); + DrawText(hdc, szButText, lstrlen(szButText), &tmpRc, DT_CENTER); + DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); EndPaint(hwnd, &ps); break; + } case WM_DESTROY: DeleteObject(pPreviewData->hbrDesktop); Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Jan 5 02:03:38 2007 @@ -82,5 +82,13 @@ /* Appearance Page */ #define IDC_APPEARANCE_PREVIEW 1500 +#define IDS_INACTWIN 1510 +#define IDS_ACTWIN 1511 +#define IDS_WINTEXT 1512 +#define IDS_MESSBOX 1513 +#define IDS_MESSTEXT 1514 +#define IDS_BUTTEXT 1515 + + #endif /* __CPL_DESK_RESOURCE_H__ */ Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Fri Jan 5 02:03:38 2007 @@ -117,3 +117,13 @@ IDS_COLOR_32BIT "16,7 miljoner färger (32 Bit)" IDS_PIXEL "%lux%lu Pixlar" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" +END

1 0

[cwittich] 25296: change extensions in commdlg filter to rtf
by cwittich＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: cwittich Date: Fri Jan 5 01:35:34 2007 New Revision: 25296 URL: http://svn.reactos.org/svn/reactos?rev=25296&view=rev Log: change extensions in commdlg filter to rtf Modified: trunk/reactos/base/applications/wordpad/opensave.c Modified: trunk/reactos/base/applications/wordpad/opensave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/opensave.c (original) +++ trunk/reactos/base/applications/wordpad/opensave.c Fri Jan 5 01:35:34 2007 @@ -28,16 +28,9 @@ LPTSTR szFileName, LPTSTR szTitleName) { - DWORD err; - /*static TCHAR Filter[] = _T("All image files (*.gif,*.bmp,*.jpg,*.jpeg,*.tif,*.png)\0*.gif,*.bmp,*.jpg,*.jpeg,*.tif,*.png\0") \ - _T("All files (*.*)\0*.*\0") \ - _T("Graphics Interchange format (*gif)\0*.gif\0") \ - _T("Windows Bitmap (*bmp)\0*.bmp\0") \ - _T("JPEG File Interchange Format (*jpg,*.jpeg)\0*.jpg,*.jpeg\0") \ - _T("TAG Image File Format (*tif)\0*.tif\0") \ - _T("Portable Network Graphics (*png)\0*.png\0\0");*/ + DWORD err; - static TCHAR Filter[] = _T("Windows Bitmap (*.bmp)\0*.bmp\0"); + static TCHAR Filter[] = _T("RichText files (*.rtf)\0*.rtf\0"); ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; @@ -63,11 +56,7 @@ DoSaveFile(HWND hwnd) { TCHAR szFileName[MAX_PATH] = _T(""); - static TCHAR Filter[] = _T("Graphics Interchange format (*gif)\0*.gif\0") \ - _T("Windows Bitmap (*bmp)\0*.bmp\0") \ - _T("JPEG File Interchange Format (*jpg,*.jpeg)\0*.jpg,*.jpeg\0") \ - _T("TAG Image File Format (*tif)\0*.tif\0") \ - _T("Portable Network Graphics (*png)\0*.png\0\0"); + static TCHAR Filter[] = _T("RichText files (*.rtf)\0*.rtf\0"); ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; @@ -82,6 +71,6 @@ if (CommDlgExtendedError() != CDERR_GENERALCODES) MessageBox(NULL, _T("Save to file failed"), NULL, 0); - return FALSE; + return FALSE; }

1 0

[janderwald] 25295: - improve error checking
by janderwald＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: janderwald Date: Thu Jan 4 19:22:06 2007 New Revision: 25295 URL: http://svn.reactos.org/svn/reactos?rev=25295&view=rev Log: - improve error checking Modified: trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.c Modified: trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.c (original) +++ trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.c Thu Jan 4 19:22:06 2007 @@ -68,8 +68,14 @@ DPRINT("Creating DOS link\n"); /* Create the dos device link */ - IoCreateSymbolicLink(&SymlinkName, + s = IoCreateSymbolicLink(&SymlinkName, &DeviceName); + + if (!NT_SUCCESS(s)) + { + IoDeleteDevice(DeviceObject); + return s; + } DPRINT("Initializing device\n"); @@ -126,6 +132,7 @@ // Set state indication somehow // Failure - what error code do we give?! // return STATUS_???? + IoDeleteDevice(DeviceObject); return STATUS_UNSUCCESSFUL; }

1 0

[janderwald] 25294: - remove line
by janderwald＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: janderwald Date: Thu Jan 4 19:04:05 2007 New Revision: 25294 URL: http://svn.reactos.org/svn/reactos?rev=25294&view=rev Log: - remove line Modified: trunk/reactos/tools/rgenstat/module_list.txt Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt (original) +++ trunk/reactos/tools/rgenstat/module_list.txt Thu Jan 4 19:04:05 2007 @@ -134,4 +134,3 @@ wshtcpip drivers\network\wshtcpip framebuf drivers\video\displays\framebuf vgaddi drivers\video\displays\vga -Checking automatic dependencies...done

1 0

[janderwald] 25293: - order all tools in alphabetically order - add rgenstat to tools.mak
by janderwald＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: janderwald Date: Thu Jan 4 18:57:47 2007 New Revision: 25293 URL: http://svn.reactos.org/svn/reactos?rev=25293&view=rev Log: - order all tools in alphabetically order - add rgenstat to tools.mak Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=25293&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Thu Jan 4 18:57:47 2007 @@ -41,22 +41,23 @@ ${host_gcc} $(TOOLS_CPPFLAGS) -c $< -o $@ include tools/bin2c.mak -include tools/rsym.mak -include tools/raddr2line.mak -include tools/pefixup.mak include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak +include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak include tools/mkhive/mkhive.mak include tools/nci/nci.mak +include tools/pefixup.mak +include tools/raddr2line.mak include tools/rbuild/rbuild.mak +include tools/rgenstat/rgenstat.mak +include tools/rsym.mak +include tools/sysreg/sysreg.mak include tools/unicode/unicode.mak include tools/widl/widl.mak include tools/winebuild/winebuild.mak include tools/wmc/wmc.mak include tools/wpp/wpp.mak -include tools/wrc/wrc.mak -include tools/sysreg/sysreg.mak -include tools/dbgprint/dbgprint.mak +include tools/wrc/wrc.mak

1 0

[greatlrd] 25292: do not build hello as GUI apps it is CUI apps. printf is redirect in GUI apps and does not output to console. Now we change to CUI, printf are redirect to console when it build as CUI.
by greatlrd＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: greatlrd Date: Thu Jan 4 17:46:20 2007 New Revision: 25292 URL: http://svn.reactos.org/svn/reactos?rev=25292&view=rev Log: do not build hello as GUI apps it is CUI apps. printf is redirect in GUI apps and does not output to console. Now we change to CUI, printf are redirect to console when it build as CUI. Modified: trunk/rosapps/tests/hello/hello.rbuild Modified: trunk/rosapps/tests/hello/hello.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/hello/hello.rbuild?r… ============================================================================== --- trunk/rosapps/tests/hello/hello.rbuild (original) +++ trunk/rosapps/tests/hello/hello.rbuild Thu Jan 4 17:46:20 2007 @@ -1,4 +1,4 @@ -<module name="hello" type="win32gui" installbase="bin" installname="hello.exe"> +<module name="hello" type="win32cui" installbase="bin" installname="hello.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" />

1 0

[mbosma] 25291: Add Miranda 0.5.1 (0.6 does not work)
by mbosma＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: mbosma Date: Thu Jan 4 17:19:19 2007 New Revision: 25291 URL: http://svn.reactos.org/svn/reactos?rev=25291&view=rev Log: Add Miranda 0.5.1 (0.6 does not work) Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml Thu Jan 4 17:19:19 2007 @@ -19,6 +19,10 @@ <application name="Mozilla ActiveX Control"> <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> + <application name="Miranda IM"> + <description>Open source multiprotocol instant messaging application - May not work completely.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> </application> <application name="Putty"> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description>

1 0

[mbosma] 25290: Make Downloader perform better under ReactOS: - Use other font. - Redraw buttons at resize.
by mbosma＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: mbosma Date: Thu Jan 4 15:16:18 2007 New Revision: 25290 URL: http://svn.reactos.org/svn/reactos?rev=25290&view=rev Log: Make Downloader perform better under ReactOS: - Use other font. - Redraw buttons at resize. Modified: trunk/reactos/base/applications/downloader/main.c Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Thu Jan 4 15:16:18 2007 @@ -170,21 +170,6 @@ DeleteDC(hdcMem); } -HFONT GetFont (BOOL Title) -{ - int Height; - int Scale; - LOGFONT Font; - GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONT), &Font); - - Height = Title ? 20 : 19; - Scale = Font.lfWidth/Font.lfHeight; - - return CreateFont(Height, Height*Scale, Font.lfEscapement, Font.lfOrientation, Title ? FW_EXTRABOLD : FW_NORMAL, Font.lfItalic, - Font.lfUnderline, Font.lfStrikeOut, Font.lfCharSet, Font.lfOutPrecision, Font.lfClipPrecision, Font.lfQuality, - Font.lfPitchAndFamily, Font.lfFaceName); -} - static void DrawDescription (HDC hdc, RECT DescriptionRect) { int i; @@ -199,13 +184,15 @@ DrawBitmap(hdc, i, DescriptionRect.top+22, hUnderline); // less code then stretching ;) // Headline - Font = GetFont(TRUE); + Font = CreateFont(-16 , 0, 0, 0, FW_EXTRABOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); SelectObject(hdc, Font); DrawTextW(hdc, DescriptionHeadline, lstrlenW(DescriptionHeadline), &Rect, DT_SINGLELINE|DT_NOPREFIX); DeleteObject(Font); // Description - Font = GetFont(FALSE); + Font = CreateFont(-13 , 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); SelectObject(hdc, Font); Rect.top += 40; Rect.bottom = DescriptionRect.bottom-2; @@ -305,27 +292,21 @@ { int Split_Hozizontal = (HIWORD(lParam)-(45+60))/2 + 60; int Split_Vertical = 200; - RECT Rect = {Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50}; - RECT Top = {0,0,LOWORD(lParam),60}; - RECT Bottom = {Split_Vertical, Split_Hozizontal, LOWORD(lParam), HIWORD(lParam)}; ResizeControl(hCategories, 10, 60, Split_Vertical, HIWORD(lParam)-10); ResizeControl(hApps, Split_Vertical+5, 60, LOWORD(lParam)-10, Split_Hozizontal); + RECT Rect = {Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50}; DescriptionRect = Rect; - MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, FALSE); - MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, FALSE); - MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, FALSE); - - - InvalidateRect(hwnd, &Top, TRUE); - InvalidateRect(hwnd, &Bottom, FALSE); + MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE); + MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); } break; case WM_DESTROY: { - DeleteObject(hLogo); + DeleteObject(hLogo); if(Root.Children) FreeTree(Root.Children); PostQuitMessage(0);

1 0

[ion] 25289: - Fix a bug in KeLeaveCriticalRegion which was delivering APCs even if Special APCs were disabled. The check is now fixed. Thanks to Dominique Cote for the bug report.
by ion＠svn.reactos.org 04 Jan '07

04 Jan '07

Author: ion Date: Thu Jan 4 04:55:27 2007 New Revision: 25289 URL: http://svn.reactos.org/svn/reactos?rev=25289&view=rev Log: - Fix a bug in KeLeaveCriticalRegion which was delivering APCs even if Special APCs were disabled. The check is now fixed. Thanks to Dominique Cote for the bug report. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Thu Jan 4 04:55:27 2007 @@ -167,7 +167,7 @@ { \ /* Check if we need to request an APC Delivery */ \ if (!(IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode])) && \ - !(_Thread->KernelApcDisable)) \ + !(_Thread->SpecialApcDisable)) \ { \ /* Check for the right environment */ \ KiCheckForKernelApcDelivery(); \

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