Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 41432: - sync quartz with Wine 1.1.23
by khornicek＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: khornicek Date: Wed Jun 17 14:31:16 2009 New Revision: 41432 URL: http://svn.reactos.org/svn/reactos?rev=41432&view=rev Log: - sync quartz with Wine 1.1.23 Modified: trunk/reactos/dll/directx/quartz/control.c trunk/reactos/dll/directx/quartz/mpegsplit.c Modified: trunk/reactos/dll/directx/quartz/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/control… ============================================================================== --- trunk/reactos/dll/directx/quartz/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/control.c [iso-8859-1] Wed Jun 17 14:31:16 2009 @@ -278,6 +278,8 @@ IPin_Release( pin ); } } + IEnumPins_Release( enumpins ); + if (foundend && allnotimpl) hr = E_NOTIMPL; else Modified: trunk/reactos/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/mpegspl… ============================================================================== --- trunk/reactos/dll/directx/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/mpegsplit.c [iso-8859-1] Wed Jun 17 14:31:16 2009 @@ -176,7 +176,6 @@ /* Find the next valid header.. it <SHOULD> be right here */ assert(parse_header(fbuf, &length, &This->position) == S_OK); - assert(length == len || length + 4 == len); IMediaSample_SetActualDataLength(pCurrentSample, length); /* Queue the next sample */

1 0

[khornicek] 41431: - kill warnings
by khornicek＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: khornicek Date: Wed Jun 17 14:10:15 2009 New Revision: 41431 URL: http://svn.reactos.org/svn/reactos?rev=41431&view=rev Log: - kill warnings Modified: trunk/reactos/base/services/tftpd/tftpd.cpp Modified: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Wed Jun 17 14:10:15 2009 @@ -111,7 +111,6 @@ init(); fd_set readfds; timeval tv; - int fdsReady = 0; tv.tv_sec = 20; tv.tv_usec = 0; @@ -297,7 +296,6 @@ if (dw) { LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -309,7 +307,7 @@ (LPTSTR) &lpMsgBuf, 0, NULL ); - printf("Error: %s\nPress Enter..\n", lpMsgBuf); + printf("Error: %p\nPress Enter..\n", lpMsgBuf); getchar(); } } @@ -864,7 +862,7 @@ val = blksize; req.blksize = val; - sprintf(outPtr, "%u", val); + sprintf(outPtr, "%lu", val); outPtr += strlen(outPtr) + 1; } else if (!strcasecmp(inPtr, "tsize")) @@ -880,7 +878,7 @@ if (ftell(req.file) >= 0) { req.tsize = ftell(req.file); - sprintf(outPtr, "%u", req.tsize); + sprintf(outPtr, "%lu", req.tsize); outPtr += strlen(outPtr) + 1; } else @@ -908,7 +906,7 @@ else { req.tsize = 0; - sprintf(outPtr, "%u", req.tsize); + sprintf(outPtr, "%lu", req.tsize); outPtr += strlen(outPtr) + 1; } } @@ -926,7 +924,7 @@ req.timeout = val; req.expiry = time(NULL) + req.timeout; - sprintf(outPtr, "%u", val); + sprintf(outPtr, "%lu", val); outPtr += strlen(outPtr) + 1; } @@ -1221,7 +1219,7 @@ } else { - sprintf(req.serverError.errormessage, "%u Blocks Served", req.fblock - 1); + sprintf(req.serverError.errormessage, "%lu Blocks Served", req.fblock - 1); logMess(&req, 2); req.attempt = UCHAR_MAX; break; @@ -1316,7 +1314,7 @@ { fclose(req.file); req.file = 0; - sprintf(req.serverError.errormessage, "%u Blocks Received", req.fblock); + sprintf(req.serverError.errormessage, "%lu Blocks Received", req.fblock); logMess(&req, 2); req.attempt = UCHAR_MAX; break; @@ -1812,7 +1810,7 @@ } else { - sprintf(logBuff, "Section [HOME], alias name too large", name); + sprintf(logBuff, "Section [HOME], alias %s too large", name); logMess(logBuff, 1); } } @@ -2106,7 +2104,7 @@ if (lEvent == NULL) { - printf("CreateEvent error: %d\n", GetLastError()); + printf("CreateEvent error: %lu\n", GetLastError()); exit(-1); } else if ( GetLastError() == ERROR_ALREADY_EXISTS ) @@ -2124,7 +2122,7 @@ if (tEvent == NULL) { - printf("CreateEvent error: %d\n", GetLastError()); + printf("CreateEvent error: %lu\n", GetLastError()); exit(-1); } else if ( GetLastError() == ERROR_ALREADY_EXISTS ) @@ -2142,7 +2140,7 @@ if (sEvent == NULL) { - printf("CreateEvent error: %d\n", GetLastError()); + printf("CreateEvent error: %lu\n", GetLastError()); exit(-1); } else if ( GetLastError() == ERROR_ALREADY_EXISTS ) @@ -2160,7 +2158,7 @@ if (cEvent == NULL) { - printf("CreateEvent error: %d\n", GetLastError()); + printf("CreateEvent error: %lu\n", GetLastError()); exit(-1); } else if ( GetLastError() == ERROR_ALREADY_EXISTS ) @@ -2194,8 +2192,6 @@ void logMess(char *logBuff, BYTE logLevel) { WaitForSingleObject(lEvent, INFINITE); - - char tempbuff[256]; if (verbatim) printf("%s\n", logBuff);

1 0

[hyperion] 41430: Fix (?) build
by hyperion＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: hyperion Date: Wed Jun 17 06:22:39 2009 New Revision: 41430 URL: http://svn.reactos.org/svn/reactos?rev=41430&view=rev Log: Fix (?) build Modified: trunk/reactos/include/crt/vadefs.h Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Wed Jun 17 06:22:39 2009 @@ -91,7 +91,7 @@ #define __va_copy(d,s) ((void)((d) = (s))) #endif -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L +#if !defined(va_copy) && (!defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L) #define va_copy(d,s) __va_copy((d),(s)) #endif

1 0

[hyperion] 41429: modified include/crt/stdarg.h modified include/crt/vadefs.h Our headers suck so hard. More Visual C++ compatibility
by hyperion＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: hyperion Date: Wed Jun 17 06:18:13 2009 New Revision: 41429 URL: http://svn.reactos.org/svn/reactos?rev=41429&view=rev Log: modified include/crt/stdarg.h modified include/crt/vadefs.h Our headers suck so hard. More Visual C++ compatibility Modified: trunk/reactos/include/crt/stdarg.h trunk/reactos/include/crt/vadefs.h Modified: trunk/reactos/include/crt/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdarg.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdarg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdarg.h [iso-8859-1] Wed Jun 17 06:18:13 2009 @@ -44,15 +44,18 @@ /* Define __gnuc_va_list. */ +#ifdef __GNUC__ #ifndef __GNUC_VA_LIST #define __GNUC_VA_LIST typedef __builtin_va_list __gnuc_va_list; +#endif #endif /* Define the standard macros for the user, if this invocation was from the user program. */ #ifdef _STDARG_H +#ifdef __GNUC__ #define va_start(v,l) __builtin_va_start(v,l) #define va_end(v) __builtin_va_end(v) #define va_arg(v,l) __builtin_va_arg(v,l) @@ -60,11 +63,12 @@ #define va_copy(d,s) __builtin_va_copy(d,s) #endif #define __va_copy(d,s) __builtin_va_copy(d,s) +#endif /* Define va_list, if desired, from __gnuc_va_list. */ /* We deliberately do not define va_list when called from stdio.h, because ANSI C says that stdio.h is not supposed to define - va_list. stdio.h needs to have access to that data type, + va_list. stdio.h needs to have access to that data type, but must not use that name. It should use the name __gnuc_va_list, which is safe because it is reserved for the implementation. */ @@ -88,7 +92,9 @@ #define _VA_LIST va_list #endif #endif /* __i860__ */ +#ifdef __GNUC__ typedef __gnuc_va_list va_list; +#endif #ifdef _SCO_DS #define __VA_LIST #endif @@ -108,7 +114,9 @@ #ifndef _VA_LIST_T_H /* The macro __va_list__ is used by BeOS. */ #ifndef __va_list__ +#ifdef __GNUC__ typedef __gnuc_va_list va_list; +#endif #endif /* not __va_list__ */ #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Wed Jun 17 06:18:13 2009 @@ -37,14 +37,20 @@ #endif #endif +#ifdef __GNUC__ #ifndef __GNUC_VA_LIST #define __GNUC_VA_LIST typedef __builtin_va_list __gnuc_va_list; #endif +#endif #ifndef _VA_LIST_DEFINED #define _VA_LIST_DEFINED +#if defined(__GNUC__) typedef __gnuc_va_list va_list; +#elif defined(_MSC_VER) + typedef char * va_list; +#endif #endif #ifdef __cplusplus @@ -66,16 +72,28 @@ #define _APALIGN(t,ap) (__alignof(t)) #endif -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L -#define va_copy(d,s) __builtin_va_copy(d,s) -#endif -#define __va_copy(d,s) __builtin_va_copy(d,s) - #define _INTSIZEOF(n) ((sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1)) +#if defined(__GNUC__) #define _crt_va_start(v,l) __builtin_va_start(v,l) #define _crt_va_arg(v,l) __builtin_va_arg(v,l) #define _crt_va_end(v) __builtin_va_end(v) +#define __va_copy(d,s) __builtin_va_copy(d,s) +#elif defined(_MSC_VER) + +#if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_CEE) +#error Please implement me +#endif + +#define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l))) +#define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) +#define _crt_va_end(v) ((void)((v) = (va_list)0)) +#define __va_copy(d,s) ((void)((d) = (s))) +#endif + +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L +#define va_copy(d,s) __va_copy((d),(s)) +#endif #ifdef __cplusplus }

1 0

[sginsberg] 41428: - Replace "VOLATILE" with "volatile"
by sginsberg＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: sginsberg Date: Wed Jun 17 02:20:27 2009 New Revision: 41428 URL: http://svn.reactos.org/svn/reactos?rev=41428&view=rev Log: - Replace "VOLATILE" with "volatile" Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4142… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Jun 17 02:20:27 2009 @@ -467,7 +467,7 @@ /* * PVOID * InterlockedExchangePointer( - * IN OUT PVOID VOLATILE *Target, + * IN OUT PVOID volatile *Target, * IN PVOID Value) */ #define InterlockedExchangePointer(Target, Value) \ Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jun 17 02:20:27 2009 @@ -48,7 +48,6 @@ #define UNALLIGNED #define CONST const -#define VOLATILE volatile #define RESTRICTED_POINTER @@ -1213,8 +1212,8 @@ } KSPIN_LOCK_QUEUE_NUMBER, *PKSPIN_LOCK_QUEUE_NUMBER; typedef struct _KSPIN_LOCK_QUEUE { - struct _KSPIN_LOCK_QUEUE *VOLATILE Next; - PKSPIN_LOCK VOLATILE Lock; + struct _KSPIN_LOCK_QUEUE *volatile Next; + PKSPIN_LOCK volatile Lock; } KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; typedef struct _KLOCK_QUEUE_HANDLE {

1 0

[cwittich] 41427: attempt to convert most of this mess into something which at least look like C code
by cwittich＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: cwittich Date: Wed Jun 17 01:12:47 2009 New Revision: 41427 URL: http://svn.reactos.org/svn/reactos?rev=41427&view=rev Log: attempt to convert most of this mess into something which at least look like C code Modified: trunk/reactos/base/applications/paint/dib.c trunk/reactos/base/applications/paint/drawing.c trunk/reactos/base/applications/paint/history.c trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/palette.c trunk/reactos/base/applications/paint/selection.c trunk/reactos/base/applications/paint/toolsettings.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -46,10 +46,15 @@ void SaveDIBToFile(HBITMAP hbm, LPTSTR name, HDC hdc) { BITMAP bm; - GetObject(hbm, sizeof(BITMAP), &bm); + HANDLE hFile; BITMAPFILEHEADER bf; BITMAPINFOHEADER bi; - int imgDataSize = bm.bmWidthBytes*bm.bmHeight; + int imgDataSize; + int bytesWritten; + + GetObject(hbm, sizeof(BITMAP), &bm); + + imgDataSize = bm.bmWidthBytes*bm.bmHeight; bf.bfType = 0x4d42; bf.bfSize = imgDataSize+52; bf.bfReserved1 = 0; @@ -68,12 +73,11 @@ bi.biClrImportant = 0; int *buffer = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, imgDataSize); GetDIBits(hdc, hbm, 0, bm.bmHeight, buffer, (LPBITMAPINFO)&bi, DIB_RGB_COLORS); - HANDLE f = CreateFile(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - int bytesWritten; - WriteFile(f, &bf, 14, (LPDWORD)&bytesWritten, NULL); - WriteFile(f, &bi, 40, (LPDWORD)&bytesWritten, NULL); - WriteFile(f, buffer, imgDataSize, (LPDWORD)&bytesWritten, NULL); - CloseHandle(f); + hFile = CreateFile(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + WriteFile(hFile, &bf, 14, (LPDWORD)&bytesWritten, NULL); + WriteFile(hFile, &bi, 40, (LPDWORD)&bytesWritten, NULL); + WriteFile(hFile, buffer, imgDataSize, (LPDWORD)&bytesWritten, NULL); + CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, buffer); } Modified: trunk/reactos/base/applications/paint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/dr… ============================================================================== --- trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -22,12 +22,13 @@ void Rect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) { + HBRUSH oldBrush; + LOGBRUSH logbrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - LOGBRUSH logbrush; if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = bg; logbrush.lbHatch = 0; - HBRUSH oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Rectangle(hdc, x1, y1, x2, y2); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); @@ -35,12 +36,13 @@ void Ellp(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) { + HBRUSH oldBrush; + LOGBRUSH logbrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - LOGBRUSH logbrush; if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = bg; logbrush.lbHatch = 0; - HBRUSH oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Ellipse(hdc, x1, y1, x2, y2); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); @@ -48,12 +50,13 @@ void RRect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) { + LOGBRUSH logbrush; + HBRUSH oldBrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - LOGBRUSH logbrush; if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = bg; logbrush.lbHatch = 0; - HBRUSH oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); RoundRect(hdc, x1, y1, x2, y2, 16, 16); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); @@ -68,9 +71,10 @@ void Erase(HDC hdc, short x1, short y1, short x2, short y2, int color, int radius) { - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); + short a; + HPEN oldPen; HBRUSH oldBrush = SelectObject(hdc, CreateSolidBrush(color)); - short a; + oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); for (a=0; a<=100; a++) Rectangle(hdc, (x1*(100-a)+x2*a)/100-radius+1, (y1*(100-a)+y2*a)/100-radius+1, (x1*(100-a)+x2*a)/100+radius+1, (y1*(100-a)+y2*a)/100+radius+1); DeleteObject(SelectObject(hdc, oldBrush)); @@ -165,12 +169,13 @@ void RectSel(HDC hdc, short x1, short y1, short x2, short y2) { + HBRUSH oldBrush; + LOGBRUSH logbrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000)); - LOGBRUSH logbrush; logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = 0; logbrush.lbHatch = 0; - HBRUSH oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Rectangle(hdc, x1, y1, x2, y2); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); @@ -178,12 +183,13 @@ void SelectionFrame(HDC hdc, int x1, int y1, int x2, int y2) { + HBRUSH oldBrush; + LOGBRUSH logbrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000)); - LOGBRUSH logbrush; logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = 0; logbrush.lbHatch = 0; - HBRUSH oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Rectangle(hdc, x1, y1, x2, y2); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); Modified: trunk/reactos/base/applications/paint/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -93,6 +93,10 @@ void cropReversible(int x, int y)//FIXME: This function is broken { + HBITMAP oldBitmap; + HPEN oldPen; + HBRUSH oldBrush; + SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd+1)%4]); hBms[(currInd+1)%4] = CreateDIBWithProperties(x, y); @@ -100,9 +104,9 @@ if (undoSteps<3) undoSteps++; redoSteps = 0; - HBITMAP oldBitmap = SelectObject(hSelDC, hBms[currInd]); - HPEN oldPen = SelectObject(hSelDC, CreatePen(PS_SOLID, 1, bgColor)); - HBRUSH oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor)); + oldBitmap = SelectObject(hSelDC, hBms[currInd]); + oldPen = SelectObject(hSelDC, CreatePen(PS_SOLID, 1, bgColor)); + oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor)); Rectangle(hSelDC, 0, 0, x, y); DeleteObject(SelectObject(hSelDC, oldBrush)); DeleteObject(SelectObject(hSelDC, oldPen)); Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -104,15 +104,39 @@ int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) { - hProgInstance = hThisInstance; HWND hwnd; /* This is the handle for our window */ MSG messages; /* Here messages to the application are saved */ - - // Necessary + WNDCLASSEX wclScroll; + WNDCLASSEX wincl; + WNDCLASSEX wclPal; + WNDCLASSEX wclSettings; + WNDCLASSEX wclSelection; + TCHAR progtitle[1000]; + TCHAR resstr[100]; + HMENU menu; + HWND hToolbar; + HIMAGELIST hImageList; + HANDLE haccel; + HBITMAP tempBm; + int i; + TCHAR tooltips[16][30]; + TCHAR *c; + TCHAR sfnFilename[1000]; + TCHAR sfnFiletitle[256]; + TCHAR sfnFilter[1000]; + TCHAR ofnFilename[1000]; + TCHAR ofnFiletitle[256]; + TCHAR ofnFilter[1000]; + int custColors[16] = + {0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, + 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff}; + + hProgInstance = hThisInstance; + + /* Necessary */ InitCommonControls(); - //initializing and registering the window class used for the main window - WNDCLASSEX wincl; + /* initializing and registering the window class used for the main window */ wincl.hInstance = hThisInstance; wincl.lpszClassName = _T("WindowsApp"); wincl.lpfnWndProc = WindowProcedure; @@ -127,9 +151,7 @@ wincl.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wincl); - // initializing and registering the window class used for the scroll box - - WNDCLASSEX wclScroll; + /* initializing and registering the window class used for the scroll box */ wclScroll.hInstance = hThisInstance; wclScroll.lpszClassName = _T("Scrollbox"); wclScroll.lpfnWndProc = WindowProcedure; @@ -144,9 +166,7 @@ wclScroll.hbrBackground = GetSysColorBrush(COLOR_APPWORKSPACE); RegisterClassEx (&wclScroll); - // initializing and registering the window class used for the palette window - - WNDCLASSEX wclPal; + /* initializing and registering the window class used for the palette window */ wclPal.hInstance = hThisInstance; wclPal.lpszClassName = _T("Palette"); wclPal.lpfnWndProc = PalWinProc; @@ -161,9 +181,7 @@ wclPal.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wclPal); - // initializing and registering the window class for the settings window - - WNDCLASSEX wclSettings; + /* initializing and registering the window class for the settings window */ wclSettings.hInstance = hThisInstance; wclSettings.lpszClassName = _T("ToolSettings"); wclSettings.lpfnWndProc = SettingsWinProc; @@ -178,9 +196,7 @@ wclSettings.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wclSettings); - // initializing and registering the window class for the selection frame - - WNDCLASSEX wclSelection; + /* initializing and registering the window class for the selection frame */ wclSelection.hInstance = hThisInstance; wclSelection.lpszClassName = _T("Selection"); wclSelection.lpfnWndProc = SelectionWinProc; @@ -196,24 +212,21 @@ RegisterClassEx (&wclSelection); LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); - TCHAR progtitle[1000]; - TCHAR resstr[100]; LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); - // create main window + /* create main window */ hwnd = CreateWindowEx (0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL); hMainWnd = hwnd; - // loading and setting the window menu from resource - HMENU menu; + /* loading and setting the window menu from resource */ menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU)); SetMenu(hwnd, menu); - HANDLE haccel = LoadAccelerators(hThisInstance, MAKEINTRESOURCE(800)); - - // preloading the draw transparent/nontransparent icons for later use + haccel = LoadAccelerators(hThisInstance, MAKEINTRESOURCE(800)); + + /* preloading the draw transparent/nontransparent icons for later use */ hNontranspIcon = LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_NONTRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); hTranspIcon = LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); @@ -225,19 +238,17 @@ CreateWindowEx (0, _T("STATIC"), _T(""), WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, hThisInstance, NULL); - // creating the 16 bitmap radio buttons and setting the bitmap - - - // FIXME: Unintentionally there is a line above the tool bar. To prevent cropping of the buttons height has been increased from 200 to 205 - HWND hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS, 3, 3, 50, 205, hwnd, NULL, hThisInstance, NULL); - HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); + /* creating the 16 bitmap radio buttons and setting the bitmap */ + + + /* FIXME: Unintentionally there is a line above the tool bar. To prevent cropping of the buttons height has been increased from 200 to 205 */ + hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS, 3, 3, 50, 205, hwnd, NULL, hThisInstance, NULL); + hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); SendMessage(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)hImageList); - HBITMAP tempBm = LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); + tempBm = LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); ImageList_AddMasked(hImageList, tempBm, 0xff00ff); DeleteObject(tempBm); SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - int i; - TCHAR tooltips[16][30]; for (i=0; i<16; i++) { int wrapnow = 0; @@ -246,35 +257,35 @@ TBBUTTON tbbutton = { i, ID_FREESEL + i, TBSTATE_ENABLED | wrapnow, TBSTYLE_CHECKGROUP, {0}, 0, (INT_PTR)tooltips[i] }; SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&tbbutton); } - // SendMessage(hToolbar, TB_SETROWS, MAKEWPARAM(8, FALSE), (LPARAM)NULL); + /* SendMessage(hToolbar, TB_SETROWS, MAKEWPARAM(8, FALSE), (LPARAM)NULL); */ SendMessage(hToolbar, TB_CHECKBUTTON, ID_PEN, MAKELONG(TRUE, 0)); SendMessage(hToolbar, TB_SETMAXTEXTROWS, 0, 0); SendMessage(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(25, 25)); - // SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); - - - - - // creating the tool settings child window + /* SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); */ + + + + + /* creating the tool settings child window */ hToolSettings = CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, hThisInstance, NULL); - // creating the palette child window + /* creating the palette child window */ hPalWin = CreateWindowEx(0, _T("Palette"), _T(""), WS_CHILD | WS_VISIBLE, 56, 9, 255, 32, hwnd, NULL, hThisInstance, NULL); - // creating the scroll box + /* creating the scroll box */ hScrollbox = CreateWindowEx (WS_EX_CLIENTEDGE, _T("Scrollbox"), _T(""), WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 56, 49, 472, 248, hwnd, NULL, hThisInstance, NULL); - // creating the status bar + /* creating the status bar */ hStatusBar = CreateWindowEx (0, STATUSCLASSNAME, _T(""), SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); SendMessage(hStatusBar, SB_SETMINHEIGHT, 21, 0); hScrlClient = CreateWindowEx(0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 500, 500, hScrollbox, NULL, hThisInstance, NULL); - // create selection window (initially hidden) + /* create selection window (initially hidden) */ hSelection = CreateWindowEx(WS_EX_TRANSPARENT, _T("Selection"), _T(""), WS_CHILD | BS_OWNERDRAW, 350, 0, 100, 100, hScrlClient, NULL, hThisInstance, NULL); - // creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn + /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ hImageArea = CreateWindowEx (0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient, NULL, hThisInstance, NULL); hDrawingDC = CreateCompatibleDC(GetDC(hImageArea)); @@ -286,10 +297,7 @@ SelectObject(hDrawingDC, hBms[0]); Rectangle(hDrawingDC, 0-1, 0-1, imgXRes+1, imgYRes+1); - // initializing the CHOOSECOLOR structure for use with ChooseColor - int custColors[16] = - {0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff}; + /* initializing the CHOOSECOLOR structure for use with ChooseColor */ choosecolor.lStructSize = sizeof(CHOOSECOLOR); choosecolor.hwndOwner = hwnd; choosecolor.hInstance = NULL; @@ -300,13 +308,8 @@ choosecolor.lpfnHook = NULL; choosecolor.lpTemplateName = NULL; - TCHAR *c; - - // initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName - TCHAR ofnFilename[1000]; + /* initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName */ CopyMemory(ofnFilename, filename, sizeof(filename)); - TCHAR ofnFiletitle[256]; - TCHAR ofnFilter[1000]; LoadString(hThisInstance, IDS_OPENFILTER, ofnFilter, SIZEOF(ofnFilter)); for (c = ofnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&ofn, sizeof(OPENFILENAME)); @@ -320,10 +323,7 @@ ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); ofn.Flags = OFN_HIDEREADONLY; - TCHAR sfnFilename[1000]; CopyMemory(sfnFilename, filename, sizeof(filename)); - TCHAR sfnFiletitle[256]; - TCHAR sfnFilter[1000]; LoadString(hThisInstance, IDS_SAVEFILTER, sfnFilter, SIZEOF(sfnFilter)); for (c = sfnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&sfn, sizeof(OPENFILENAME)); @@ -338,7 +338,7 @@ sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; - // by moving the window, the things in WM_SIZE are done + /* by moving the window, the things in WM_SIZE are done */ MoveWindow(hwnd, 100, 100, 600, 450, TRUE); /* Make the window visible on the screen */ Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -59,9 +59,11 @@ { case 2: { + short tempX; + short tempY; resetToU1(); - short tempX = max(0, min(x, imgXRes)); - short tempY = max(0, min(y, imgYRes)); + tempX = max(0, min(x, imgXRes)); + tempY = max(0, min(y, imgYRes)); rectSel_dest[0] = rectSel_src[0] = min(startX, tempX); rectSel_dest[1] = rectSel_src[1] = min(startY, tempY); rectSel_dest[2] = rectSel_src[2] = max(startX, tempX)-min(startX, tempX); Modified: trunk/reactos/base/applications/paint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/palette.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/palette.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -19,14 +19,16 @@ { case WM_PAINT: { - DefWindowProc (hwnd, message, wParam, lParam); - HDC hdc = GetDC(hwnd); - HPEN oldPen; - HBRUSH oldBrush; int i; long rectang[4] = {0, 0, 31, 32}; int a; int b; + HDC hdc = GetDC(hwnd); + HPEN oldPen; + HBRUSH oldBrush; + + DefWindowProc (hwnd, message, wParam, lParam); + for (b=2; b<30; b++) for (a=2; a<29; a++) if ((a+b)%2==1) SetPixel(hdc, a, b, GetSysColor(COLOR_BTNHILIGHT)); DrawEdge(hdc, (LPRECT)&rectang, EDGE_RAISED, BF_TOPLEFT); DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_TOPLEFT|BF_BOTTOMRIGHT); Modified: trunk/reactos/base/applications/paint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/se… ============================================================================== --- trunk/reactos/base/applications/paint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/selection.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -28,8 +28,8 @@ { if (!moving) { + HDC hdc=GetDC(hwnd); DefWindowProc (hwnd, message, wParam, lParam); - HDC hdc=GetDC(hwnd); SelectionFrame(hdc, 1, 1, rectSel_dest[2]*zoom/1000+5, rectSel_dest[3]*zoom/1000+5); ReleaseDC(hwnd, hdc); } Modified: trunk/reactos/base/applications/paint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/to… ============================================================================== --- trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -20,13 +20,13 @@ { case WM_PAINT: { + HDC hdc = GetDC(hwnd); + int rectang[4] = {0, 0, 42, 66}; + int rectang2[4] = {0, 70, 42, 136}; + DefWindowProc (hwnd, message, wParam, lParam); - HDC hdc = GetDC(hwnd); - - int rectang[4] = {0, 0, 42, 66}; DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); - int rectang2[4] = {0, 70, 42, 136}; if (activeTool>=13) DrawEdge(hdc, (LPRECT)&rectang2, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); else @@ -64,11 +64,11 @@ break; case 8: { + int i; HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, brushStyle%3*13+2, brushStyle/3*15+2, brushStyle%3*13+15, brushStyle/3*15+17); DeleteObject(SelectObject(hdc, oldPen)); - int i; for (i=0; i<12; i++) if (i==brushStyle) Brush(hdc, i%3*13+7, i/3*15+8, i%3*13+7, i/3*15+8, GetSysColor(COLOR_HIGHLIGHTTEXT), i); Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Wed Jun 17 01:12:47 2009 @@ -64,9 +64,9 @@ { TCHAR programname[20]; TCHAR saveprompttext[100]; + TCHAR temptext[500]; LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, saveprompttext, SIZEOF(saveprompttext)); - TCHAR temptext[500]; _stprintf(temptext, saveprompttext, filename); switch (MessageBox(hwnd, temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { @@ -157,11 +157,12 @@ if ((hwnd==hImageArea)||(hwnd==hScrollbox)) { long clientRectScrollbox[4]; + long clientRectImageArea[4]; + SCROLLINFO horzScroll; + SCROLLINFO vertScroll; GetClientRect(hScrollbox, (LPRECT)&clientRectScrollbox); - long clientRectImageArea[4]; GetClientRect(hImageArea, (LPRECT)&clientRectImageArea); MoveWindow(hScrlClient, 0, 0, max(clientRectImageArea[2]+6, clientRectScrollbox[2]), max(clientRectImageArea[3]+6, clientRectScrollbox[3]), TRUE); - SCROLLINFO horzScroll; horzScroll.cbSize = sizeof(SCROLLINFO); horzScroll.fMask = SIF_PAGE | SIF_RANGE; horzScroll.nMax = 10000; @@ -171,7 +172,6 @@ horzScroll.nTrackPos = 0; SetScrollInfo(hScrollbox, SB_HORZ, &horzScroll, TRUE); GetClientRect(hScrollbox, (LPRECT)clientRectScrollbox); - SCROLLINFO vertScroll; vertScroll.cbSize = sizeof(SCROLLINFO); vertScroll.fMask = SIF_PAGE | SIF_RANGE; vertScroll.nMax = 10000; @@ -388,10 +388,10 @@ HBITMAP bmNew = (HBITMAP)LoadDIBFromFile(ofn.lpstrFile); if (bmNew!=NULL) { + TCHAR tempstr[1000]; + TCHAR resstr[100]; insertReversible(bmNew); updateCanvasAndScrollbars(); - TCHAR tempstr[1000]; - TCHAR resstr[100]; CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); @@ -411,9 +411,9 @@ case IDM_FILESAVEAS: if (GetSaveFileName(&sfn)!=0) { - SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC); TCHAR tempstr[1000]; TCHAR resstr[100]; + SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC); CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, sfn.lpstrFileTitle, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); @@ -484,9 +484,10 @@ break; case IDM_IMAGEINVERTCOLORS: { + RECT tempRect; newReversible(); - int tempRect[4] = {0, 0, imgXRes, imgYRes}; - InvertRect(hDrawingDC, (LPRECT)tempRect); + SetRect(&tempRect, 0, 0, imgXRes, imgYRes); + InvertRect(hDrawingDC, &tempRect); SendMessage(hImageArea, WM_PAINT, 0, 0); } break;

1 0

[dchapyshev] 41426: - Stub-implement NhGetInterfaceNameFromDeviceGuid and SetIpForwardEntryToStack. Fixes taskmgr (from windows) crash on network page
by dchapyshev＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: dchapyshev Date: Tue Jun 16 23:10:29 2009 New Revision: 41426 URL: http://svn.reactos.org/svn/reactos?rev=41426&view=rev Log: - Stub-implement NhGetInterfaceNameFromDeviceGuid and SetIpForwardEntryToStack. Fixes taskmgr (from windows) crash on network page Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Tue Jun 16 23:10:29 2009 @@ -110,7 +110,7 @@ @ stub NTPTimeToNTFileTime @ stub NTTimeToNTPTime @ stub NhGetGuidFromInterfaceName -@ stub NhGetInterfaceNameFromDeviceGuid +@ stdcall NhGetInterfaceNameFromDeviceGuid(long long long long long) @ stub NhGetInterfaceNameFromGuid @ stub NhpAllocateAndGetInterfaceInfoFromStack @ stub NhpGetInterfaceIndexFromStack @@ -125,7 +125,7 @@ @ stdcall SetIfEntry( ptr ) @ stub SetIfEntryToStack @ stdcall SetIpForwardEntry( ptr ) -@ stub SetIpForwardEntryToStack +@ stdcall SetIpForwardEntryToStack( ptr ) @ stub SetIpMultihopRouteEntryToStack @ stdcall SetIpNetEntry( ptr ) @ stub SetIpNetEntryToStack Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Jun 16 23:10:29 2009 @@ -2252,4 +2252,20 @@ return ERROR_NOT_SUPPORTED; } - +DWORD WINAPI +SetIpForwardEntryToStack(PMIB_IPFORWARDROW pRoute) +{ + FIXME("SetIpForwardEntryToStack() stub\n"); + return 0L; +} + +DWORD WINAPI +NhGetInterfaceNameFromDeviceGuid(DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + FIXME("NhGetInterfaceNameFromDeviceGuid() stub\n"); + return 0L; +}

1 0

[dchapyshev] 41425: - Revert last wine sync for imagelist See issue #4304 for more details.
by dchapyshev＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: dchapyshev Date: Tue Jun 16 23:05:42 2009 New Revision: 41425 URL: http://svn.reactos.org/svn/reactos?rev=41425&view=rev Log: - Revert last wine sync for imagelist See issue #4304 for more details. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Tue Jun 16 23:05:42 2009 @@ -155,7 +155,7 @@ * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) +IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; @@ -166,15 +166,14 @@ && (himl->cy >= cy)) return; - if (cx == 0) cx = himl->cx; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz); TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); @@ -248,7 +247,7 @@ nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); hdcBitmap = CreateCompatibleDC(0); @@ -350,7 +349,7 @@ else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -2304,7 +2303,7 @@ if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); + IMAGELIST_InternalExpandBitmaps (himl, 1, 0); nIndex = himl->cCurImage; himl->cCurImage++;

1 0

[dchapyshev] 41424: - Add Symbol font from Wine
by dchapyshev＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: dchapyshev Date: Tue Jun 16 19:41:29 2009 New Revision: 41424 URL: http://svn.reactos.org/svn/reactos?rev=41424&view=rev Log: - Add Symbol font from Wine Added: trunk/reactos/media/fonts/symbol.ttf (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/fonts/fonts.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jun 16 19:41:29 2009 @@ -551,6 +551,7 @@ media\fonts\LiberationSerif-Regular.ttf 3 media\fonts\Marlett.ttf 3 +media\fonts\symbol.ttf 3 media\fonts\tahoma.ttf 3 media\fonts\tahomabd.ttf 3 Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r… ============================================================================== --- trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] Tue Jun 16 19:41:29 2009 @@ -30,6 +30,7 @@ <installfile installbase="fonts">LiberationSerif-Italic.ttf</installfile> <installfile installbase="fonts">LiberationSerif-Regular.ttf</installfile> <installfile installbase="fonts">Marlett.ttf</installfile> + <installfile installbase="fonts">symbol.ttf</installfile> <installfile installbase="fonts">tahoma.ttf</installfile> <installfile installbase="fonts">tahomabd.ttf</installfile> </group> Added: trunk/reactos/media/fonts/symbol.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/symbol.ttf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/symbol.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[dchapyshev] 41423: - Add ntlanman.dll (not implemented)
by dchapyshev＠svn.reactos.org 16 Jun '09

16 Jun '09

Author: dchapyshev Date: Tue Jun 16 19:38:45 2009 New Revision: 41423 URL: http://svn.reactos.org/svn/reactos?rev=41423&view=rev Log: - Add ntlanman.dll (not implemented) Added: trunk/reactos/dll/win32/ntlanman/ (with props) trunk/reactos/dll/win32/ntlanman/ntlanman.c (with props) trunk/reactos/dll/win32/ntlanman/ntlanman.rbuild (with props) trunk/reactos/dll/win32/ntlanman/ntlanman.rc (with props) trunk/reactos/dll/win32/ntlanman/ntlanman.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=414… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -41,6 +41,7 @@ <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> + <property name="BASEADDRESS_NTLANMAN" value="0x5f380000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> <property name="BASEADDRESS_NTPRINT" value="0x5f6a0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -356,6 +356,7 @@ dll\win32\netshell\netshell.dll 1 dll\win32\newdev\newdev.dll 1 dll\win32\ntdsapi\ntdsapi.dll 1 +dll\win32\ntlanman\ntlanman.dll 1 dll\win32\ntmarta\ntmarta.dll 1 dll\win32\ntprint\ntprint.dll 1 dll\win32\objsel\objsel.dll 1 Propchange: trunk/reactos/dll/win32/ntlanman/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jun 16 19:38:45 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/ntlanman/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/ntlanman/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/ntlanman/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/ntlanman/ntlanman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/ntlanma… ============================================================================== --- trunk/reactos/dll/win32/ntlanman/ntlanman.c (added) +++ trunk/reactos/dll/win32/ntlanman/ntlanman.c [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -1,0 +1,197 @@ +/* + * PROJECT: LAN Manager + * FILE: dll\win32\ntlanman\ntlanman.c + * PURPOSE: Main file + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <npapi.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlanman); + +DWORD +WINAPI +NPGetConnection(LPWSTR lpLocalName, + LPWSTR lpRemoteName, + LPDWORD lpBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetCaps(DWORD nIndex) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetUser(LPWSTR lpName, + LPWSTR lpUserName, + LPDWORD lpBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPAddConnection(LPNETRESOURCE lpNetResource, + LPWSTR lpPassword, + LPWSTR lpUserName) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPCancelConnection(LPWSTR lpName, + BOOL fForce) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPPropertyDialog(HWND hwndParent, + DWORD iButtonDlg, + DWORD nPropSel, + LPWSTR lpFileName, + DWORD nType) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetDirectoryType(LPWSTR lpName, + LPINT lpType, + BOOL bFlushCache) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPDirectoryNotify(HWND hwnd, + LPWSTR lpDir, + DWORD dwOper) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetPropertyText(DWORD iButton, + DWORD nPropSel, + LPWSTR lpName, + LPWSTR lpButtonName, + DWORD nButtonNameLen, + DWORD nType) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPOpenEnum(DWORD dwScope, + DWORD dwType, + DWORD dwUsage, + LPNETRESOURCE lpNetResource, + LPHANDLE lphEnum) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPEnumResource(HANDLE hEnum, + LPDWORD lpcCount, + LPVOID lpBuffer, + LPDWORD lpBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPCloseEnum(HANDLE hEnum) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPFormatNetworkName(LPWSTR lpRemoteName, + LPWSTR lpFormattedName, + LPDWORD lpnLength, + DWORD dwFlags, + DWORD dwAveCharPerLine) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPAddConnection3(HWND hwndOwner, + LPNETRESOURCE lpNetResource, + LPWSTR lpPassword, + LPWSTR lpUserName, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetUniversalName(LPCWSTR lpLocalPath, + DWORD dwInfoLevel, + LPVOID lpBuffer, + LPDWORD lpBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +WINAPI +NPGetResourceParent(LPNETRESOURCE lpNetResource, + LPVOID lpBuffer, + LPDWORD lpcbBuffer) +{ + UNIMPLEMENTED; + return 0; +} + + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/ntlanman/ntlanman.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntlanman/ntlanman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/ntlanma… ============================================================================== --- trunk/reactos/dll/win32/ntlanman/ntlanman.rbuild (added) +++ trunk/reactos/dll/win32/ntlanman/ntlanman.rbuild [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ntlanman" type="win32dll" baseaddress="${BASEADDRESS_NTLANMAN}" installbase="system32" installname="ntlanman.dll" unicode="yes"> + <importlibrary definition="ntlanman.spec" /> + <include base="ntlanman">.</include> + <library>kernel32</library> + <library>netapi32</library> + <library>ntdll</library> + <library>wine</library> + <file>ntlanman.c</file> + <file>ntlanman.rc</file> +</module> Propchange: trunk/reactos/dll/win32/ntlanman/ntlanman.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntlanman/ntlanman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/ntlanma… ============================================================================== --- trunk/reactos/dll/win32/ntlanman/ntlanman.rc (added) +++ trunk/reactos/dll/win32/ntlanman/ntlanman.rc [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "LAN Manager\0" +#define REACTOS_STR_INTERNAL_NAME "ntlanman\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ntlanman.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ntlanman/ntlanman.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntlanman/ntlanman.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/ntlanma… ============================================================================== --- trunk/reactos/dll/win32/ntlanman/ntlanman.spec (added) +++ trunk/reactos/dll/win32/ntlanman/ntlanman.spec [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -1,0 +1,43 @@ +1 stub -noname Ordinal1 +2 stub -noname Ordinal2 +3 stub -noname Ordinal3 +4 stub -noname Ordinal4 +5 stub -noname Ordinal5 +6 stub -noname Ordinal6 +7 stub -noname Ordinal7 +8 stub -noname Ordinal8 +9 stub -noname Ordinal9 +10 stub -noname Ordinal10 +11 stub -noname Ordinal11 +12 stdcall NPGetConnection(wstr wstr ptr) +13 stdcall NPGetCaps(long) +14 stdcall DllMain(ptr long ptr) +15 stub I_SystemFocusDialog +16 stdcall NPGetUser(wstr wstr ptr) +17 stdcall NPAddConnection(ptr wstr wstr) +18 stdcall NPCancelConnection(wstr long) +19 stub IsDfsPathEx +20 stub NPAddConnection3ForCSCAgent +21 stub NPCancelConnectionForCSCAgent +22 stub ServerBrowseDialogA0 +23 stub ShareAsDialogA0 +24 stub ShareCreate +25 stub ShareManage +26 stub ShareStop +27 stub StopShareDialogA0 +28 stub -noname Ordinal28 +29 stdcall NPPropertyDialog(ptr long long wstr long) +30 stdcall NPGetDirectoryType(wstr ptr long) +31 stdcall NPDirectoryNotify(ptr wstr long) +32 stdcall NPGetPropertyText(long long wstr wstr long long) +33 stdcall NPOpenEnum(long long long ptr ptr) +34 stdcall NPEnumResource(ptr ptr ptr ptr) +35 stdcall NPCloseEnum(ptr) +36 stdcall NPFormatNetworkName(wstr wstr ptr long long) +37 stub -noname Ordinal37 +38 stdcall NPAddConnection3(ptr ptr wstr wstr long) +39 stub -noname Ordinal39 +40 stdcall NPGetUniversalName(wstr long ptr ptr) +41 stdcall NPGetResourceParent(ptr ptr ptr) +42 stub -noname Ordinal42 +43 stub -noname Ordinal43 Propchange: trunk/reactos/dll/win32/ntlanman/ntlanman.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue Jun 16 19:38:45 2009 @@ -328,6 +328,9 @@ <directory name="ntdsapi"> <xi:include href="ntdsapi/ntdsapi.rbuild" /> </directory> +<directory name="ntlanman"> + <xi:include href="ntlanman/ntlanman.rbuild" /> +</directory> <directory name="ntmarta"> <xi:include href="ntmarta/ntmarta.rbuild" /> </directory>

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