Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21626: prepare for import of matrix screensavers (break the build for short while)
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:47:01 2006 New Revision: 21626 URL: http://svn.reactos.ru/svn/reactos?rev=21626&view=rev Log: prepare for import of matrix screensavers (break the build for short while) Added: trunk/reactos/base/applications/screensavers/ trunk/reactos/base/applications/screensavers/matrix/ trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild trunk/reactos/base/applications/screensavers/screensavers.rbuild Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/applicati… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Mon Apr 17 14:47:01 2006 @@ -43,6 +43,9 @@ <directory name="sc"> <xi:include href="sc/sc.rbuild" /> </directory> +<directory name="screensavers"> + <xi:include href="screensavers/screensavers.rbuild" /> +</directory> <directory name="servman"> <xi:include href="servman/servman.rbuild" /> </directory> Added: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild (added) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild Mon Apr 17 14:47:01 2006 @@ -1,0 +1,34 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true"> + <include base="matrix">.</include> + + <linkerflag>-lstdc++</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__REACTOS__" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>winspool</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>advapi32</library> + <library>shell32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>uuid</library> + + <file>config.c</file> + <file>matrix.c</file> + <file>message.c</file> + <file>password.c</file> + <file>screensave.c</file> + <file>settings.c</file> + <file>matrix.rc</file> + + + +</module> Added: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (added) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Mon Apr 17 14:47:01 2006 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<group> +<directory name="matrix"> + <xi:include href="matrix/matrix.rbuild" /> +</directory> + +</group>

1 0

[greatlrd] 21625: Vendor drop of screen saver matrix by J Brown 2003 (Updates at http://www.catch22.net freeware) Thanks to J Brown gives us premition to import it to ReactOS
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:17:03 2006 New Revision: 21625 URL: http://svn.reactos.ru/svn/reactos?rev=21625&view=rev Log: Vendor drop of screen saver matrix by J Brown 2003 (Updates at http://www.catch22.net freeware) Thanks to J Brown gives us premition to import it to ReactOS Added: vendor/matrix/ vendor/matrix/Permission.txt vendor/matrix/ReadMe.txt vendor/matrix/config.c vendor/matrix/cursor1.cur (with props) vendor/matrix/globals.h vendor/matrix/icon1.ico (with props) vendor/matrix/matrix.bmp (with props) vendor/matrix/matrix.c vendor/matrix/matrix.dsp vendor/matrix/matrix.h vendor/matrix/matrix.rbuild vendor/matrix/matrix.rc vendor/matrix/message.c vendor/matrix/message.h vendor/matrix/password.c vendor/matrix/resource.h vendor/matrix/screensave.c vendor/matrix/settings.c Added: vendor/matrix/Permission.txt URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/Permission.txt?rev=21625&vi… ============================================================================== --- vendor/matrix/Permission.txt (added) +++ vendor/matrix/Permission.txt Mon Apr 17 14:17:03 2006 @@ -1,0 +1,17 @@ +Matrrix2 screensaver for ReactOS + +/***************************************** + +Freeware +Copyright J Brown 2003 + +Updates at http://www.catch22.net + +******************************************/ + +The author has given permission to use these sources +under Public Domain. Do what thou will but please give +credit where credit is due. + + +-Magnus Olsen (aka GreatLord) / Aleasky (aka Fireball) Added: vendor/matrix/ReadMe.txt URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/ReadMe.txt?rev=21625&view=a… ============================================================================== --- vendor/matrix/ReadMe.txt (added) +++ vendor/matrix/ReadMe.txt Mon Apr 17 14:17:03 2006 @@ -1,0 +1,32 @@ +Matrix ScreenSaver 2.0 +www.catch22.ork.uk + +Freeware written by J Brown 2003 +------------------------------------ + +The Matrix ScreenSaver is a small, fast and elegant Windows +version of the green "Matrix" cypher-code seen in the films. + +With this version you can even add messages which are +decoded displayed in realtime. + +Features +------------------------------------ + ++ Small and FAST (50Kb!) ++ All 32bit versions of Windows (Win95,98,ME,NT,2000,XP,NET) ++ Multimonitor support (new in version 2) ++ Custom matrix messages ++ Highly configurable ++ Full sourcecode available! + +Installation and use +------------------------------------ +Simply copy "matrix.scr" to your windows directory, +or right-click this file in explorer and click "Install". + +Other than that, it's just a standard Windows screensaver so it +works just like any other screensaver + + + Added: vendor/matrix/config.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/config.c?rev=21625&view=auto ============================================================================== --- vendor/matrix/config.c (added) +++ vendor/matrix/config.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,310 @@ +// +// config.c +// +// Screensaver Configuration dialog +// +#include <windows.h> +#include <commctrl.h> +#include "resource.h" +#include "globals.h" +#include "message.h" +#include "matrix.h" + +// needed for slider-controls +#pragma comment(lib, "comctl32.lib") + +// +// Called once for every font - add to list +// +int CALLBACK EnumFontProc(ENUMLOGFONT *lpelfe, NEWTEXTMETRIC *lpntme, int FontType, LPARAM lParam) +{ + SendMessage((HWND)lParam, CB_ADDSTRING, 0, (LPARAM)lpelfe->elfLogFont.lfFaceName); + return 1; +} + +// +// Add every fontname into specified combobox +// +void AddFonts(HWND hwndCombo) +{ + HDC hdc; + LOGFONT lf; + + lf.lfCharSet = ANSI_CHARSET; + lf.lfPitchAndFamily = 0; + lf.lfFaceName[0] = '\0'; + + hdc = GetDC(0); + EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)EnumFontProc, (LONG)hwndCombo, 0); + ReleaseDC(0, hdc); +} + +// +// Redraw preview control with current font/fontsize +// +void UpdatePreview(HWND hwnd) +{ + g_nFontSize = SendDlgItemMessage(hwnd, IDC_SLIDER4, TBM_GETPOS,0, 0); + SetMessageFont(hwnd, g_szFontName, g_nFontSize, g_fFontBold); + InvalidateRect(GetDlgItem(hwnd, IDC_PREVIEW), 0, 0); +} + +// +// Dialogbox procedure for Configuration window +// +BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static char buf[256]; + HWND hwndCombo, hwndCtrl; + int index, items, val; + RECT rect; + static int prevwidth, prevheight; + + switch(uMsg) + { + case WM_INITDIALOG: + + prevwidth = GetSystemMetrics(SM_CXSCREEN) / GLYPH_WIDTH; + prevheight = GetSystemMetrics(SM_CYSCREEN) / GLYPH_HEIGHT + 1; + + //Add any saved messages to the combo box + for(index = 0; index < g_nNumMessages; index++) + { + if(lstrlen(g_szMessages[index]) > 0) + SendDlgItemMessage(hwnd, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)g_szMessages[index]); + } + + //select the first message, and preview it + SendDlgItemMessage(hwnd, IDC_COMBO1, CB_SETCURSEL, 0, 0); + + SendDlgItemMessage(hwnd, IDC_SLIDER1, TBM_SETRANGE, 0, MAKELONG(SPEED_MIN, SPEED_MAX)); + SendDlgItemMessage(hwnd, IDC_SLIDER2, TBM_SETRANGE, 0, MAKELONG(DENSITY_MIN, DENSITY_MAX)); + SendDlgItemMessage(hwnd, IDC_SLIDER3, TBM_SETRANGE, 0, MAKELONG(MSGSPEED_MIN, MSGSPEED_MAX)); + SendDlgItemMessage(hwnd, IDC_SLIDER4, TBM_SETRANGE, 0, MAKELONG(FONT_MIN, FONT_MAX)); + + //SendDlgItemMessage(hwnd, IDC_SLIDER1, TBM_SETTICFREQ, 5, 0); + SendDlgItemMessage(hwnd, IDC_SLIDER2, TBM_SETTICFREQ, 5, 0); + SendDlgItemMessage(hwnd, IDC_SLIDER3, TBM_SETTICFREQ, 50, 0); + SendDlgItemMessage(hwnd, IDC_SLIDER4, TBM_SETTICFREQ, 2, 0); + + SendDlgItemMessage(hwnd, IDC_SLIDER1, TBM_SETPOS, TRUE, g_nMatrixSpeed); + SendDlgItemMessage(hwnd, IDC_SLIDER2, TBM_SETPOS, TRUE, g_nDensity); + SendDlgItemMessage(hwnd, IDC_SLIDER3, TBM_SETPOS, TRUE, g_nMessageSpeed); + SendDlgItemMessage(hwnd, IDC_SLIDER4, TBM_SETPOS, TRUE, g_nFontSize); + + CheckDlgButton(hwnd, IDC_RANDOM, g_fRandomizeMessages); + CheckDlgButton(hwnd, IDC_BOLD, g_fFontBold); + + AddFonts(GetDlgItem(hwnd, IDC_COMBO2)); + index = SendDlgItemMessage(hwnd, IDC_COMBO2, CB_FINDSTRING, 0, (LPARAM)g_szFontName); + SendDlgItemMessage(hwnd, IDC_COMBO2, CB_SETCURSEL, index, 0); + UpdatePreview(hwnd); + return 0; + + case WM_DESTROY: + //DeInitMessage(); + return 0; + + case WM_CTLCOLORSTATIC: + + if(GetDlgCtrlID((HWND)lParam) == IDC_ABOUT) + { + SetTextColor((HDC)wParam, RGB(0,80,0)); + SetBkColor((HDC)wParam, GetSysColor(COLOR_3DFACE)); + return (BOOL)GetSysColorBrush(COLOR_3DFACE); + } + else if(GetDlgCtrlID((HWND)lParam) == IDC_PREVIEW) + { + HDC hdc = (HDC)wParam; + RECT clip; + + GetDlgItemText(hwnd, IDC_COMBO1, buf, 256); + + GetClientRect((HWND)lParam, &rect); + + if(prevwidth < rect.right) + { + rect.left = (rect.right-prevwidth) / 2; + rect.right = rect.left + prevwidth; + } + else + { + rect.left = 0; + rect.right = prevwidth; + } + + if(prevheight < rect.bottom) + { + rect.top = (rect.bottom-prevheight) / 2; + rect.bottom = rect.top + prevheight; + } + else + { + rect.top = 0; + rect.bottom = prevheight; + } + + SetTextColor(hdc, RGB(128,255,128)); + SetBkColor(hdc, 0); + + //SetRect(&rect, 0, 0, PrevMessage->width, MAXMSG_HEIGHT); + CopyRect(&clip, &rect); + FillRect(hdc, &rect, GetStockObject(BLACK_BRUSH)); + + SelectObject(hdc, g_hFont); + + InflateRect(&clip, 2, 2); + + FrameRect(hdc, &clip, GetSysColorBrush(COLOR_3DSHADOW)); + IntersectClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); + + // figure out where the bounding rectangle should be + DrawText(hdc, buf, -1, &rect, DT_CENTER|DT_VCENTER|DT_WORDBREAK|DT_CALCRECT); + OffsetRect(&rect, (prevwidth-(rect.right-rect.left))/2, (prevheight-(rect.bottom-rect.top))/2); + + // now draw it! + DrawText(hdc, buf, -1, &rect, DT_CENTER|DT_VCENTER|DT_WORDBREAK); + + + return (BOOL)GetStockObject(NULL_BRUSH); + } + else + { + break; + } + + case WM_HSCROLL: + + if((HWND)lParam == GetDlgItem(hwnd, IDC_SLIDER4)) + { + // one of the sliders changed..update + UpdatePreview(hwnd); + } + + return 0; + + case WM_COMMAND: + + switch(HIWORD(wParam)) + { + case CBN_EDITCHANGE: + case CBN_SELCHANGE: + + //fall through to Preview: + index = SendDlgItemMessage(hwnd, IDC_COMBO2, CB_GETCURSEL, 0, 0); + SendDlgItemMessage(hwnd, IDC_COMBO2, CB_GETLBTEXT, index, (LPARAM)g_szFontName); + //SetMessageFont(hwnd, g_szFontName, g_nFontSize, TRUE); + + UpdatePreview(hwnd); + return 0; + } + + switch(LOWORD(wParam)) + { + case IDC_RANDOM: + g_fRandomizeMessages = IsDlgButtonChecked(hwnd, IDC_RANDOM); + break; + + case IDC_BOLD: + g_fFontBold = IsDlgButtonChecked(hwnd, IDC_BOLD); + UpdatePreview(hwnd); + break; + + case IDOK: + + hwndCtrl = GetDlgItem(hwnd, IDC_COMBO1); + + items = min(MAX_MESSAGES, SendMessage(hwndCtrl, CB_GETCOUNT, 0, 0)); + + for(index = 0; index < items; index++) + { + SendMessage(hwndCtrl, CB_GETLBTEXT, index, (LPARAM)g_szMessages[index]); + } + + g_nNumMessages = items; + + //matrix speed + val = SendDlgItemMessage(hwnd, IDC_SLIDER1, TBM_GETPOS, 0, 0); + if(val >= SPEED_MIN && val <= SPEED_MAX) + g_nMatrixSpeed = val; + + //density + val = SendDlgItemMessage(hwnd, IDC_SLIDER2, TBM_GETPOS, 0, 0); + if(val >= DENSITY_MIN && val <= DENSITY_MAX) + g_nDensity = val; + + //message speed + val = SendDlgItemMessage(hwnd, IDC_SLIDER3, TBM_GETPOS, 0, 0); + if(val >= MSGSPEED_MIN && val <= MSGSPEED_MAX) + g_nMessageSpeed = val; + + //font size + val = SendDlgItemMessage(hwnd, IDC_SLIDER4, TBM_GETPOS, 0, 0); + if(val >= FONT_MIN && val <= FONT_MAX) + g_nFontSize = val; + + SaveSettings(); + EndDialog(hwnd, 0); + return 0; + + case IDCANCEL: + EndDialog(hwnd, 0); + return TRUE; + + case IDC_ADD: + + hwndCombo = GetDlgItem(hwnd, IDC_COMBO1); + + if(GetWindowText(hwndCombo, buf, 256)) + { + SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)buf); + } + + UpdatePreview(hwnd); + + return 0; + + case IDC_REMOVE: + hwndCombo = GetDlgItem(hwnd, IDC_COMBO1); + GetWindowText(hwndCombo, buf, 256); + + index = SendMessage(hwndCombo, CB_GETCURSEL, 0, 0); + SendMessage(hwndCombo, CB_DELETESTRING, index, 0); + + SendMessage(hwndCombo, CB_SETCURSEL, 0, 0); + UpdatePreview(hwnd); + return 0; + } + return 0; + + case WM_CLOSE: + EndDialog(hwnd, 0); + return 0; + } + return 0; +} + +// +// Display the configuration dialog +// +int Configure(HWND hwndParent) +{ + INITCOMMONCONTROLSEX icc; + + icc.dwICC = ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; + icc.dwSize = sizeof(icc); + + InitCommonControlsEx(&icc); + +#ifdef _DEBUG + if(hwndParent == NULL) + hwndParent = 0; +#else + if(hwndParent == NULL) + hwndParent = GetForegroundWindow(); +#endif + + DialogBox(GetModuleHandle(0), MAKEINTRESOURCE(IDD_CONFIG), hwndParent, ConfigDlgProc); + + return 0; +} Added: vendor/matrix/cursor1.cur URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/cursor1.cur?rev=21625&view=… ============================================================================== Binary file - no diff available. Propchange: vendor/matrix/cursor1.cur ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: vendor/matrix/globals.h URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/globals.h?rev=21625&view=au… ============================================================================== --- vendor/matrix/globals.h (added) +++ vendor/matrix/globals.h Mon Apr 17 14:17:03 2006 @@ -1,0 +1,63 @@ +#ifndef GLOBALS_INCLUDED +#define GLOBALS_INCLUDED + +#ifdef __cplusplus +extern "C" { +#endif + +#define APPNAME "MATRIX ScreenSaver 2.0" + +#define DENSITY 24 +#define DENSITY_MAX 50 +#define DENSITY_MIN 5 + +// constants inferred from matrix.bmp +#define MAX_INTENSITY 5 // number of intensity levels +#define NUM_GLYPHS 26 // number of "glyphs" in each level +#define GLYPH_WIDTH 14 // width of each glyph (pixels) +#define GLYPH_HEIGHT 14 // height of each glyph (pixels) + +#define SPEED_MAX 10 +#define SPEED_MIN 1 + +#define MAXMSG_WIDTH 0x100 +#define MAXMSG_HEIGHT 0x100 +#define MAXMSG_LENGTH 64 + +#define MSGSPEED_MAX 500 +#define MSGSPEED_MIN 50 + +#define MAX_MESSAGES 16 + +#define FONT_MIN 8 +#define FONT_MAX 30 + +extern char g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; +extern int g_nFontSize; +extern char g_szFontName[]; +extern BOOL g_fFontBold; +extern int g_nNumMessages; +extern int g_nCurrentMessage; +extern int g_nMessageSpeed; +extern int g_nMatrixSpeed; +extern int g_nDensity; +extern BOOL g_fRandomizeMessages; +extern HFONT g_hFont; +extern BOOL g_fScreenSaving; + +void LoadSettings(); +void SaveSettings(); + +BOOL ChangePassword(HWND hwnd); +BOOL VerifyPassword(HWND hwnd); + +BOOL Configure(HWND hwndParent); +BOOL ScreenSaver(HWND hwndParent); + +int crc_rand(); + +#ifdef __cplusplus +} +#endif + +#endif Added: vendor/matrix/icon1.ico URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/icon1.ico?rev=21625&view=au… ============================================================================== Binary file - no diff available. Propchange: vendor/matrix/icon1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: vendor/matrix/matrix.bmp URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.bmp?rev=21625&view=a… ============================================================================== Binary file - no diff available. Propchange: vendor/matrix/matrix.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: vendor/matrix/matrix.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.c?rev=21625&view=auto ============================================================================== --- vendor/matrix/matrix.c (added) +++ vendor/matrix/matrix.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,445 @@ +// +// matrix.c +// +// Matrix-window implementation +// +#include <windows.h> +#include <windowsx.h> +#include "globals.h" +#include "message.h" +#include "matrix.h" +#include "resource.h" + +void DoMatrixMessage(HDC hdc, MATRIX *matrix); + +// pseudo-random number generator, based on 16bit CRC algorithm +static WORD _crc_reg = 0; +int crc_rand() +{ + const WORD mask = 0xb400; + + if(_crc_reg & 1) + _crc_reg = (_crc_reg >> 1) ^ mask; + else + _crc_reg = (_crc_reg >> 1); + + return _crc_reg; +} + +int GlyphIntensity(GLYPH glyph) +{ + return (int)((glyph & 0x7f00) >> 8); +} + +GLYPH DarkenGlyph(GLYPH glyph) +{ + int intensity = GlyphIntensity(glyph); + + if(intensity > 0) + return GLYPH_REDRAW | ((intensity - 1) << 8) | (glyph & 0x00FF); + else + return glyph; +} + +GLYPH RandomGlyph(int intensity) +{ + return GLYPH_REDRAW | (intensity << 8) | (crc_rand() % NUM_GLYPHS); +} + +void RedrawBlip(GLYPH *glypharr, int blippos) +{ + glypharr[blippos+0] |= GLYPH_REDRAW; + glypharr[blippos+1] |= GLYPH_REDRAW; + glypharr[blippos+8] |= GLYPH_REDRAW; + glypharr[blippos+9] |= GLYPH_REDRAW; +} + +void ScrollMatrixColumn(MATRIX_COLUMN *col) +{ + int y; + GLYPH lastglyph = 0; + GLYPH thisglyph; + + // wait until we are allowed to scroll + if(col->started == FALSE) + { + if(--col->countdown <= 0) + col->started = TRUE; + + return; + } + + // "seed" the glyph-run + lastglyph = col->state ? (GLYPH)0 : (GLYPH)(MAX_INTENSITY << 8); + + // + // loop over the entire length of the column, looking for changes + // in intensity/darkness. This change signifies the start/end + // of a run of glyphs. + // + for(y = 0; y < col->length; y++) + { + thisglyph = col->glyph[y]; + + // bottom-most part of "run". Insert a new character (glyph) + // at the end to lengthen the run down the screen..gives the + // impression that the run is "falling" down the screen + if(GlyphIntensity(thisglyph) < GlyphIntensity(lastglyph) && + GlyphIntensity(thisglyph) == 0) + { + col->glyph[y] = RandomGlyph(MAX_INTENSITY - 1); + y++; + } + // top-most part of "run". Delete a character off the top by + // darkening the glyph until it eventually disappears (turns black). + // this gives the effect that the run as dropped downwards + else if(GlyphIntensity(thisglyph) > GlyphIntensity(lastglyph)) + { + col->glyph[y] = DarkenGlyph(thisglyph); + + // if we've just darkened the last bit, skip on so + // the whole run doesn't go dark + if(GlyphIntensity(thisglyph) == MAX_INTENSITY - 1) + y++; + } + + lastglyph = col->glyph[y]; + } + + // change state from blanks <-> runs when the current run as expired + if(--col->runlen <= 0) + { + if(col->state ^= 1) + col->runlen = crc_rand() % (3 * DENSITY/2) + DENSITY_MIN; + else + col->runlen = crc_rand() % (DENSITY_MAX+1-DENSITY) + (DENSITY_MIN*2); + } + + // + // make a "blip" run down this column at double-speed + // + + // mark current blip as redraw so it gets "erased" + if(col->blippos >= 0 && col->blippos < col->length) + RedrawBlip(col->glyph, col->blippos); + + // advance down screen at double-speed + col->blippos += 2; + + // if the blip gets to the end of a run, start it again (for a random + // length so that the blips never get synched together) + if(col->blippos >= col->bliplen) + { + col->bliplen = col->length + crc_rand() % 50; + col->blippos = 0; + } + + // now redraw blip at new position + if(col->blippos >= 0 && col->blippos < col->length) + RedrawBlip(col->glyph, col->blippos); + +} + +// +// randomly change a small collection glyphs in a column +// +void RandomMatrixColumn(MATRIX_COLUMN *col) +{ + int i, y; + + for(i = 1, y = 0; i < 16; i++) + { + // find a run + while(GlyphIntensity(col->glyph[y]) < MAX_INTENSITY-1 && y < col->length) + y++; + + if(y >= col->length) + break; + + col->glyph[y] = (col->glyph[y] & 0xff00) | (crc_rand() % NUM_GLYPHS); + col->glyph[y] |= GLYPH_REDRAW; + + y += crc_rand() % 10; + } +} + +void DrawGlyph(MATRIX *matrix, HDC hdc, int xpos, int ypos, GLYPH glyph) +{ + int intensity = GlyphIntensity(glyph); + int glyphidx = glyph & 0xff; + + BitBlt(hdc, xpos, ypos, GLYPH_WIDTH, GLYPH_HEIGHT, matrix->hdcBitmap, + glyphidx * GLYPH_WIDTH, intensity * GLYPH_HEIGHT, SRCCOPY); +} + +void RedrawMatrixColumn(MATRIX_COLUMN *col, MATRIX *matrix, HDC hdc, int xpos) +{ + int y; + + // loop down the length of the column redrawing only what needs doing + for(y = 0; y < col->length; y++) + { + GLYPH glyph = col->glyph[y]; + + // does this glyph (character) need to be redrawn? + if(glyph & GLYPH_REDRAW) + { + if((y == col->blippos+0 || y == col->blippos+1 || + y == col->blippos+8 || y == col->blippos+9) && + GlyphIntensity(glyph) >= MAX_INTENSITY-1) + glyph |= MAX_INTENSITY << 8; + + DrawGlyph(matrix, hdc, xpos, y * GLYPH_HEIGHT, glyph); + + // clear redraw state + col->glyph[y] &= ~GLYPH_REDRAW; + } + } +} + +void DecodeMatrix(HWND hwnd, MATRIX *matrix) +{ + int x; + HDC hdc = GetDC(hwnd); + + for(x = 0; x < matrix->numcols; x++) + { + RandomMatrixColumn(&matrix->column[x]); + ScrollMatrixColumn(&matrix->column[x]); + RedrawMatrixColumn(&matrix->column[x], matrix, hdc, x * GLYPH_WIDTH); + } + + if(matrix->message) + DoMatrixMessage(hdc, matrix); + + ReleaseDC(hwnd, hdc); +} + +// +// Allocate matrix structures +// +MATRIX *CreateMatrix(HWND hwnd, int width, int height) +{ + MATRIX *matrix; + HDC hdc; + int x, y; + + int rows = height / GLYPH_HEIGHT + 1; + int cols = width / GLYPH_WIDTH + 1; + + // allocate matrix! + if((matrix = malloc(sizeof(MATRIX) + sizeof(MATRIX_COLUMN) * cols)) == 0) + return 0; + + matrix->numcols = cols; + matrix->numrows = rows; + matrix->width = width; + matrix->height = height; + + for(x = 0; x < cols; x++) + { + matrix->column[x].length = rows; + matrix->column[x].started = FALSE; + matrix->column[x].countdown = crc_rand() % 100; + matrix->column[x].state = crc_rand() % 2; + matrix->column[x].runlen = crc_rand() % 20 + 3; + + matrix->column[x].glyph = malloc(sizeof(GLYPH) * (rows+16)); + + for(y = 0; y < rows; y++) + matrix->column[x].glyph[y] = 0;//; + } + + // Load bitmap!! + hdc = GetDC(NULL); + matrix->hbmBitmap = LoadBitmap(GetModuleHandle(0), MAKEINTRESOURCE(IDB_BITMAP1)); + matrix->hdcBitmap = CreateCompatibleDC(hdc); + SelectObject(matrix->hdcBitmap, matrix->hbmBitmap); + ReleaseDC(NULL, hdc); + + // Create a message for this window...only if we are + // screen-saving (not if in preview mode) + if(GetParent(hwnd) == 0) + matrix->message = InitMatrixMessage(hwnd, matrix->numcols, matrix->numrows); + else + matrix->message = 0; + + return matrix; +} + +// +// Free up matrix structures +// +void DestroyMatrix(MATRIX *matrix) +{ + int x; + + // free the matrix columns + for(x = 0; x < matrix->numcols; x++) + free(matrix->column[x].glyph); + + DeleteDC(matrix->hdcBitmap); + DeleteObject(matrix->hbmBitmap); + + // now delete the matrix! + free(matrix); +} + +MATRIX *GetMatrix(HWND hwnd) +{ + return (MATRIX *)GetWindowLong(hwnd, 0); +} + +void SetMatrix(HWND hwnd, MATRIX *matrix) +{ + SetWindowLong(hwnd, 0, (LONG)matrix); +} + +// +// Window procedure for one matrix (1 per screen) +// +LRESULT WINAPI MatrixWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + + MATRIX *matrix = GetMatrix(hwnd); + + switch(msg) + { + // window creation + case WM_NCCREATE: + + // create the matrix based on how big this window is + matrix = CreateMatrix(hwnd, ((CREATESTRUCT *)lParam)->cx, ((CREATESTRUCT *)lParam)->cy); + + // failed to allocate? stop window creation! + if(matrix == 0) + return FALSE; + + SetMatrix(hwnd, matrix); + + // start off an animation timer + SetTimer(hwnd, 0xdeadbeef, ((SPEED_MAX - g_nMatrixSpeed) + SPEED_MIN) * 10, 0); + + return TRUE; + + // window being destroyed, cleanup + case WM_NCDESTROY: + DestroyMatrix(matrix); + PostQuitMessage(0); + return 0; + + // animation timer has gone off, redraw the matrix! + case WM_TIMER: + DecodeMatrix(hwnd, matrix); + return 0; + + // break out of screen-saver if any keyboard activity + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + PostMessage(hwnd, WM_CLOSE, 0, 0); + return 0; + + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hwnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + + return 0; + + // someone wants to close us...see if it's ok + case WM_CLOSE: + + if(VerifyPassword(hwnd)) + { + KillTimer(hwnd, 0xdeadbeef); + DestroyWindow(hwnd); + } + + return 0; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +HWND CreateScreenSaveWnd(HWND hwndParent, RECT *rect) +{ + DWORD dwStyle = hwndParent ? WS_CHILD : WS_POPUP; + +#ifdef _DEBUG + DWORD dwStyleEx = 0; +#else + DWORD dwStyleEx = WS_EX_TOPMOST; +#endif + + if(hwndParent) + GetClientRect(hwndParent, rect); + + return CreateWindowEx( dwStyleEx, + APPNAME, + 0, + WS_VISIBLE | dwStyle, + rect->left, + rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + hwndParent, + 0, + GetModuleHandle(0), + 0 + ); +} + +// +// Initialize class for matrix window +// +void InitScreenSaveClass(BOOL fPreview) +{ + WNDCLASSEX wcx; + + wcx.cbSize = sizeof(WNDCLASSEX); + wcx.style = 0; + wcx.lpfnWndProc = MatrixWndProc; + wcx.cbClsExtra = 0; + wcx.cbWndExtra = sizeof(MATRIX *); + wcx.hInstance = GetModuleHandle(0); + wcx.hIcon = 0; + wcx.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + wcx.lpszMenuName = 0; + wcx.lpszClassName = APPNAME; + wcx.hIconSm = 0; + + if(fPreview) + wcx.hCursor = LoadCursor(0, IDC_ARROW); + else + wcx.hCursor = LoadCursor(wcx.hInstance, MAKEINTRESOURCE(IDC_BLANKCURSOR)); + + // initialize the crc register used for "random" number generation + _crc_reg = (WORD)GetTickCount(); + + RegisterClassEx(&wcx); +} Added: vendor/matrix/matrix.dsp URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.dsp?rev=21625&view=a… ============================================================================== --- vendor/matrix/matrix.dsp (added) +++ vendor/matrix/matrix.dsp Mon Apr 17 14:17:03 2006 @@ -1,0 +1,158 @@ +# Microsoft Developer Studio Project File - Name="matrix" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=matrix - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "matrix.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "matrix.mak" CFG="matrix - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "matrix - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "matrix - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "matrix - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX- /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 libctiny.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /map /debug /machine:I386 + +!ELSEIF "$(CFG)" == "matrix - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "matrix - Win32 Release" +# Name "matrix - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\config.c +# End Source File +# Begin Source File + +SOURCE=.\matrix.c +# End Source File +# Begin Source File + +SOURCE=.\matrix.rc +# End Source File +# Begin Source File + +SOURCE=.\message.c +# End Source File +# Begin Source File + +SOURCE=.\password.c +# End Source File +# Begin Source File + +SOURCE=.\screensave.c +# End Source File +# Begin Source File + +SOURCE=.\settings.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\globals.h +# End Source File +# Begin Source File + +SOURCE=.\matrix.h +# End Source File +# Begin Source File + +SOURCE=.\message.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\cursor1.cur +# End Source File +# Begin Source File + +SOURCE=.\icon1.ico +# End Source File +# Begin Source File + +SOURCE=.\matrix.bmp +# End Source File +# Begin Source File + +SOURCE=.\matrix2.bmp +# End Source File +# End Group +# End Target +# End Project Added: vendor/matrix/matrix.h URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.h?rev=21625&view=auto ============================================================================== --- vendor/matrix/matrix.h (added) +++ vendor/matrix/matrix.h Mon Apr 17 14:17:03 2006 @@ -1,0 +1,70 @@ +#ifndef MATRIX_INCLUDED +#define MATRIX_INCLUDED + +#ifdef __cplusplus +extern "C" { +#endif + +// +// Top BYTE of each glyph is used as flags +// (redraw state, intensity etc) +// +// Bottom BYTE of each glyph is the character value +// +// Bit: 15 14 13-8 | 7-0 +// +// [Redraw][Blank][Intensity] [Glyph] +// +typedef unsigned short GLYPH; + +#define GLYPH_REDRAW 0x8000 +#define GLYPH_BLANK 0x4000 + +// +// The "matrix" is basically an array of these +// column structures, positioned side-by-side +// +typedef struct +{ + BOOL state; + int countdown; + + BOOL started; + int runlen; + + int blippos; + int bliplen; + + int length; + GLYPH *glyph; + +} MATRIX_COLUMN; + +typedef struct +{ + int width; + int height; + int numcols; + int numrows; + + // bitmap containing glyphs. + HDC hdcBitmap; + HBITMAP hbmBitmap; + + MATRIX_MESSAGE *message; + + MATRIX_COLUMN column[1]; + +} MATRIX; + +GLYPH RandomGlyph(int intensity); +void DrawGlyph(MATRIX *matrix, HDC hdc, int xpos, int ypos, GLYPH glyph); + +HWND CreateScreenSaveWnd(HWND hwndParent, RECT *rect); +void InitScreenSaveClass(); + +#ifdef __cplusplus +} +#endif + +#endif Added: vendor/matrix/matrix.rbuild URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.rbuild?rev=21625&vie… ============================================================================== --- vendor/matrix/matrix.rbuild (added) +++ vendor/matrix/matrix.rbuild Mon Apr 17 14:17:03 2006 @@ -1,0 +1,34 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true"> + <include base="matrix">.</include> + + <linkerflag>-lstdc++</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__REACTOS__" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>winspool</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>advapi32</library> + <library>shell32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>uuid</library> + + <file>config.c</file> + <file>matrix.c</file> + <file>message.c</file> + <file>password.c</file> + <file>screensave.c</file> + <file>settings.c</file> + <file>matrix.rc</file> + + + +</module> Added: vendor/matrix/matrix.rc URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/matrix.rc?rev=21625&view=au… ============================================================================== --- vendor/matrix/matrix.rc (added) +++ vendor/matrix/matrix.rc Mon Apr 17 14:17:03 2006 @@ -1,0 +1,167 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix ScreenSaver Configuration" +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Decode &Speed",IDC_STATIC,7,7,128,36 + LTEXT "Slower",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Faster",IDC_STATIC,104,24,20,8 + GROUPBOX "Cypher &Density",IDC_STATIC,7,50,128,36 + LTEXT "Less",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "More",IDC_STATIC,104,67,23,8 + GROUPBOX "&Message Display Speed",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Slower",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Faster",IDC_STATIC,104,110,22,8 + GROUPBOX "&Font Size",IDC_STATIC,7,137,127,36 + LTEXT "Smaller",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Bigger",IDC_STATIC,104,153,25,8 + GROUPBOX "Coded Messages",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Add",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Remove",IDC_REMOVE,280,66,44,18 + CONTROL "Randomize Messages",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Cancel",IDCANCEL,283,162,50,14 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "&Font Name:",IDC_STATIC,151,118,38,8 + CONTROL "&Bold Font",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_CONFIG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 333 + TOPMARGIN, 7 + BOTTOMMARGIN, 176 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix ScreenSaver" +END + +#endif // English (U.K.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: vendor/matrix/message.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/message.c?rev=21625&view=au… ============================================================================== --- vendor/matrix/message.c (added) +++ vendor/matrix/message.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,250 @@ +// +// message.c +// +// Dissolve in/out messages into the "matrix" +// +// +// +#include <windows.h> +#include "globals.h" +#include "message.h" +#include "matrix.h" + +// +// this isn't really a random-number generator. It's based on +// a 16bit CRC algorithm. With the right mask (0xb400) it is possible +// to call this function 65536 times and get a unique result every time +// with *NO* repeats. The results look random but they're not - if we +// call this function another 65536 times we get exactly the same results +// in the same order. This is necessary for fading in messages because +// we need to be guaranteed that all cells...it's completely uniform in +// operation but looks random enough to be very effective +// +WORD crc_msgrand(WORD reg) +{ + const WORD mask = 0xb400; + + if(reg & 1) + reg = (reg >> 1) ^ mask; + else + reg = (reg >> 1); + + return reg; +} + +// +// Set a new message based on font and text +// +void SetMatrixMessage(MATRIX_MESSAGE *msg, HFONT hFont, char *text) +{ + HDC hdc; + RECT rect; + int x, y; + + HDC hdcMessage; + HBITMAP hbmMessage; + + HANDLE hOldFont, hOldBmp; + + // + // Create a monochrome off-screen buffer + // + hdc = GetDC(NULL); + + hdcMessage = CreateCompatibleDC(hdc); + hbmMessage = CreateBitmap(MAXMSG_WIDTH, MAXMSG_HEIGHT, 1, 1, 0); + hOldBmp = SelectObject(hdcMessage, hbmMessage); + + ReleaseDC(NULL, hdc); + + // + // Draw text into bitmap + // + SetRect(&rect, 0, 0, msg->width, MAXMSG_HEIGHT); + FillRect(hdcMessage, &rect, GetStockObject(WHITE_BRUSH)); + + hOldFont = SelectObject(hdcMessage, g_hFont); + DrawText(hdcMessage, text, -1, &rect, DT_CENTER|DT_VCENTER|DT_WORDBREAK|DT_CALCRECT); + + OffsetRect(&rect, (msg->width-(rect.right-rect.left))/2, (msg->height-(rect.bottom-rect.top))/2); + DrawText(hdcMessage, text, -1, &rect, DT_CENTER|DT_VCENTER|DT_WORDBREAK); + + // + // Convert bitmap into an array of cells for easy drawing + // + for(y = 0; y < msg->height; y++) + { + for(x = 0; x < msg->width; x++) + { + msg->message[x][y] = GetPixel(hdcMessage, x, y) ? 0 : 1; + } + } + + // + // Cleanup + // + SelectObject(hdcMessage, hOldFont); + SelectObject(hdcMessage, hOldBmp); + + DeleteDC(hdcMessage); + DeleteObject(hbmMessage); +} + +// +// Draw any part of the message that is visible. Make the +// message "shimmer" by using a random glyph each time +// +void DrawMatrixMessage(MATRIX *matrix, MATRIX_MESSAGE *msg, HDC hdc) +{ + int x, y; + + for(x = 0; x < msg->width; x++) + for(y = 0; y < msg->height; y++) + if((msg->message[x][y] & 0x8000) && + (msg->message[x][y] & 0x00FF)) + { + DrawGlyph(matrix, hdc, x * GLYPH_WIDTH, y * GLYPH_HEIGHT, RandomGlyph(MAX_INTENSITY)); + } +} + +// +// Reveal specified amount of message +// +void RevealMatrixMessage(MATRIX_MESSAGE *msg, int amount) +{ + while(amount--) + { + int pos; + + msg->random_reg1 = crc_msgrand(msg->random_reg1); + pos = msg->random_reg1 & 0xffff; + + msg->message[pos / 256][pos % 256] |= GLYPH_REDRAW; + } +} + +// +// Reset (hide) the message +// +void ClearMatrixMessage(MATRIX_MESSAGE *msg) +{ + int x, y; + + for(x = 0; x < msg->width; x++) + for(y = 0; y < msg->height; y++) + msg->message[x][y] = 0; +} + +// +// convert from 50-500 (fast-slow) to slow(50) - fast(500) +// +int MessageSpeed() +{ + return (MSGSPEED_MAX-MSGSPEED_MIN) - (g_nMessageSpeed-MSGSPEED_MIN) + MSGSPEED_MIN; +} + +// +// Called once for each iteration of the matrix +// +void DoMatrixMessage(HDC hdc, MATRIX *matrix) +{ + MATRIX_MESSAGE *msg = matrix->message; + + int RealSpeed = MessageSpeed(); + + if(g_nNumMessages > 0) + { + // nothing to do yet.. + if(msg->counter++ < 0) + return; + + // has counter reached limit..clear the message + if(msg->counter++ == RealSpeed / 2 + (RealSpeed/4)) + ClearMatrixMessage(msg); + + // reset counter + display a new message + if(msg->counter >= RealSpeed) + { + // mark all message-cells as being "invisible" so the + // message gets cleared by the matrix decoding naturally + + if(g_fRandomizeMessages) + msg->msgindex = crc_rand() % g_nNumMessages; + else + msg->msgindex = (msg->msgindex + 1) % g_nNumMessages; + + // make a new message..initially invisible + SetMatrixMessage(msg, 0, g_szMessages[msg->msgindex]); + + msg->counter = -(int)(crc_rand() % MSGSPEED_MAX); + } + // reveal the next part of the message + else if(msg->counter < RealSpeed / 2) + { + int w = (g_nMessageSpeed - MSGSPEED_MIN); + w = (1 << 16) + ((w<<16) / MSGSPEED_MAX); + w = (w * 3 * g_nMessageSpeed) >> 16; + + RevealMatrixMessage(msg, w + 100); + } + + // + // draw whatever part of the message is visible at this time + // + DrawMatrixMessage(matrix, msg, hdc); + } +} + +// +// Set current font used for messages +// +void SetMessageFont(HWND hwnd, char *szFontName, int nPointSize, BOOL fBold) +{ + int lfHeight; + HDC hdc; + HFONT hFont; + + hdc = GetDC(hwnd); + + lfHeight = -MulDiv(nPointSize, GetDeviceCaps(hdc, LOGPIXELSY), 72); + + ReleaseDC(hwnd, hdc); + + hFont = CreateFont(lfHeight, 0, 0, 0, fBold ? FW_BOLD: FW_NORMAL, 0, 0, 0, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + ANTIALIASED_QUALITY, DEFAULT_PITCH, szFontName); + + if(hFont != 0) + { + if(g_hFont != 0) + DeleteObject(g_hFont); + + g_hFont = hFont; + } +} + +// +// Create a message! +// +MATRIX_MESSAGE *InitMatrixMessage(HWND hwnd, int width, int height) +{ + MATRIX_MESSAGE *msg; + + if((msg = malloc(sizeof(MATRIX_MESSAGE))) == 0) + return 0; + + ClearMatrixMessage(msg); + + msg->msgindex = 0; + msg->width = min(width, MAXMSG_WIDTH); + msg->height = min(height, MAXMSG_HEIGHT); + msg->counter = -(int)(crc_rand() % MSGSPEED_MIN + MSGSPEED_MIN); + + msg->random_reg1 = (WORD)GetTickCount(); + + SetMessageFont(hwnd, g_szFontName, g_nFontSize, g_fFontBold); + + SetMatrixMessage(msg, 0, g_szMessages[0]); + + return msg; +} Added: vendor/matrix/message.h URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/message.h?rev=21625&view=au… ============================================================================== --- vendor/matrix/message.h (added) +++ vendor/matrix/message.h Mon Apr 17 14:17:03 2006 @@ -1,0 +1,32 @@ +#ifndef MESSAGE_INCLUDED +#define MESSAGE_INCLUDED + +#ifdef __cplusplus +extern "C" { +#endif + +// +// counter starts off negative (rand() < 0)..when it gets +// to zero the message starts to display +// +typedef struct +{ + WORD message[MAXMSG_WIDTH][MAXMSG_HEIGHT]; + + int msgindex; + + int counter; + WORD random_reg1; + + int width, height; + +} MATRIX_MESSAGE; + +void SetMessageFont(HWND hwnd, char *szFontName, int nPointSize, BOOL fBold); +MATRIX_MESSAGE *InitMatrixMessage(HWND hwnd, int width, int height); + +#ifdef __cplusplus +} +#endif + +#endif Added: vendor/matrix/password.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/password.c?rev=21625&view=a… ============================================================================== --- vendor/matrix/password.c (added) +++ vendor/matrix/password.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,68 @@ +// +// password.c +// +// Password support for Win9x +// +#include <windows.h> + +typedef BOOL (WINAPI *VERIFYSCREENSAVEPWD)(HWND hwnd); +typedef VOID (WINAPI *PWDCHANGEPASSWORD)(LPCSTR lpcRegkeyname, HWND hwnd,UINT uiReserved1,UINT uiReserved2); + +BOOL VerifyPassword(HWND hwnd) +{ + // Under NT, we return TRUE immediately. This lets the saver quit, + // and the system manages passwords. Under '95, we call VerifyScreenSavePwd. + // This checks the appropriate registry key and, if necessary, + // pops up a verify dialog + + HINSTANCE hpwdcpl; + VERIFYSCREENSAVEPWD VerifyScreenSavePwd; + BOOL fResult; + + if(GetVersion() < 0x80000000) + return TRUE; + + hpwdcpl = LoadLibrary("PASSWORD.CPL"); + + if(hpwdcpl == NULL) + { + return FALSE; + } + + + VerifyScreenSavePwd = (VERIFYSCREENSAVEPWD)GetProcAddress(hpwdcpl, "VerifyScreenSavePwd"); + + if(VerifyScreenSavePwd == NULL) + { + FreeLibrary(hpwdcpl); + return FALSE; + } + + fResult = VerifyScreenSavePwd(hwnd); + FreeLibrary(hpwdcpl); + + return fResult; +} + +BOOL ChangePassword(HWND hwnd) +{ + // This only ever gets called under '95, when started with the /a option. + HINSTANCE hmpr = LoadLibrary("MPR.DLL"); + PWDCHANGEPASSWORD PwdChangePassword; + + if(hmpr == NULL) + return FALSE; + + PwdChangePassword = (PWDCHANGEPASSWORD)GetProcAddress(hmpr, "PwdChangePasswordA"); + + if(PwdChangePassword == NULL) + { + FreeLibrary(hmpr); + return FALSE; + } + + PwdChangePassword("SCRSAVE", hwnd, 0, 0); + FreeLibrary(hmpr); + + return TRUE; +} Added: vendor/matrix/resource.h URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/resource.h?rev=21625&view=a… ============================================================================== --- vendor/matrix/resource.h (added) +++ vendor/matrix/resource.h Mon Apr 17 14:17:03 2006 @@ -1,0 +1,35 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by matrix.rc +// +#define IDS_DESCRIPTION 1 +#define IDD_CONFIG 101 +#define IDB_BITMAP1 104 +#define IDC_BLANKCURSOR 105 +#define IDI_ICON1 106 +#define IDC_COMBO1 1003 +#define IDC_REMOVE 1004 +#define IDC_ADD 1005 +#define IDC_PREVIEW 1008 +#define IDC_PREV 1009 +#define IDC_ENABLEPREV 1013 +#define IDC_RANDOM 1014 +#define IDC_SLIDER1 1015 +#define IDC_SLIDER2 1016 +#define IDC_SLIDER3 1017 +#define IDC_SLIDER4 1018 +#define IDC_BOLD 1019 +#define IDC_COMBO2 1020 +#define IDC_MSGSPEEDGRP 1021 +#define IDC_ABOUT 1022 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 109 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1023 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Added: vendor/matrix/screensave.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/screensave.c?rev=21625&view… ============================================================================== --- vendor/matrix/screensave.c (added) +++ vendor/matrix/screensave.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,161 @@ +// +// screensave.c +// +// Entrypoint for a win32 screensaver +// +// NOTES: Screen savers don't like being UPX'd (compressed). Don't +// know why, it just is. C-runtime has been stripped with +// "libctiny.lib". +// +// v1.0 1/12/2003 J Brown +// +#include <windows.h> +#include <windowsx.h> +#include "globals.h" +#include "message.h" +#include "matrix.h" +#include "resource.h" + +#pragma comment(lib, "libctiny.lib") +#pragma comment(linker, "/OPT:NOWIN98") + +// +// Added: Multimonitor support!! +// +HMONITOR (WINAPI * pfnEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); +BOOL (WINAPI * pfnGetMonitorInfo)(HMONITOR, LPMONITORINFO); + +// +// Callback function for EnumDisplayMonitors API. Use this function +// to kickstart a screen-saver window for each monitor in the system +// +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, RECT *rcMonitor, LPARAM Param) +{ + HWND hwnd; + + // Create a screensaver on this monitor! + hwnd = CreateScreenSaveWnd((HWND)Param, rcMonitor); + + // For some reason windows always places this window at 0,0... + // position it ourselves + SetWindowPos(hwnd, 0, rcMonitor->left, rcMonitor->top, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + + return TRUE; +} + +// +// Start screen saver! +// +BOOL ScreenSaver(HWND hwndParent) +{ + HMODULE hUser32; + UINT nPreviousState; + MSG msg; + + InitScreenSaveClass(hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + // Dynamically locate API call from USER32 - not present in all versions + hUser32 = GetModuleHandle("USER32.DLL"); + pfnEnumDisplayMonitors = (PVOID)GetProcAddress(hUser32, "EnumDisplayMonitors"); + + // If we're running Win2k+ then the API is available...so call it! + if(pfnEnumDisplayMonitors && hwndParent == 0) + { + pfnEnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + } + // Otherwise simulate by calling enum-proc manually + else + { + RECT rect; + + rect.left = 0; + rect.right = GetSystemMetrics(SM_CXSCREEN); + rect.top = 0; + rect.bottom = GetSystemMetrics(SM_CYSCREEN); + + MonitorEnumProc(NULL, NULL, &rect, (LPARAM)hwndParent); + } + + // run message loop to handle all screen-saver windows + while(GetMessage(&msg, NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return TRUE; +} + +// +// Look for any options Windows has passed to us: +// +// -a <hwnd> (set password) +// -s (screensave) +// -p <hwnd> (preview) +// -c <hwnd> (configure) +// +BOOL ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +{ + int ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; //convert to lower case + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = atoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = NULL; + + return TRUE; +} + +// +// Entrypoint for screen-saver: it's just a normal win32 app! +// +int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdShow) +{ + HWND hwndParent; + int chOption; + + // Make sure that only 1 instance runs at a time - + // Win98 seems to want us to restart every 5 seconds!! + if(FindWindowEx(NULL, NULL, APPNAME, APPNAME)) + { + return 0; + } + + LoadSettings(); + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + switch(chOption) + { + case 's': return ScreenSaver(NULL); // screen save + case 'p': return ScreenSaver(hwndParent); // preview in small window + case 'a': return ChangePassword(hwndParent); // ask for password + case 'c': return Configure(hwndParent); // configuration dialog + default: return Configure(hwndParent); // configuration dialog + } + + return 0; +} Added: vendor/matrix/settings.c URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/settings.c?rev=21625&view=a… ============================================================================== --- vendor/matrix/settings.c (added) +++ vendor/matrix/settings.c Mon Apr 17 14:17:03 2006 @@ -1,0 +1,158 @@ +// +// settings.c +// +// Load/Save settings from registry +// +#include <windows.h> +#include "globals.h" +#include "message.h" +#include "matrix.h" + +char g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; +int g_nNumMessages = 0; +int g_nMessageSpeed = 5; +char g_szFontName[512] = "Arial"; + +int g_nMatrixSpeed = 150; +int g_nDensity = 32; +int g_nFontSize = 12; +BOOL g_fRandomizeMessages = FALSE; +BOOL g_fFontBold = TRUE; +BOOL g_fScreenSaving = FALSE; + +HFONT g_hFont; + +void LoadSettings() +{ + HKEY hkey; + LONG value; + ULONG len; + char *hugechar = malloc(4096); + char *hptr = hugechar; + + if(hugechar == 0) + return; + + hugechar[0] = '\0'; + + RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Catch22\\Matrix Screen Saver", 0, + "", 0, KEY_READ, NULL, &hkey, NULL); + + len = sizeof value; + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "MessageSpeed", 0, 0, (BYTE *)&value, &len)) + { + if(value >= MSGSPEED_MIN && value <= MSGSPEED_MAX) + g_nMessageSpeed = value; + } + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "MatrixSpeed", 0, 0, (BYTE *)&value, &len)) + { + if(value >= SPEED_MIN && value <= SPEED_MAX) + g_nMatrixSpeed = value; + } + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Density", 0, 0, (BYTE *)&value, &len)) + { + if(value >= DENSITY_MIN && value <= DENSITY_MAX) + g_nDensity = value; + } + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontSize", 0, 0, (BYTE *)&value, &len)) + { + if(value >= FONT_MIN && value <= FONT_MAX) + g_nFontSize = value; + } + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontBold", 0, 0, (BYTE *)&value, &len)) + g_fFontBold = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Randomize", 0, 0, (BYTE *)&value, &len)) + g_fRandomizeMessages = (value == 0 ? FALSE : TRUE); + + len = 4096; + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontName", 0, 0, (BYTE *)hugechar, &len)) + { + if(len > 0) + lstrcpy(g_szFontName, hugechar); + else + lstrcpy(g_szFontName, "Arial"); + + } + + len = 4096; + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Messages", 0, 0 , (BYTE *)hugechar, &len)) + { + while(len > 0 && *hptr && isascii(*hptr)) + { + if(lstrlen(hptr) > 0) + { + lstrcpyn(g_szMessages[g_nNumMessages], hptr, MAXMSG_LENGTH); + ++g_nNumMessages; + hptr += lstrlen(hptr) + 1; + } + } + } + + RegCloseKey(hkey); + free(hugechar); +} + +void SaveSettings() +{ + HKEY hkey; + char *hugechar = malloc(4096); + char *msgptr = hugechar; + int totallen = 0; + int i,len; + LONG value; + + if(hugechar == 0) + return; + + hugechar[0] = '\0'; + msgptr = hugechar; + + RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Catch22\\Matrix Screen Saver", 0, + "", 0, KEY_WRITE, NULL, &hkey, NULL); + + value = g_nMessageSpeed; + RegSetValueEx(hkey, "MessageSpeed", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = g_nMatrixSpeed; + RegSetValueEx(hkey, "MatrixSpeed", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = g_nDensity; + RegSetValueEx(hkey, "Density", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = g_nFontSize; + RegSetValueEx(hkey, "FontSize", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = g_fRandomizeMessages; + RegSetValueEx(hkey, "Randomize", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = g_fFontBold; + RegSetValueEx(hkey, "FontBold", 0, REG_DWORD, (BYTE *)&value, sizeof value); + + RegSetValueEx(hkey, "FontName", 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName)); + + for(i = 0; i < g_nNumMessages; i++) + { + len = lstrlen(g_szMessages[i]); + + if(len > 0 && totallen+len < 4096) + { + lstrcpyn(msgptr, g_szMessages[i], 4096-totallen); + totallen += len + 1; + msgptr += len + 1; + } + } + + *msgptr = '\0'; + totallen++; + + RegSetValueEx(hkey, "Messages", 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen); + RegCloseKey(hkey); + + free(hugechar); +}

1 0

[greatlrd] 21624: prepare for screensaver : Adding win32scr as target it genrate a .scr file instead for a win32gui
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:08:35 2006 New Revision: 21624 URL: http://svn.reactos.ru/svn/reactos?rev=21624&view=rev Log: prepare for screensaver : Adding win32scr as target it genrate a .scr file instead for a win32gui Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Apr 17 14:08:35 2006 @@ -209,6 +209,7 @@ case Win32CUI: handler = new MingwWin32CUIModuleHandler ( module ); break; + case Win32SCR: case Win32GUI: handler = new MingwWin32GUIModuleHandler ( module ); break; Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Apr 17 14:08:35 2006 @@ -59,7 +59,7 @@ string module_type = GetExtension(module.GetTargetName()); bool lib = (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); - bool exe = (module_type == ".exe"); + bool exe = (module_type == ".exe") || (module_type == ".scr"); // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Apr 17 14:08:35 2006 @@ -54,7 +54,7 @@ string module_type = GetExtension(module.GetTargetName()); bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); - bool exe = (module_type == ".exe"); + bool exe = (module_type == ".exe") || (module_type == ".scr"); bool sys = (module_type == ".sys"); string path_basedir = module.GetPathToBaseDir (); @@ -428,7 +428,7 @@ fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); } - else if ( module.type == Win32CUI || module.type == Win32GUI ) + else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) { fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); } Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Apr 17 14:08:35 2006 @@ -47,6 +47,7 @@ case NativeCUI: case Win32DLL: case Win32CUI: + case Win32SCR: case Win32GUI: case KernelModeDriver: case BootSector: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Apr 17 14:08:35 2006 @@ -743,6 +743,8 @@ return Win32CUI; if ( attribute.value == "win32gui" ) return Win32GUI; + if ( attribute.value == "win32scr" ) + return Win32SCR; if ( attribute.value == "bootloader" ) return BootLoader; if ( attribute.value == "bootsector" ) @@ -782,6 +784,9 @@ case Win32CUI: case Win32GUI: return ".exe"; + case Win32SCR: + return ".scr"; + case KernelModeDLL: case NativeDLL: case Win32DLL: @@ -830,6 +835,7 @@ return "_wmainCRTStartup"; else return "_mainCRTStartup"; + case Win32SCR: case Win32GUI: if ( isUnicode ) return "_wWinMainCRTStartup"; @@ -868,6 +874,7 @@ case Win32CUI: case Test: return "0x00400000"; + case Win32SCR: case Win32GUI: return "0x00400000"; case KernelModeDLL: @@ -910,6 +917,7 @@ case NativeCUI: case Win32CUI: case Test: + case Win32SCR: case Win32GUI: case BuildTool: case StaticLibrary: @@ -941,6 +949,7 @@ case NativeCUI: case Win32CUI: case Test: + case Win32SCR: case Win32GUI: case BuildTool: case BootLoader: @@ -1392,6 +1401,7 @@ case NativeCUI: case Win32CUI: case Win32GUI: + case Win32SCR: case KernelModeDriver: case BootSector: case BootLoader: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Apr 17 14:08:35 2006 @@ -263,7 +263,8 @@ RpcServer = 16, RpcClient = 17, Alias = 18, - BootProgram = 19 + BootProgram = 19, + Win32SCR = 20 }; enum HostType Modified: trunk/reactos/tools/rbuild/rbuild.sln URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.sln?rev… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.sln (original) +++ trunk/reactos/tools/rbuild/rbuild.sln Mon Apr 17 14:08:35 2006 @@ -1,20 +1,21 @@ -ï»¿ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}" +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.ActiveCfg = Debug|Win32 - {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.Build.0 = Debug|Win32 - {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.ActiveCfg = Release|Win32 - {F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.Build.0 = Release|Win32 + GlobalSection(ProjectConfiguration) = postSolution + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj?… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Mon Apr 17 14:08:35 2006 @@ -1,199 +1,132 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="7.10" Name="rbuild" - ProjectGUID="{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}" - > + SccProjectName="" + SccLocalPath=""> <Platforms> <Platform - Name="Win32" - /> + Name="Win32"/> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" + StringPooling="TRUE" + RuntimeLibrary="4" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/rbuild.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" - SuppressStartupBanner="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile=".\Release/rbuild.exe" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ProgramDatabaseFile=".\Release/rbuild.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile=".\Release/rbuild.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - ProgramDatabaseFile=".\Release/rbuild.pdb" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile=".\Release/rbuild.bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="5" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile=".\Debug/rbuild.exe" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile=".\Debug/rbuild.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile=".\Debug/rbuild.exe" - LinkIncremental="2" - SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/rbuild.pdb" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile=".\Debug/rbuild.bsc" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> @@ -201,971 +134,872 @@ <Files> <Filter Name="backends" - > + Filter=""> <Filter Name="devcpp" - > - <File - RelativePath="backend\devcpp\devcpp.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + Filter=""> + <File + RelativePath="backend\devcpp\devcpp.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h"> </File> </Filter> <Filter Name="msvc" - > - <File - RelativePath="backend\msvc\genguid.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + Filter=""> + <File + RelativePath="backend\msvc\genguid.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.h" - > - </File> - <File - RelativePath="backend\msvc\msvcmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h"> + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\vcprojmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="mingw" - > - <File - RelativePath="backend\mingw\mingw.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + Filter=""> + <File + RelativePath="backend\mingw\mingw.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\mingw.h" - > - </File> - <File - RelativePath="backend\mingw\modulehandler.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h"> + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\modulehandler.h" - > - </File> - <File - RelativePath="backend\mingw\pch_detection.h" - > - </File> - <File - RelativePath="backend\mingw\proxymakefile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h"> + </File> + <File + RelativePath="backend\mingw\pch_detection.h"> + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_sources" - > - <File - RelativePath="backend\backend.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" + Filter=""> + <File + RelativePath="backend\backend.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_headers" - > - <File - RelativePath="backend\backend.h" - > + Filter=""> + <File + RelativePath="backend\backend.h"> </File> </Filter> </Filter> <Filter Name="rbuild_sources" - > - <File - RelativePath="automaticdependency.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="cdfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunit.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunitsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="configuration.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="define.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="directory.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="exception.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="filesupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="global.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="include.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="installfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerscript.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="module.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="project.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="rbuild.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="stubbedcomponent.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="syssetupgenerator.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="testsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="wineresource.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> + Filter=""> + <File + RelativePath="automaticdependency.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="rbuild_headers" - > - <File - RelativePath="exception.h" - > - </File> - <File - RelativePath="pch.h" - > - </File> - <File - RelativePath="rbuild.h" - > - </File> - <File - RelativePath="test.h" - > + Filter=""> + <File + RelativePath="exception.h"> + </File> + <File + RelativePath="pch.h"> + </File> + <File + RelativePath="rbuild.h"> + </File> + <File + RelativePath="test.h"> </File> </Filter> <Filter Name="inflib" - > - <File - RelativePath="..\..\lib\inflib\builddep.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostglue.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> + Filter=""> + <File + RelativePath="..\..\lib\inflib\builddep.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhost.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infhostgen.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostglue.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\inflib.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infpriv.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="tools" - > - <File - RelativePath="..\ssprintf.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\ssprintf.h" - > - </File> - <File - RelativePath="..\xml.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\xml.h" - > + Filter=""> + <File + RelativePath="..\ssprintf.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\ssprintf.h"> + </File> + <File + RelativePath="..\xml.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\xml.h"> </File> </Filter> </Files>

1 0

[gedmurphy] 21623: add some commctrl.h definitions
by gedmurphy＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: gedmurphy Date: Mon Apr 17 13:21:11 2006 New Revision: 21623 URL: http://svn.reactos.ru/svn/reactos?rev=21623&view=rev Log: add some commctrl.h definitions Modified: trunk/reactos/include/commctrl.h Modified: trunk/reactos/include/commctrl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/commctrl.h?rev=2162… ============================================================================== --- trunk/reactos/include/commctrl.h (original) +++ trunk/reactos/include/commctrl.h Mon Apr 17 13:21:11 2006 @@ -1642,10 +1642,18 @@ #define RBBS_HIDDEN 8 #define RBBS_NOVERT 16 #define RBBS_FIXEDBMP 32 +#if (_WIN32_IE >= 0x0400) +#define RBBS_VARIABLEHEIGHT 0x40 +#define RBBS_GRIPPERALWAYS 0x80 +#define RBBS_NOGRIPPER 0x100 +#if (_WIN32_IE >= 0x0500) +#define RBBS_USECHEVRON 0x200 #if (_WIN32_IE >= 0x0501) #define RBBS_HIDETITLE 0x400 #define RBBS_TOPALIGN 0x800 #endif /* _WIN32_IE >= 0x0501 */ +#endif /* _WIN32_IE >= 0x0500 */ +#endif /* _WIN32_IE >= 0x0400 */ #define RBBIM_STYLE 1 #define RBBIM_COLORS 2 #define RBBIM_TEXT 4 @@ -1763,6 +1771,9 @@ #define RBN_DELETINGBAND (RBN_FIRST-6) #define RBN_DELETEDBAND (RBN_FIRST-7) #define RBN_CHILDSIZE (RBN_FIRST-8) +#if (_WIN32_IE >= 0x0500) +#define RBN_CHEVRONPUSHED (RBN_FIRST - 10) +#endif /* _WIN32_IE >= 0x0500 */ #define RBNM_ID 1 #define RBNM_STYLE 2 #define RBNM_LPARAM 4 @@ -1782,6 +1793,11 @@ #else #define RB_GETBANDINFO (WM_USER+5) #endif /* _WIN32_IE >= 0x0400 */ + +#if (_WIN32_IE >= 0x0500) +#define SB_SIMPLEID 0xFF +#endif /* _WIN32_IE >= 0x0500 */ + #if (_WIN32_WINNT >= 0x0501) #define RB_GETBANDMARGINS (WM_USER+40) #define RB_SETWINDOWTHEME CCM_SETWINDOWTHEME

1 0

[fireball] 21622: Sync to Wine-0_9_9: Francois Gouget <fgouget@free.fr> - mapi: Add some missing MAPI prototypes. Add some missing MAPI prototypes to mapi.h (spotted by winapi_check) and include it where they are implemented. Make mapi.h and mapix.h compatible. gcc does not like macros and prototypes to be redefined so this involved protecting against multiple definitions. Fix the MAPISendMail() implementation prototype. Sync to Wine-0_9_8: Hans Leidekker <hans@it.vu.nl> - mapi32: Implementation
by fireball＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: fireball Date: Mon Apr 17 11:45:48 2006 New Revision: 21622 URL: http://svn.reactos.ru/svn/reactos?rev=21622&view=rev Log: Sync to Wine-0_9_9: Francois Gouget <fgouget(a)free.fr> - mapi: Add some missing MAPI prototypes. Add some missing MAPI prototypes to mapi.h (spotted by winapi_check) and include it where they are implemented. Make mapi.h and mapix.h compatible. gcc does not like macros and prototypes to be redefined so this involved protecting against multiple definitions. Fix the MAPISendMail() implementation prototype. Sync to Wine-0_9_8: Hans Leidekker <hans(a)it.vu.nl> - mapi32: Implementation for MAPISendMail. Implement MAPISendMail, stub MAPILogoff and make the stubs for MAPIInitialize, MAPILogon{,Ex} and MAPILogoff return success. - mapi32: Prevent freeing non-allocated memory. Added: trunk/reactos/dll/win32/mapi32/sendmail.c - copied unchanged from r21360, vendor/wine/dlls/mapi32/current/sendmail.c Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/include/mapi.h trunk/reactos/include/mapicode.h trunk/reactos/include/mapix.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rbu… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.rbuild (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild Mon Apr 17 11:45:48 2006 @@ -14,6 +14,7 @@ <file>mapi32_main.c</file> <file>imalloc.c</file> <file>prop.c</file> + <file>sendmail.c</file> <file>util.c</file> <file>mapi32.spec</file> </module> Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.spe… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec Mon Apr 17 11:45:48 2006 @@ -147,8 +147,8 @@ 207 stdcall CbOfEncoded@4(ptr) CbOfEncoded 208 stub MAPISendDocuments 209 stdcall MAPILogon(long ptr ptr long long ptr) -210 stub MAPILogoff -211 stub MAPISendMail +210 stdcall MAPILogoff(long long long long) +211 stdcall MAPISendMail(long long ptr long long) 212 stub MAPISaveMail 213 stub MAPIReadMail 214 stub MAPIFindNext Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_mai… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Mon Apr 17 11:45:48 2006 @@ -25,6 +25,7 @@ #include "winerror.h" #include "objbase.h" #include "mapix.h" +#include "mapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -67,28 +68,39 @@ return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; } -HRESULT WINAPI MAPIInitialize ( LPVOID lpMapiInit ) +HRESULT WINAPI MAPIInitialize(LPVOID init) { - ERR("Stub\n"); - return MAPI_E_NOT_INITIALIZED; + FIXME("(%p) Stub\n", init); + return SUCCESS_SUCCESS; } -ULONG WINAPI MAPILogon(ULONG ulUIParam, LPSTR lpszProfileName, LPSTR -lpszPassword, FLAGS flFlags, ULONG ulReserver, LPLHANDLE lplhSession) +ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password, + FLAGS flags, ULONG reserved, LPLHANDLE session) { - ERR("Stub\n"); - return MAPI_E_LOGON_FAILED; + FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam, + debugstr_a(profile), password, flags, reserved, session); + + if (session) *session = 1; + return SUCCESS_SUCCESS; } -HRESULT WINAPI MAPILogonEx(ULONG_PTR ulUIParam, LPWSTR lpszProfileName, - LPWSTR lpszPassword, ULONG flFlags, - LPMAPISESSION *lppSession) +ULONG WINAPI MAPILogoff(LHANDLE session, ULONG uiparam, FLAGS flags, + ULONG reserved ) { - ERR("Stub\n"); - return MAPI_E_LOGON_FAILED; + FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session, + uiparam, flags, reserved); + return SUCCESS_SUCCESS; +} + +HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, + LPWSTR password, ULONG flags, LPMAPISESSION *session) +{ + FIXME("(0x%08lx %s %p 0x%08lx %p) Stub\n", uiparam, + debugstr_w(profile), password, flags, session); + return SUCCESS_SUCCESS; } VOID WINAPI MAPIUninitialize(void) { - ERR("Stub\n"); + FIXME("Stub\n"); } Modified: trunk/reactos/include/mapi.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapi.h?rev=21622&r1… ============================================================================== --- trunk/reactos/include/mapi.h (original) +++ trunk/reactos/include/mapi.h Mon Apr 17 11:45:48 2006 @@ -1,163 +1,201 @@ -#ifndef _MAPI_H -#define _MAPI_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +/* + * Copyright (C) 2000 François Gouget + * + * 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 + */ + +#ifndef MAPI_H +#define MAPI_H #ifdef __cplusplus extern "C" { #endif -#define SUCCESS_SUCCESS 0 -#define MAPI_USER_ABORT 1 -#define MAPI_E_USER_ABORT 1 -#define MAPI_E_FAILURE 2 -#define MAPI_E_LOGIN_FAILURE 3 -#define MAPI_E_LOGON_FAILURE 3 -#define MAPI_E_DISK_FULL 4 -#define MAPI_E_INSUFFICIENT_MEMORY 5 -#define MAPI_E_ACCESS_DENIED 6 -#define MAPI_E_BLK_TOO_SMALL 6 -#define MAPI_E_TOO_MANY_SESSIONS 8 -#define MAPI_E_TOO_MANY_FILES 9 -#define MAPI_E_TOO_MANY_RECIPIENTS 10 -#define MAPI_E_ATTACHMENT_NOT_FOUND 11 -#define MAPI_E_ATTACHMENT_OPEN_FAILURE 12 -#define MAPI_E_ATTACHMENT_WRITE_FAILURE 13 -#define MAPI_E_UNKNOWN_RECIPIENT 14 -#define MAPI_E_BAD_RECIPTYPE 15 -#define MAPI_E_NO_MESSAGES 16 -#define MAPI_E_INVALID_MESSAGE 17 -#define MAPI_E_TEXT_TOO_LARGE 18 -#define MAPI_E_INVALID_SESSION 19 -#define MAPI_E_TYPE_NOT_SUPPORTED 20 -#define MAPI_E_AMBIGUOUS_RECIPIENT 21 -#define MAPI_E_AMBIGUOUS_RECIP 21 -#define MAPI_E_MESSAGE_IN_USE 22 -#define MAPI_E_NETWORK_FAILURE 23 -#define MAPI_E_INVALID_EDITFIELDS 24 -#define MAPI_E_INVALID_RECIPS 25 -#define MAPI_E_NOT_SUPPORTED 26 - -#define MAPI_ORIG 0 -#define MAPI_TO 1 -#define MAPI_CC 2 -#define MAPI_BCC 3 - -#define MAPI_LOGON_UI 0x0001 -#define MAPI_NEW_SESSION 0x0002 -#define MAPI_FORCE_DOWNLOAD 0x1000 -#define MAPI_LOGOFF_SHARED 0x0001 -#define MAPI_LOGOFF_UI 0x0002 -#define MAPI_DIALOG 0x0008 -#define MAPI_UNREAD_ONLY 0x0020 -#define MAPI_LONG_MSGID 0x4000 -#define MAPI_GUARANTEE_FIFO 0x0100 -#define MAPI_ENVELOPE_ONLY 0x0040 -#define MAPI_PEEK 0x0080 -#define MAPI_BODY_AS_FILE 0x0200 -#define MAPI_SUPPRESS_ATTACH 0x0800 -#define MAPI_AB_NOMODIFY 0x0400 -#define MAPI_OLE 0x0001 -#define MAPI_OLE_STATIC 0x0002 -#define MAPI_UNREAD 0x0001 -#define MAPI_RECEIPT_REQUESTED 0x0002 -#define MAPI_SENT 0x0004 - -#ifndef RC_INVOKED -typedef unsigned long FLAGS; -typedef unsigned long LHANDLE; -typedef unsigned long FAR *LPLHANDLE, FAR *LPULONG; - -typedef struct { - ULONG ulReserved; - ULONG ulRecipClass; - LPSTR lpszName; - LPSTR lpszAddress; - ULONG ulEIDSize; - LPVOID lpEntryID; +/* Some types */ + +#ifndef __LHANDLE +#define __LHANDLE +typedef unsigned long LHANDLE, *LPLHANDLE; +#endif +#define lhSessionNull ((LHANDLE)0) + +#ifndef WINE_FLAGS_DEFINED +#define WINE_FLAGS_DEFINED +typedef unsigned long FLAGS; +#endif +typedef unsigned long* LPULONG; + +typedef struct +{ + ULONG ulReserved; + ULONG flFlags; + ULONG nPosition; + LPSTR lpszPathName; + LPSTR lpszFileName; + LPVOID lpFileType; +} MapiFileDesc, *lpMapiFileDesc; + +#ifndef MAPI_ORIG +#define MAPI_ORIG 0 +#define MAPI_TO 1 +#define MAPI_CC 2 +#define MAPI_BCC 3 +#endif + +typedef struct +{ + ULONG ulReserved; + ULONG ulRecipClass; + LPSTR lpszName; + LPSTR lpszAddress; + ULONG ulEIDSize; + LPVOID lpEntryID; } MapiRecipDesc, *lpMapiRecipDesc; -typedef struct { - ULONG ulReserved; - ULONG flFlags; - ULONG nPosition; - LPSTR lpszPathName; - LPSTR lpszFileName; - LPVOID lpFileType; -} MapiFileDesc, *lpMapiFileDesc; -typedef struct { - ULONG ulReserved; - ULONG cbTag; - LPBYTE lpTag; - ULONG cbEncoding; - LPBYTE lpEncoding; -} MapiFileTagExt, *lpMapiFileTagExt; -typedef struct { - ULONG ulReserved; - LPSTR lpszSubject; - LPSTR lpszNoteText; - LPSTR lpszMessageType; - LPSTR lpszDateReceived; - LPSTR lpszConversationID; - FLAGS flFlags; - lpMapiRecipDesc lpOriginator; - ULONG nRecipCount; - lpMapiRecipDesc lpRecips; - ULONG nFileCount; - lpMapiFileDesc lpFiles; + +typedef struct +{ + ULONG ulReserved; + LPSTR lpszSubject; + LPSTR lpszNoteText; + LPSTR lpszMessageType; + LPSTR lpszDateReceived; + LPSTR lpszConversationID; + FLAGS flFlags; + lpMapiRecipDesc lpOriginator; + ULONG nRecipCount; + lpMapiRecipDesc lpRecips; + ULONG nFileCount; + lpMapiFileDesc lpFiles; } MapiMessage, *lpMapiMessage; -ULONG PASCAL MAPILogon (ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE); -ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG); -ULONG PASCAL MAPISendDocuments (ULONG,LPSTR,LPSTR,LPSTR,ULONG); -ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, - lpMapiMessage*); -ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPSTR); -ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, - lpMapiRecipDesc*); -ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,ULONG, - lpMapiRecipDesc,FLAGS,ULONG,LPULONG, - lpMapiRecipDesc*); -ULONG PASCAL MAPIFreeBuffer (LPVOID); -ULONG PASCAL MAPIDetails (LHANDLE,ULONG,lpMapiRecipDesc,FLAGS,ULONG); -ULONG PASCAL MAPISaveMail (LHANDLE,ULONG,lpMapiMessage lpszMessage, - FLAGS,ULONG,LPSTR); -ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPSTR,FLAGS,ULONG); -ULONG PASCAL MAPILogoff (LHANDLE,ULONG,FLAGS,ULONG); -/* Netscape extensions. */ -ULONG PASCAL MAPIGetNetscapeVersion (void); -ULONG PASCAL MAPI_NSCP_SynchronizeClient (LHANDLE,ULONG); - -/* Handles for use with GetProcAddress */ -typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPSTR,LPSTR,FLAGS,ULONG, - LPLHANDLE); -typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage, - FLAGS,ULONG); -typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPSTR,LPSTR, - LPSTR,ULONG); -typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPSTR,FLAGS, - ULONG,lpMapiMessage*); -typedef ULONG (PASCAL * LPMAPIFINDNEXT) (LHANDLE,ULONG,LPSTR,LPSTR, - FLAGS,ULONG,LPSTR); -typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPSTR,FLAGS, - ULONG,lpMapiRecipDesc*); -typedef ULONG (PASCAL * LPMAPIADDRESS) (LHANDLE,ULONG,LPSTR,ULONG,LPSTR, - ULONG,lpMapiRecipDesc,FLAGS,ULONG, - LPULONG,lpMapiRecipDesc*); -typedef ULONG (PASCAL * LPMAPIFREEBUFFER) (LPVOID lpv); -typedef ULONG (PASCAL * LPMAPIDETAILS) (LHANDLE,ULONG,lpMapiRecipDesc, - FLAGS,ULONG); -typedef ULONG (PASCAL * LPMAPISAVEMAIL) (LHANDLE,ULONG,lpMapiMessage, - FLAGS,ULONG,LPSTR); -typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG, - LPSTR, FLAGS,ULONG); -typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG); - -#endif /* RC_INVOKED */ + +/* Error codes */ + +#ifndef SUCCESS_SUCCESS +#define SUCCESS_SUCCESS 0L +#endif + +#define MAPI_USER_ABORT 1 +#define MAPI_E_USER_ABORT MAPI_USER_ABORT +#define MAPI_E_FAILURE 2 +#define MAPI_E_LOGON_FAILURE 3 +#define MAPI_E_LOGIN_FAILURE MAPI_E_LOGON_FAILURE +#define MAPI_E_DISK_FULL 4 +#define MAPI_E_INSUFFICIENT_MEMORY 5 +#define MAPI_E_ACCESS_DENIED 6 +#define MAPI_E_TOO_MANY_SESSIONS 8 +#define MAPI_E_TOO_MANY_FILES 9 +#define MAPI_E_TOO_MANY_RECIPIENTS 10 +#define MAPI_E_ATTACHMENT_NOT_FOUND 11 +#define MAPI_E_ATTACHMENT_OPEN_FAILURE 12 +#define MAPI_E_ATTACHMENT_WRITE_FAILURE 13 +#define MAPI_E_UNKNOWN_RECIPIENT 14 +#define MAPI_E_BAD_RECIPTYPE 15 +#define MAPI_E_NO_MESSAGES 16 +#define MAPI_E_INVALID_MESSAGE 17 +#define MAPI_E_TEXT_TOO_LARGE 18 +#define MAPI_E_INVALID_SESSION 19 +#define MAPI_E_TYPE_NOT_SUPPORTED 20 +#define MAPI_E_AMBIGUOUS_RECIPIENT 21 +#define MAPI_E_AMBIG_RECIP MAPI_E_AMBIGUOUS_RECIPIENT +#define MAPI_E_MESSAGE_IN_USE 22 +#define MAPI_E_NETWORK_FAILURE 23 +#define MAPI_E_INVALID_EDITFIELDS 24 +#define MAPI_E_INVALID_RECIPS 25 +#define MAPI_E_NOT_SUPPORTED 26 + + +/* MAPILogon */ + +#ifndef MAPI_LOGON_UI +#define MAPI_LOGON_UI 0x00000001 +#endif +#ifndef MAPI_NEW_SESSION +#define MAPI_NEW_SESSION 0x00000002 +#endif +#ifndef MAPI_EXTENDED +#define MAPI_EXTENDED 0x00000020 +#endif +#ifndef MAPI_FORCE_DOWNLOAD +#define MAPI_FORCE_DOWNLOAD 0x00001000 +#endif +#ifndef MAPI_PASSWORD_UI +#define MAPI_PASSWORD_UI 0x00020000 +#endif + + +/* MAPISendMail */ + +#define MAPI_DIALOG 0x00000008 + + +/* API typedefs and prototypes */ + +typedef ULONG (WINAPI MAPIADDRESS)(LHANDLE,ULONG_PTR,LPSTR,ULONG,LPSTR,ULONG,lpMapiRecipDesc,FLAGS,ULONG,LPULONG,lpMapiRecipDesc*); +typedef MAPIADDRESS *LPMAPIADDRESS; +MAPIADDRESS MAPIAddress; + +typedef ULONG (WINAPI MAPIDELETEMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG); +typedef MAPIDELETEMAIL *LPMAPIDELETEMAIL; +MAPIDELETEMAIL MAPIDeleteMail; + +typedef ULONG (WINAPI MAPIDETAILS)(LHANDLE,ULONG_PTR,lpMapiRecipDesc,FLAGS,ULONG); +typedef MAPIDETAILS *LPMAPIDETAILS; +MAPIDETAILS MAPIDetails; + +typedef ULONG (WINAPI MAPIFINDNEXT)(LHANDLE,ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPSTR); +typedef MAPIFINDNEXT *LPMAPIFINDNEXT; +MAPIFINDNEXT MAPIFindNext; + +#ifndef MAPIFREEBUFFER_DEFINED +#define MAPIFREEBUFFER_DEFINED +typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID); +typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; +MAPIFREEBUFFER MAPIFreeBuffer; +#endif + +typedef ULONG (WINAPI MAPILOGOFF)(LHANDLE,ULONG_PTR,FLAGS,ULONG); +typedef MAPILOGOFF *LPMAPILOGOFF; +MAPILOGOFF MAPILogoff; + +typedef ULONG (WINAPI MAPILOGON)(ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE); +typedef MAPILOGON *LPMAPILOGON; +MAPILOGON MAPILogon; + +typedef ULONG (WINAPI MAPIREADMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiMessage); +typedef MAPIREADMAIL *LPMAPIREADMAIL; +MAPIREADMAIL MAPIReadMail; + +typedef ULONG (WINAPI MAPIRESOLVENAME)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiRecipDesc*); +typedef MAPIRESOLVENAME *LPMAPIRESOLVENAME; +MAPIRESOLVENAME MAPIResolveName; + +typedef ULONG (WINAPI MAPISAVEMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG,LPSTR); +typedef MAPISAVEMAIL *LPMAPISAVEMAIL; +MAPISAVEMAIL MAPISaveMail; + +typedef ULONG (WINAPI MAPISENDDOCUMENTS)(ULONG_PTR,LPSTR,LPSTR,LPSTR,ULONG); +typedef MAPISENDDOCUMENTS *LPMAPISENDDOCUMENTS; +MAPISENDDOCUMENTS MAPISendDocuments; + +typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); +typedef MAPISENDMAIL *LPMAPI; +MAPISENDMAIL MAPISendMail; #ifdef __cplusplus } #endif -#endif /* Not _MAPI_H */ - +#endif /* MAPI_H */ Modified: trunk/reactos/include/mapicode.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapicode.h?rev=2162… ============================================================================== --- trunk/reactos/include/mapicode.h (original) +++ trunk/reactos/include/mapicode.h Mon Apr 17 11:45:48 2006 @@ -28,6 +28,10 @@ #define MAKE_MAPI_E(e) (MAKE_MAPI_SCODE(1,FACILITY_ITF,(e))) #define MAKE_MAPI_S(e) (MAKE_MAPI_SCODE(0,FACILITY_ITF,(e))) + +#ifndef SUCCESS_SUCCESS +#define SUCCESS_SUCCESS 0L +#endif /* Errors */ #define MAPI_E_ACCOUNT_DISABLED ((SCODE)0x80040124) Modified: trunk/reactos/include/mapix.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapix.h?rev=21622&r… ============================================================================== --- trunk/reactos/include/mapix.h (original) +++ trunk/reactos/include/mapix.h Mon Apr 17 11:45:48 2006 @@ -42,20 +42,33 @@ typedef IMsgServiceAdmin *LPSERVICEADMIN; typedef struct IMAPISession *LPMAPISESSION; -typedef unsigned long FLAGS; +#ifndef WINE_FLAGS_DEFINED +#define WINE_FLAGS_DEFINED +typedef unsigned long FLAGS; +#endif /* Flags for MAPILogon and MAPILogonEx */ -#define MAPI_LOGON_UI 0x000001 -#define MAPI_NEW_SESSION 0x000002 -#define MAPI_EXTENDED 0x000020 -#define MAPI_FORCE_DOWNLOAD 0x001000 -#define MAPI_PASSWORD_UI 0x020000 -#define MAPI_ALLOW_OTHERS 0x000008 -#define MAPI_EXPLICIT_PROFILE 0x000010 -#define MAPI_SERVICE_UI_ALWAYS 0x002000 -#define MAPI_NO_MAIL 0x008000 -#define MAPI_NT_SERVICE 0x010000 -#define MAPI_TIMEOUT_SHORT 0x100000 +#ifndef MAPI_LOGON_UI +#define MAPI_LOGON_UI 0x00000001 +#endif +#ifndef MAPI_NEW_SESSION +#define MAPI_NEW_SESSION 0x00000002 +#endif +#define MAPI_ALLOW_OTHERS 0x00000008 +#define MAPI_EXPLICIT_PROFILE 0x00000010 +#ifndef MAPI_EXTENDED +#define MAPI_EXTENDED 0x00000020 +#endif +#ifndef MAPI_FORCE_DOWNLOAD +#define MAPI_FORCE_DOWNLOAD 0x00001000 +#endif +#ifndef MAPI_PASSWORD_UI +#define MAPI_PASSWORD_UI 0x00020000 +#endif +#define MAPI_SERVICE_UI_ALWAYS 0x00002000 +#define MAPI_NO_MAIL 0x00008000 +#define MAPI_NT_SERVICE 0x00010000 +#define MAPI_TIMEOUT_SHORT 0x00100000 #define MAPI_SIMPLE_DEFAULT (MAPI_LOGON_UI|MAPI_ALLOW_OTHERS|MAPI_FORCE_DOWNLOAD) #define MAPI_SIMPLE_EXPLICIT (MAPI_NEW_SESSION|MAPI_EXPLICIT_PROFILE|MAPI_FORCE_DOWNLOAD) @@ -94,9 +107,12 @@ typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE; MAPIALLOCATEMORE MAPIAllocateMore; +#ifndef MAPIFREEBUFFER_DEFINED +#define MAPIFREEBUFFER_DEFINED typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID); typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; MAPIFREEBUFFER MAPIFreeBuffer; +#endif /***************************************************************************** * IMAPISession interface Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Apr 17 11:45:48 2006 @@ -43,11 +43,11 @@ reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 reactos/dll/win32/crypt32 # Synced to Wine-0_9_10 reactos/dll/win32/dbghelp # -reactos/dll/win32/icmp # Synced to Wine-0_9_5 +reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Synced to Wine-0_9_10 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. -reactos/dll/win32/mapi32 # Synced to Wine-0_9_5 +reactos/dll/win32/mapi32 # Synced to Wine-0_9_10 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/mpr # Synced to Wine-0_9_5 reactos/dll/win32/msacm # Out of sync

1 0

[fireball] 21621: - Fix build (by adding needed temporary file)
by fireball＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: fireball Date: Mon Apr 17 11:21:25 2006 New Revision: 21621 URL: http://svn.reactos.ru/svn/reactos?rev=21621&view=rev Log: - Fix build (by adding needed temporary file) Added: trunk/reactos/dll/win32/wininet/inet_ntop.c Added: trunk/reactos/dll/win32/wininet/inet_ntop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/wininet/inet_ntop… ============================================================================== --- trunk/reactos/dll/win32/wininet/inet_ntop.c (added) +++ trunk/reactos/dll/win32/wininet/inet_ntop.c Mon Apr 17 11:21:25 2006 @@ -1,0 +1,189 @@ +/* from NetBSD: inet_ntop.c,v 1.9 2000/01/22 22:19:16 mycroft Exp */ + +/* Copyright (c) 1996 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#define ENOSPC 28 +#define EAFNOSUPPORT 52 + +#ifndef IN6ADDRSZ +#define IN6ADDRSZ 16 +#endif + +#ifndef INT16SZ +#define INT16SZ 2 +#endif + +#ifdef SPRINTF_CHAR +# define SPRINTF(x) strlen(sprintf/**/x) +#else +# define SPRINTF(x) ((size_t)sprintf x) +#endif + +/* + * WARNING: Don't even consider trying to compile this on a system where + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. + */ + +static const char *inet_ntop4(const u_char *src, char *dst, size_t size); +static const char *inet_ntop6(const u_char *src, char *dst, size_t size); + +/* char * + * inet_ntop(af, src, dst, size) + * convert a network format address to presentation format. + * return: + * pointer to presentation format address (`dst'), or NULL (see errno). + * author: + * Paul Vixie, 1996. + */ +const char * +inet_ntop(int af, const void *src, char *dst, size_t size) +{ + + switch (af) { + case AF_INET: + return (inet_ntop4(src, dst, size)); +#ifdef INET6 + case AF_INET6: + return (inet_ntop6(src, dst, size)); +#endif + default: + errno = EAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address, more or less like inet_ntoa() + * return: + * `dst' (as a const) + * notes: + * (1) uses no statics + * (2) takes a u_char* not an in_addr as input + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop4(const u_char *src, char *dst, size_t size) +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; + + if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} + +#ifdef INET6 +/* const char * + * inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop6(const u_char *src, char *dst, size_t size) +{ + /* + * Note that int32_t and int16_t need only be "at least" large enough + * to contain a value of the specified size. On some systems, like + * Crays, there is no such thing as an integer variable with 16 bits. + * Keep this in mind if you think this function should have been coded + * to use pointer overlays. All the world's not a VAX. + */ + char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; + struct { int base, len; } best, cur; + u_int words[IN6ADDRSZ / INT16SZ]; + int i; + + /* + * Preprocess: + * Copy the input (bytewise) array into a wordwise array. + * Find the longest run of 0x00's in src[] for :: shorthanding. + */ + memset(words, '\0', sizeof words); + for (i = 0; i < IN6ADDRSZ; i++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; + cur.base = -1; + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + if (words[i] == 0) { + if (cur.base == -1) + cur.base = i, cur.len = 1; + else + cur.len++; + } else { + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + cur.base = -1; + } + } + } + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + } + if (best.base != -1 && best.len < 2) + best.base = -1; + + /* + * Format the result. + */ + tp = tmp; + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && + i < (best.base + best.len)) { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 && + (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { + if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) + return (NULL); + tp += strlen(tp); + break; + } + tp += SPRINTF((tp, "%x", words[i])); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) + *tp++ = ':'; + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((size_t)(tp - tmp) > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} +#endif +

1 0

[fireball] 21620: - Comment an error-setting line since we don't have get_sock_error() function - Something different should be used here - This change fixes building of the component
by fireball＠svn.reactos.org 16 Apr '06

16 Apr '06

Author: fireball Date: Mon Apr 17 00:10:12 2006 New Revision: 21620 URL: http://svn.reactos.ru/svn/reactos?rev=21620&view=rev Log: - Comment an error-setting line since we don't have get_sock_error() function - Something different should be used here - This change fixes building of the component Modified: trunk/reactos/dll/win32/wininet/netconnection.c Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/wininet/netconnec… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c Mon Apr 17 00:10:12 2006 @@ -674,7 +674,7 @@ if (result == -1) { WARN("setsockopt failed (%s)\n", strerror(errno)); - INTERNET_SetLastError(sock_get_error(errno)); + //INTERNET_SetLastError(sock_get_error(errno)); return FALSE; }

1 0

[fireball] 21618: SVN Maintenance (eol-style: native)
by fireball＠svn.reactos.org 16 Apr '06

16 Apr '06

Author: fireball Date: Sun Apr 16 23:15:04 2006 New Revision: 21618 URL: http://svn.reactos.ru/svn/reactos?rev=21618&view=rev Log: SVN Maintenance (eol-style: native) Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc (contents, props changed) trunk/reactos/dll/win32/crypt32/crypt32_En.rc (contents, props changed) trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc (contents, props changed) trunk/reactos/dll/win32/crypt32/crypt32_No.rc (contents, props changed) trunk/reactos/dll/win32/crypt32/cryptres.h (contents, props changed) trunk/reactos/dll/win32/crypt32/proplist.c (contents, props changed) trunk/reactos/dll/win32/crypt32/serialize.c (contents, props changed) trunk/reactos/dll/win32/crypt32/store.c (contents, props changed) trunk/reactos/dll/win32/crypt32/str.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_D… Modified: trunk/reactos/dll/win32/crypt32/crypt32_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_E… Modified: trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_K… Modified: trunk/reactos/dll/win32/crypt32/crypt32_No.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_N… Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres.… Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist.… Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/serialize… Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?r… Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?rev…

1 0

[fireball] 21616: - Update wincrypt.h to correspond to Wine-0.9.10
by fireball＠svn.reactos.org 16 Apr '06

16 Apr '06

Author: fireball Date: Sun Apr 16 22:44:08 2006 New Revision: 21616 URL: http://svn.reactos.ru/svn/reactos?rev=21616&view=rev Log: - Update wincrypt.h to correspond to Wine-0.9.10 Modified: trunk/reactos/include/wincrypt.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/wincrypt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/wincrypt.h?rev=2161…

1 0

[fireball] 21615: Sync to Wine-0_9_9: Juan Lang <juan_lang@yahoo.com> - wintrust: Add some stubs.
by fireball＠svn.reactos.org 16 Apr '06

16 Apr '06

Author: fireball Date: Sun Apr 16 22:24:52 2006 New Revision: 21615 URL: http://svn.reactos.ru/svn/reactos?rev=21615&view=rev Log: Sync to Wine-0_9_9: Juan Lang <juan_lang(a)yahoo.com> - wintrust: Add some stubs. Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/include/wintrust.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.spec (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.spec Sun Apr 16 22:24:52 2006 @@ -82,10 +82,10 @@ @ stub WTHelperGetKnownUsages @ stub WTHelperGetProvCertFromChain @ stub WTHelperGetProvPrivateDataFromChain -@ stub WTHelperGetProvSignerFromChain +@ stdcall WTHelperGetProvSignerFromChain(ptr long long long) @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores -@ stub WTHelperProvDataFromStateData +@ stdcall WTHelperProvDataFromStateData(ptr) @ stub WVTAsn1CatMemberInfoDecode @ stub WVTAsn1CatMemberInfoEncode @ stub WVTAsn1CatNameValueDecode @@ -109,7 +109,7 @@ @ stub WVTAsn1SpcStatementTypeDecode @ stub WVTAsn1SpcStatementTypeEncode @ stdcall WinVerifyTrust(long ptr ptr) -@ stub WinVerifyTrustEx +@ stdcall WinVerifyTrustEx(long ptr ptr) @ stdcall WintrustAddActionID(ptr long ptr) @ stub WintrustAddDefaultForUsage @ stub WintrustCertificateTrust Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c Sun Apr 16 22:24:52 2006 @@ -94,6 +94,37 @@ } /*********************************************************************** + * WinVerifyTrustEx (WINTRUST.@) + */ +HRESULT WINAPI WinVerifyTrustEx( HWND hwnd, GUID *ActionID, + WINTRUST_DATA* ActionData ) +{ + FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); + return S_OK; +} + +/*********************************************************************** + * WTHelperGetProvSignerFromChain (WINTRUST.@) + */ +CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( + CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, + DWORD idxCounterSigner) +{ + FIXME("%p %ld %d %ld\n", pProvData, idxSigner, fCounterSigner, + idxCounterSigner); + return NULL; +} + +/*********************************************************************** + * WTHelperProvDataFromStateData (WINTRUST.@) + */ +CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData) +{ + FIXME("%p\n", hStateData); + return NULL; +} + +/*********************************************************************** * WintrustAddActionID (WINTRUST.@) */ BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, Modified: trunk/reactos/include/wintrust.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/wintrust.h?rev=2161… ============================================================================== --- trunk/reactos/include/wintrust.h (original) +++ trunk/reactos/include/wintrust.h Sun Apr 16 22:24:52 2006 @@ -121,6 +121,166 @@ CRYPT_TRUST_REG_ENTRY sCleanupProvider; } CRYPT_REGISTER_ACTIONID, *PCRYPT_REGISTER_ACTIONID; +typedef struct _CRYPT_PROVUI_DATA { + DWORD cbStruct; + DWORD dwFinalError; + WCHAR *pYesButtonText; + WCHAR *pNoButtonText; + WCHAR *pMoreInfoButtonText; + WCHAR *pAdvancedLinkText; + WCHAR *pCopyActionText; + WCHAR *pCopyActionTextNoTS; + WCHAR *pCopyActionTextNotSigned; +} CRYPT_PROVUI_DATA, *PCRYPT_PROVUI_DATA; + +typedef struct _CRYPT_PROVIDER_CERT { + DWORD cbStruct; + PCCERT_CONTEXT pCert; + BOOL fCommercial; + BOOL fTrustedRoot; + BOOL fSelfSigned; + BOOL fTestCert; + DWORD dwRevokedReason; + DWORD dwConfidence; + DWORD dwError; + CTL_CONTEXT *pTrustListContext; + BOOL fTrustListSignerCert; + PCCTL_CONTEXT pCtlContext; + DWORD dwCtlError; + BOOL fIsCyclic; + PCERT_CHAIN_ELEMENT pChainElement; +} CRYPT_PROVIDER_CERT, *PCRYPT_PROVIDER_CERT; + +typedef struct _CRYPT_PROVIDER_SGNR { + DWORD cbStruct; + FILETIME sftVerifyAsOf; + DWORD csCertChain; + CRYPT_PROVIDER_CERT *pasCertChain; + DWORD dwSignerType; + CMSG_SIGNER_INFO *psSigner; + DWORD dwError; + DWORD csCounterSigners; + struct _CRYPT_PROVIDER_SGNR *pasCounterSigners; + PCCERT_CHAIN_CONTEXT pChainContext; +} CRYPT_PROVIDER_SGNR, *PCRYPT_PROVIDER_SGNR; + +typedef struct _CRYPT_PROVIDER_PRIVDATA { + DWORD cbStruct; + GUID gProviderID; + DWORD cbProvData; + void *pvProvData; +} CRYPT_PROVIDER_PRIVDATA, *PCRYPT_PROVIDER_PRIVDATA; + +struct _CRYPT_PROVIDER_DATA; + +typedef void * (*PFN_CPD_MEM_ALLOC)(DWORD cbSize); +typedef void (*PFN_CPD_MEM_FREE)(void *pvMem2Free); +typedef BOOL (*PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData, + HCERTSTORE hStore2Add); +typedef BOOL (*PFN_CPD_ADD_SGNR)(struct _CRYPT_PROVIDER_DATA *pProvData, + BOOL fCounterSigner, DWORD idxSigner, struct _CRYPT_PROVIDER_SGNR *pSgnr2Add); +typedef BOOL (*PFN_CPD_ADD_CERT)(struct _CRYPT_PROVIDER_DATA *pProvData, + DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner, + PCCERT_CONTEXT pCert2Add); +typedef BOOL (*PFN_CPD_ADD_PRIVDATA)(struct _CRYPT_PROVIDER_DATA *pProvData, + struct _CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); +typedef HRESULT (*PFN_PROVIDER_INIT_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_OBJTRUST_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_SIGTRUST_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_CERTTTRUST_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_FINALPOLICY_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_TESTFINALPOLICY_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef HRESULT (*PFN_PROVIDER_CLEANUP_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData); +typedef BOOL (*PFN_PROVIDER_CERTCHKPOLICY_CALL)( + struct _CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, + BOOL fCounterSignerChain, DWORD idxCounterSigner); + +typedef struct _CRYPT_PROVIDER_FUNCTIONS { + DWORD cbStruct; + PFN_CPD_MEM_ALLOC pfnAlloc; + PFN_CPD_MEM_FREE pfnFree; + PFN_CPD_ADD_STORE pfnAddStore2Chain; + PFN_CPD_ADD_SGNR pfnAddSgnr2Chain; + PFN_CPD_ADD_CERT pfnAddCert2Chain; + PFN_CPD_ADD_PRIVDATA pfnAddPrivData2Chain; + PFN_PROVIDER_INIT_CALL pfnInitialize; + PFN_PROVIDER_OBJTRUST_CALL pfnObjectTrust; + PFN_PROVIDER_SIGTRUST_CALL pfnSignatureTrust; + PFN_PROVIDER_CERTTTRUST_CALL pfnCertificateTrust; + PFN_PROVIDER_FINALPOLICY_CALL pfnFinalPolicy; + PFN_PROVIDER_CERTCHKPOLICY_CALL pfnCertCheckPolicy; + PFN_PROVIDER_TESTFINALPOLICY_CALL pfnTestFinalPolicy; + struct _CRYPT_PROVUI_FUNCS *psUIpfns; + PFN_PROVIDER_CLEANUP_CALL pfnCleanupPolicy; +} CRYPT_PROVIDER_FUNCTIONS, *PCRYPT_PROVIDER_FUNCTIONS; + +struct SIP_DISPATCH_INFO_; +struct SIP_SUBJECTINFO_; +struct SIP_INDIRECT_DATA_; + +typedef struct _PROVDATA_SIP { + DWORD cbStruct; + GUID gSubject; + struct SIP_DISPATCH_INFO_ *pSip; + struct SIP_DISPATCH_INFO_ *pCATSip; + struct SIP_SUBJECTINFO_ *psSipSubjectInfo; + struct SIP_SUBJECTINFO_ *psSipCATSubjectInfo; + struct SIP_INDIRECT_DATA_ *psIndirectData; +} PROVDATA_SIP, *PPROVDATA_SIP; + +typedef struct _CRYPT_PROVIDER_DATA { + DWORD cbStruct; + WINTRUST_DATA *pWintrustData; + BOOL fOpenedFile; + HWND hWndParent; + GUID *pgActionID; + HCRYPTPROV hProv; + DWORD dwError; + DWORD dwRegSecuritySettings; + DWORD dwRegPolicySettings; + CRYPT_PROVIDER_FUNCTIONS *psPfns; + DWORD cdwTrustStepErrors; + DWORD *padwTrustStepErrors; + DWORD chStores; + HCERTSTORE *pahStores; + DWORD dwEncoding; + HCRYPTMSG hMsg; + DWORD csSigners; + CRYPT_PROVIDER_SGNR *pasSigners; + DWORD dwSubjectChoice; + union { + struct _PROVDATA_SIP *pPDSip; + } DUMMYUNIONNAME; + char *pszUsageOID; + BOOL fRecallWithState; + FILETIME sftSystemTime; + char *pszCTLSignerUsageOID; + DWORD dwProvFlags; + DWORD dwFinalError; + PCERT_USAGE_MATCH pRequestUsage; + DWORD dwTrustPubSettings; + DWORD dwUIStateFlags; +} CRYPT_PROVIDER_DATA, *PCRYPT_PROVIDER_DATA; + +typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, + struct _CRYPT_PROVIDER_DATA *pProvData); + +typedef struct _CRYPT_PROVUI_FUNCS { + DWORD cbStruct; + CRYPT_PROVUI_DATA psUIData; + PFN_PROVUI_CALL pfnOnMoreInfoClick; + PFN_PROVUI_CALL pfnOnMoreInfoClickDefault; + PFN_PROVUI_CALL pfnOnAdvancedClick; + PFN_PROVUI_CALL pfnOnAdvancedClickDefault; +} CRYPT_PROVUI_FUNCS, *PCRYPT_PROVUI_FUNCS; + #include <poppack.h> @@ -131,6 +291,12 @@ BOOL WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); LONG WINAPI WinVerifyTrust(HWND,GUID*,WINTRUST_DATA*); +HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*); + +CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( + CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, + DWORD idxCounterSigner); +CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); #ifdef __cplusplus } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Apr 16 22:24:52 2006 @@ -75,7 +75,7 @@ reactos/dll/win32/uxtheme # Synced to Wine-0_9_5 reactos/dll/win32/version # Out of sync reactos/dll/win32/wininet # Synced to Wine-0_9_5 -reactos/dll/win32/wintrust # Synced to Wine-0_9_5 +reactos/dll/win32/wintrust # Synced to Wine-0_9_10 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

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