Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[dchapyshev] 42986: - Sync windowscodecs with Wine 1.1.29

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Sep 3 16:54:19 2009 New Revision: 42986 URL: http://svn.reactos.org/svn/reactos?rev=42986&view=rev Log: - Sync windowscodecs with Wine 1.1.29 Added: trunk/reactos/dll/win32/windowscodecs/jpegformat.c (with props) trunk/reactos/dll/win32/windowscodecs/pngformat.c (with props) Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild trunk/reactos/include/psdk/wincodec.idl Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -333,8 +333,8 @@ bih.bV5BitCount = This->format->bpp; bih.bV5Compression = This->format->compression; bih.bV5SizeImage = This->stride*This->height; - bih.bV5XPelsPerMeter = (This->xres-0.0127) / 0.0254; - bih.bV5YPelsPerMeter = (This->yres-0.0127) / 0.0254; + bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; + bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; bih.bV5ClrUsed = 0; bih.bV5ClrImportant = 0; Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -44,9 +44,11 @@ static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, + {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, + {&CLSID_WICJpegDecoder, JpegDecoder_CreateInstance}, {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {0}}; Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -37,13 +37,21 @@ enum pixelformat { format_1bppIndexed, + format_2bppIndexed, format_4bppIndexed, format_8bppIndexed, + format_BlackWhite, + format_2bppGray, + format_4bppGray, + format_8bppGray, + format_16bppGray, format_16bppBGR555, format_16bppBGR565, format_24bppBGR, format_32bppBGR, - format_32bppBGRA + format_32bppBGRA, + format_48bppRGB, + format_64bppRGBA, }; typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, @@ -65,12 +73,23 @@ WICBitmapPaletteType palette_type; } FormatConverter; +static void make_grayscale_palette(WICColor *colors, UINT num_colors) +{ + int i, v; + for (i=0; i<num_colors; i++) + { + v = i * 255 / (num_colors-1); + colors[i] = 0xff000000 | v<<16 | v<<8 | v; + } +} + static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { switch (source_format) { case format_1bppIndexed: + case format_BlackWhite: if (prc) { HRESULT res; @@ -85,16 +104,24 @@ IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; - - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); - - IWICPalette_Release(palette); - - if (FAILED(res)) return res; + if (source_format == format_1bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + { + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + } srcstride = (prc->Width+7)/8; srcdatasize = srcstride * prc->Height; @@ -133,7 +160,73 @@ return res; } return S_OK; + case format_2bppIndexed: + case format_2bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + WICColor colors[4]; + IWICPalette *palette; + UINT actualcolors; + + if (source_format == format_2bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 4); + + srcstride = (prc->Width+3)/4; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x+=4) { + BYTE srcval; + srcval=*srcbyte++; + *dstpixel++ = colors[srcval>>6]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; + if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_4bppIndexed: + case format_4bppGray: if (prc) { HRESULT res; @@ -148,16 +241,21 @@ IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; - - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - - IWICPalette_Release(palette); - - if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 16); srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height; @@ -190,6 +288,48 @@ return res; } return S_OK; + case format_8bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte++; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_8bppIndexed: if (prc) { @@ -233,6 +373,48 @@ dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) *dstpixel++ = colors[*srcbyte++]; + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + case format_16bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width * 2; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte+=2; + } srcrow += srcstride; dstrow += cbStride; } @@ -401,6 +583,95 @@ if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; + case format_48bppRGB: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 6 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + *dstpixel++=0xff000000|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + case format_64bppRGBA: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 8 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue, alpha; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + alpha = *srcpixel++; srcpixel++; + *dstpixel++=alpha<<24|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; default: return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -423,13 +694,21 @@ static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, + {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, + {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, + {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, + {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, + {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, + {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {0} }; Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1064,6 +1064,7 @@ } else { + FIXME("cannot convert %s to %s\n", debugstr_guid(&srcFormat), debugstr_guid(dstFormat)); *ppIDst = NULL; return WINCODEC_ERR_COMPONENTNOTFOUND; } Added: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c (added) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1,0 +1,577 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#ifdef SONAME_LIBJPEG +/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ +#define XMD_H +#define UINT8 JPEG_UINT8 +#define UINT16 JPEG_UINT16 +#define boolean jpeg_boolean +#undef HAVE_STDLIB_H +# include <jpeglib.h> +#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 +#undef UINT8 +#undef UINT16 +#undef boolean +#endif + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" +#include "wine/library.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBJPEG + +static void *libjpeg_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(jpeg_CreateDecompress); +MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_read_header); +MAKE_FUNCPTR(jpeg_read_scanlines); +MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_start_decompress); +MAKE_FUNCPTR(jpeg_std_error); +#undef MAKE_FUNCPTR + +static void *load_libjpeg(void) +{ + if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = wine_dlsym(libjpeg_handle, #f, NULL, 0)) == NULL) { \ + libjpeg_handle = NULL; \ + return NULL; \ + } + + LOAD_FUNCPTR(jpeg_CreateDecompress); + LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_read_header); + LOAD_FUNCPTR(jpeg_read_scanlines); + LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_start_decompress); + LOAD_FUNCPTR(jpeg_std_error); +#undef LOAD_FUNCPTR + } + return libjpeg_handle; +} + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + LONG ref; + BOOL initialized; + BOOL cinfo_initialized; + IStream *stream; + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_source_mgr source_mgr; + BYTE source_buffer[1024]; + BYTE *image_data; +} JpegDecoder; + +static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) +{ + return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); +} + +static inline JpegDecoder *decoder_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, JpegDecoder, lpFrameVtbl); +} + +static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + JpegDecoder *This = (JpegDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegDecoder_AddRef(IWICBitmapDecoder *iface) +{ + JpegDecoder *This = (JpegDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) +{ + JpegDecoder *This = (JpegDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); + if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This->image_data); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static void source_mgr_init_source(j_decompress_ptr cinfo) +{ +} + +static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(This->stream, This->source_buffer, 1024, &bytesread); + + if (hr != S_OK || bytesread == 0) + { + return FALSE; + } + else + { + This->source_mgr.next_input_byte = This->source_buffer; + This->source_mgr.bytes_in_buffer = bytesread; + return TRUE; + } +} + +static void source_mgr_skip_input_data(j_decompress_ptr cinfo, long num_bytes) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + LARGE_INTEGER seek; + + if (num_bytes > This->source_mgr.bytes_in_buffer) + { + seek.QuadPart = num_bytes - This->source_mgr.bytes_in_buffer; + IStream_Seek(This->stream, seek, STREAM_SEEK_CUR, NULL); + This->source_mgr.bytes_in_buffer = 0; + } + else if (num_bytes > 0) + { + This->source_mgr.next_input_byte += num_bytes; + This->source_mgr.bytes_in_buffer -= num_bytes; + } +} + +static void source_mgr_term_source(j_decompress_ptr cinfo) +{ +} + +static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + JpegDecoder *This = (JpegDecoder*)iface; + int ret; + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); + + if (This->cinfo_initialized) return WINCODEC_ERR_WRONGSTATE; + + This->cinfo.err = pjpeg_std_error(&This->jerr); + + pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); + + This->cinfo_initialized = TRUE; + + This->stream = pIStream; + IStream_AddRef(pIStream); + + This->source_mgr.bytes_in_buffer = 0; + This->source_mgr.init_source = source_mgr_init_source; + This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer; + This->source_mgr.skip_input_data = source_mgr_skip_input_data; + This->source_mgr.resync_to_restart = pjpeg_resync_to_restart; + This->source_mgr.term_source = source_mgr_term_source; + + This->cinfo.src = &This->source_mgr; + + ret = pjpeg_read_header(&This->cinfo, TRUE); + + if (ret != JPEG_HEADER_OK) { + WARN("Jpeg image in stream has bad format, read header returned %d.\n",ret); + return E_FAIL; + } + + if (This->cinfo.jpeg_color_space == JCS_GRAYSCALE) + This->cinfo.out_color_space = JCS_GRAYSCALE; + else + This->cinfo.out_color_space = JCS_RGB; + + if (!pjpeg_start_decompress(&This->cinfo)) + { + ERR("jpeg_start_decompress failed\n"); + return E_FAIL; + } + + This->initialized = TRUE; + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; +} + +static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + *pCount = 1; + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + JpegDecoder *This = (JpegDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + + return S_OK; +} + +static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { + JpegDecoder_QueryInterface, + JpegDecoder_AddRef, + JpegDecoder_Release, + JpegDecoder_QueryCapability, + JpegDecoder_Initialize, + JpegDecoder_GetContainerFormat, + JpegDecoder_GetDecoderInfo, + JpegDecoder_CopyPalette, + JpegDecoder_GetMetadataQueryReader, + JpegDecoder_GetPreview, + JpegDecoder_GetColorContexts, + JpegDecoder_GetThumbnail, + JpegDecoder_GetFrameCount, + JpegDecoder_GetFrame +}; + +static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + JpegDecoder *This = decoder_from_frame(iface); + *puiWidth = This->cinfo.output_width; + *puiHeight = This->cinfo.output_height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + JpegDecoder *This = decoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + if (This->cinfo.out_color_space == JCS_RGB) + memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + else /* This->cinfo.out_color_space == JCS_GRAYSCALE */ + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + JpegDecoder *This = decoder_from_frame(iface); + UINT bpp; + UINT stride; + UINT data_size; + UINT max_row_needed; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; + else bpp = 24; + + stride = bpp * This->cinfo.output_width; + data_size = stride * This->cinfo.output_height; + + max_row_needed = prc->Y + prc->Height; + if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; + + if (!This->image_data) + { + This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!This->image_data) return E_OUTOFMEMORY; + } + + while (max_row_needed > This->cinfo.output_scanline) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + UINT i, j; + JDIMENSION ret; + + max_rows = min(This->cinfo.output_height-first_scanline, 4); + for (i=0; i<max_rows; i++) + out_rows[i] = This->image_data + stride * (first_scanline+i); + + ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); + + if (ret == 0) + { + ERR("read_scanlines failed\n"); + return E_FAIL; + } + + if (bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + for (i=first_scanline; i<This->cinfo.output_scanline; i++) + { + BYTE *pixel = This->image_data + stride * i; + for (j=0; j<This->cinfo.output_width; j++) + { + BYTE red=pixel[0]; + BYTE blue=pixel[2]; + pixel[0]=blue; + pixel[2]=red; + pixel+=3; + } + } + } + } + + return copy_pixels(bpp, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, stride, + prc, cbStride, cbBufferSize, pbBuffer); +} + +static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static const IWICBitmapFrameDecodeVtbl JpegDecoder_Frame_Vtbl = { + JpegDecoder_Frame_QueryInterface, + JpegDecoder_Frame_AddRef, + JpegDecoder_Frame_Release, + JpegDecoder_Frame_GetSize, + JpegDecoder_Frame_GetPixelFormat, + JpegDecoder_Frame_GetResolution, + JpegDecoder_Frame_CopyPalette, + JpegDecoder_Frame_CopyPixels, + JpegDecoder_Frame_GetMetadataQueryReader, + JpegDecoder_Frame_GetColorContexts, + JpegDecoder_Frame_GetThumbnail +}; + +HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + JpegDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + if (!libjpeg_handle && !load_libjpeg()) + { + ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); + return E_FAIL; + } + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &JpegDecoder_Vtbl; + This->lpFrameVtbl = &JpegDecoder_Frame_Vtbl; + This->ref = 1; + This->initialized = FALSE; + This->cinfo_initialized = FALSE; + This->stream = NULL; + This->image_data = NULL; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + +#else /* !defined(SONAME_LIBJPEG) */ + +HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n"); + return E_FAIL; +} + +#endif Propchange: trunk/reactos/dll/win32/windowscodecs/jpegformat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c (added) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1,0 +1,650 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#ifdef HAVE_PNG_H +#include <png.h> +#endif + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" +#include "wine/library.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBPNG + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_PLTE); +MAKE_FUNCPTR(png_get_tRNS); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); +MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_read_fn); +MAKE_FUNCPTR(png_set_strip_16); +MAKE_FUNCPTR(png_set_tRNS_to_alpha); +MAKE_FUNCPTR(png_read_end); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_read_info); +#undef MAKE_FUNCPTR + +static void *load_libpng(void) +{ + if((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) { \ + libpng_handle = NULL; \ + return NULL; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_PLTE); + LOAD_FUNCPTR(png_get_tRNS); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); + LOAD_FUNCPTR(png_set_strip_16); + LOAD_FUNCPTR(png_set_tRNS_to_alpha); + LOAD_FUNCPTR(png_read_end); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + +#undef LOAD_FUNCPTR + } + return libpng_handle; +} + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + LONG ref; + png_structp png_ptr; + png_infop info_ptr; + png_infop end_info; + BOOL initialized; + int bpp; + int width, height; + UINT stride; + const WICPixelFormatGUID *format; + BYTE *image_bits; +} PngDecoder; + +static inline PngDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, PngDecoder, lpFrameVtbl); +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; + +static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + PngDecoder *This = (PngDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngDecoder_AddRef(IWICBitmapDecoder *iface) +{ + PngDecoder *This = (PngDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) +{ + PngDecoder *This = (PngDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->png_ptr) + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + HeapFree(GetProcessHeap(), 0, This->image_bits); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + IStream *stream = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(stream, data, length, &bytesread); + if (FAILED(hr) || bytesread != length) + { + ppng_error(png_ptr, "failed reading data"); + } +} + +static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + PngDecoder *This = (PngDecoder*)iface; + LARGE_INTEGER seek; + HRESULT hr; + png_bytep *row_pointers=NULL; + UINT image_size; + UINT i; + int color_type, bit_depth; + png_bytep trans; + int num_trans; + png_uint_32 transparency; + png_color_16p trans_values; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + /* initialize libpng */ + This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) return E_FAIL; + + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, (png_infopp)NULL, (png_infopp)NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + This->end_info = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, (png_infopp)NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + HeapFree(GetProcessHeap(), 0, row_pointers); + This->png_ptr = NULL; + return E_FAIL; + } + + /* seek to the start of the stream */ + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + /* set up custom i/o handling */ + ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); + + /* read the header */ + ppng_read_info(This->png_ptr, This->info_ptr); + + /* choose a pixel format */ + color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); + bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + + /* check for color-keyed alpha */ + transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + + if (transparency && color_type != PNG_COLOR_TYPE_PALETTE) + { + /* expand to RGBA */ + if (color_type == PNG_COLOR_TYPE_GRAY) + { + if (bit_depth < 8) + { + ppng_set_gray_1_2_4_to_8(This->png_ptr); + bit_depth = 8; + } + ppng_set_gray_to_rgb(This->png_ptr); + } + ppng_set_tRNS_to_alpha(This->png_ptr); + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } + + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: + This->bpp = bit_depth; + switch (bit_depth) + { + case 1: This->format = &GUID_WICPixelFormatBlackWhite; break; + case 2: This->format = &GUID_WICPixelFormat2bppGray; break; + case 4: This->format = &GUID_WICPixelFormat4bppGray; break; + case 8: This->format = &GUID_WICPixelFormat8bppGray; break; + case 16: This->format = &GUID_WICPixelFormat16bppGray; break; + default: + ERR("invalid grayscale bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: + /* WIC does not support grayscale alpha formats so use RGBA */ + ppng_set_gray_to_rgb(This->png_ptr); + case PNG_COLOR_TYPE_RGB_ALPHA: + This->bpp = bit_depth * 4; + switch (bit_depth) + { + case 8: + ppng_set_bgr(This->png_ptr); + This->format = &GUID_WICPixelFormat32bppBGRA; + break; + case 16: This->format = &GUID_WICPixelFormat64bppRGBA; break; + default: + ERR("invalid RGBA bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_PALETTE: + This->bpp = bit_depth; + switch (bit_depth) + { + case 1: This->format = &GUID_WICPixelFormat1bppIndexed; break; + case 2: This->format = &GUID_WICPixelFormat2bppIndexed; break; + case 4: This->format = &GUID_WICPixelFormat4bppIndexed; break; + case 8: This->format = &GUID_WICPixelFormat8bppIndexed; break; + default: + ERR("invalid indexed color bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_RGB: + This->bpp = bit_depth * 3; + switch (bit_depth) + { + case 8: + ppng_set_bgr(This->png_ptr); + This->format = &GUID_WICPixelFormat24bppBGR; + break; + case 16: This->format = &GUID_WICPixelFormat48bppRGB; break; + default: + ERR("invalid RGB color bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + default: + ERR("invalid color type %i\n", color_type); + return E_FAIL; + } + + /* read the image data */ + This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); + This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); + This->stride = This->width * This->bpp; + image_size = This->stride * This->height; + + This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size); + if (!This->image_bits) return E_OUTOFMEMORY; + + row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); + if (!row_pointers) return E_OUTOFMEMORY; + + for (i=0; i<This->height; i++) + row_pointers[i] = This->image_bits + i * This->stride; + + ppng_read_image(This->png_ptr, row_pointers); + + HeapFree(GetProcessHeap(), 0, row_pointers); + row_pointers = NULL; + + ppng_read_end(This->png_ptr, This->end_info); + + This->initialized = TRUE; + + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + *pCount = 1; + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + PngDecoder *This = (PngDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + + *ppIBitmapFrame = (void*)(&This->lpFrameVtbl); + + return S_OK; +} + +static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { + PngDecoder_QueryInterface, + PngDecoder_AddRef, + PngDecoder_Release, + PngDecoder_QueryCapability, + PngDecoder_Initialize, + PngDecoder_GetContainerFormat, + PngDecoder_GetDecoderInfo, + PngDecoder_CopyPalette, + PngDecoder_GetMetadataQueryReader, + PngDecoder_GetPreview, + PngDecoder_GetColorContexts, + PngDecoder_GetThumbnail, + PngDecoder_GetFrameCount, + PngDecoder_GetFrame +}; + +static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + PngDecoder *This = impl_from_frame(iface); + *puiWidth = This->width; + *puiHeight = This->height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; +} + +static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + memcpy(pPixelFormat, This->format, sizeof(GUID)); + + return S_OK; +} + +static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + PngDecoder *This = impl_from_frame(iface); + png_uint_32 ret; + png_colorp png_palette; + int num_palette; + WICColor palette[256]; + png_bytep trans; + int num_trans; + png_color_16p trans_values; + int i; + + TRACE("(%p,%p)\n", iface, pIPalette); + + ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); + if (!ret) return WINCODEC_ERR_PALETTEUNAVAILABLE; + + if (num_palette > 256) + { + ERR("palette has %i colors?!\n", num_palette); + return E_FAIL; + } + + for (i=0; i<num_palette; i++) + { + palette[i] = (0xff000000| + png_palette[i].red << 16| + png_palette[i].green << 8| + png_palette[i].blue); + } + + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + if (ret) + { + for (i=0; i<num_trans; i++) + { + palette[trans[i]] = 0x00000000; + } + } + + return IWICPalette_InitializeCustom(pIPalette, palette, num_palette); +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return copy_pixels(This->bpp, This->image_bits, + This->width, This->height, This->stride, + prc, cbStride, cbBufferSize, pbBuffer); +} + +static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { + PngDecoder_Frame_QueryInterface, + PngDecoder_Frame_AddRef, + PngDecoder_Frame_Release, + PngDecoder_Frame_GetSize, + PngDecoder_Frame_GetPixelFormat, + PngDecoder_Frame_GetResolution, + PngDecoder_Frame_CopyPalette, + PngDecoder_Frame_CopyPixels, + PngDecoder_Frame_GetMetadataQueryReader, + PngDecoder_Frame_GetColorContexts, + PngDecoder_Frame_GetThumbnail +}; + +HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + PngDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!libpng_handle && !load_libpng()) + { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &PngDecoder_Vtbl; + This->lpFrameVtbl = &PngDecoder_FrameVtbl; + This->ref = 1; + This->png_ptr = NULL; + This->info_ptr = NULL; + This->end_info = NULL; + This->initialized = FALSE; + This->image_bits = NULL; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + +#else /* !HAVE_PNG_H */ + +HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to load PNG picture, but PNG supported not compiled in.\n"); + return E_FAIL; +} + +#endif Propchange: trunk/reactos/dll/win32/windowscodecs/pngformat.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -735,6 +735,12 @@ "windowscodecs.dll", "Apartment" }, + { &CLSID_WICPngDecoder, + "WIC PNG Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICBmpEncoder, "WIC BMP Encoder", NULL, @@ -753,6 +759,12 @@ "windowscodecs.dll", "Apartment" }, + { &CLSID_WICJpegDecoder, + "WIC JPEG Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICDefaultFormatConverter, "WIC Default Format Converter", NULL, @@ -765,7 +777,7 @@ /*********************************************************************** * decoder list */ -static const BYTE mask_all[] = {0xff,0xff,0xff,0xff,0xff,0xff}; +static const BYTE mask_all[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const BYTE bmp_magic[] = {0x42,0x4d}; @@ -813,6 +825,43 @@ {0} }; +static const BYTE jpeg_magic[] = {0xff, 0xd8, 0xff, 0xe0}; + +static GUID const * const jpeg_formats[] = { + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat8bppGray, + NULL +}; + +static struct decoder_pattern const jpeg_patterns[] = { + {4,0,jpeg_magic,mask_all,0}, + {0} +}; + +static const BYTE png_magic[] = {137,80,78,71,13,10,26,10}; + +static GUID const * const png_formats[] = { + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat2bppGray, + &GUID_WICPixelFormat4bppGray, + &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat48bppRGB, + NULL +}; + +static struct decoder_pattern const png_patterns[] = { + {8,0,png_magic,mask_all,0}, + {0} +}; + static struct regsvr_decoder const decoder_list[] = { { &CLSID_WICBmpDecoder, "The Wine Project", @@ -844,18 +893,46 @@ ico_formats, ico_patterns }, + { &CLSID_WICJpegDecoder, + "The Wine Project", + "JPEG Decoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/jpeg", + ".jpg;.jpeg;.jfif", + jpeg_formats, + jpeg_patterns + }, + { &CLSID_WICPngDecoder, + "The Wine Project", + "PNG Decoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/png", + ".png", + png_formats, + png_patterns + }, { NULL } /* list terminator */ }; static GUID const * const converter_formats[] = { &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat2bppGray, + &GUID_WICPixelFormat4bppGray, + &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGBA, NULL }; Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -138,7 +138,7 @@ if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; if (NewPosition.QuadPart < 0) return E_INVALIDARG; - This->dwCurPos = NewPosition.LowPart; + This->dwCurPos = NewPosition.u.LowPart; if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; return S_OK; Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -22,9 +22,11 @@ extern HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT PaletteImpl_Create(IWICPalette **palette); extern HRESULT StreamImpl_Create(IWICStream **stream); Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -3,6 +3,7 @@ <importlibrary definition="windowscodecs.spec" /> <include base="windowscodecs">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">include/reactos/libs/libjpeg</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> @@ -21,8 +22,10 @@ <file>icoformat.c</file> <file>imgfactory.c</file> <file>info.c</file> + <file>jpegformat.c</file> <file>main.c</file> <file>palette.c</file> + <file>pngformat.c</file> <file>propertybag.c</file> <file>regsvr.c</file> <file>stream.c</file> Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… ============================================================================== --- trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -126,12 +126,21 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x03);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormatBlackWhite, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x05);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat2bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x06);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x07);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x08);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0b);") + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") typedef struct WICRect { INT X;

15 years, 3 months

[dreimer] 42985: Updated ChangeLog.txt TBD for RosBE 1.5: - GCC 4.4.X working on Ros Tree. - options Tool update. - Stuff the others want included, if existent.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 3 16:47:44 2009 New Revision: 42985 URL: http://svn.reactos.org/svn/reactos?rev=42985&view=rev Log: Updated ChangeLog.txt TBD for RosBE 1.5: - GCC 4.4.X working on Ros Tree. - options Tool update. - Stuff the others want included, if existent. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Sep 3 16:47:44 2009 @@ -1,4 +1,4 @@ -*** Oct XXth, 2009 - RosBE 1.4.5 Released +*** Sep XXth, 2009 - RosBE 1.5 Released - Installer Fixes: * Installer starts the Uninstaller of the old Version again. @@ -11,7 +11,28 @@ * Fix the args not checked bug. (Samuel Serapion) - Prepare scripts for RosBE64 1.1 which is compatible with the new RosBE Versions (Daniel Reimer) - +- Bugfixes in ssvn (Shashkov Maxim, Daniel Reimer) +- Fix confusion between %_ROSBE_ROSPREFIX% and %_ROSBE_PREFIX%. (Colin Finck) + We only use %_ROSBE_PREFIX% now, which should fix building with amd64. (Colin Finck) +- Readd chdefdir's feature to switch to the new default directory after changing it. (Colin Finck) +- Fix inability to switch back to i386. (Colin Finck) +- Fix Variables to be able to use more recent GCCs. (Daniel Reimer) +- Fix up the call of the i386 config file in charch. (Daniel Reimer) +- Fix up default color of the 64 bit RosBE. (Daniel Reimer) +- "Only" call the 64 bit config file when you are in 64 bit mode. (Daniel Reimer) +- Fix the 64 bit options tool to be useable. (Daniel Reimer) +- Tidy up work on all files. (Daniel Reimer) +- Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE + startup and thus behave the same way like the other settings you can set in there. (Daniel Reimer) +- Made the "update" command stop when it found the last existant update online. Theres no use in trying + the full update 1-9 if theres none/one. This speeds up the status generation process. (Daniel Reimer) +- Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) + to the PATH and call all .cmd files directly. Renamed some batch files to match the macro names and + added some new ones, for which no batch file existed. (except "env", this command has been removed) + Now these commands can be called from other batch files and stuff like "clean & make" will work as well. + (Colin Finck, Gunnar) +- Fix raddr2line.cmd to properly handle spaces in the path. (Colin Finck) +- Added rosapps and rostests support to ssvn. (Daniel Reimer) *** Jun 29th, 2009 - RosBE 1.4.4 Released

15 years, 3 months

[dreimer] 42984: Added rosapps and rostests support to ssvn. Request by JaixBly

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 3 15:44:45 2009 New Revision: 42984 URL: http://svn.reactos.org/svn/reactos?rev=42984&view=rev Log: Added rosapps and rostests support to ssvn. Request by JaixBly Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -190,11 +190,13 @@ " Creates, updates or cleans up your ReactOS source tree or shows the revision" " number of the local and online trees." "" - " update - Updates to HEAD revision or to a specific one when the second" - " parameter specifies one." - " create - Creates a new ReactOS source tree." - " cleanup - Cleans up and fixes errors in the source tree." - " status - Show the current local and online revision numbers." + " update - Updates to HEAD revision or to a specific one when the second" + " parameter specifies one." + " create - Creates a new ReactOS source tree." + " rosapps - Creates a new ReactOS RosApps source tree." + " rostests - Creates a new ReactOS RosTests source tree." + " cleanup - Cleans up and fixes errors in the source tree." + " status - Show the current local and online revision numbers." } } elseif ("$args" -eq "options") { if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -29,8 +29,28 @@ if ("$($arg[1])" -ne "") { $temparg = $arg[1] IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + if (Test-Path "modules\rosapps\.") { + Set-Location modules\rosapps + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location modules\rostests + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } } else { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + if (Test-Path "modules\rosapps\.") { + Set-Location modules\rosapps + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location modules\rostests + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } } "Do you want to see the changelog?" $CL = Read-Host "Please enter 'yes' or 'no': " @@ -81,6 +101,46 @@ } } +# Check if the folder is empty. If not, output an error. +elseif ("$($args[0])" -eq "rosapps") { + $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." + if (Test-Path "modules\rosapps\.svn\.") { + "ERROR: Folder already contains a RosApps repository." + } else { + if (!(Test-Path "modules\rosapps\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory + } + Set-Location modules\rosapps + $dir = get-childitem + if ("$dir" -eq "") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + Set-Location "$_ROSBE_ROSSOURCEDIR" +} + +# Check if the folder is empty. If not, output an error. +elseif ("$($args[0])" -eq "rostests") { + $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." + if (Test-Path "modules\rostests\.svn\.") { + "ERROR: Folder already contains a RosTests repository." + } else { + if (!(Test-Path "modules\rostests\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory + } + Set-Location modules\rostests + $dir = get-childitem + if ("$dir" -eq "") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + Set-Location "$_ROSBE_ROSSOURCEDIR" +} + # Output the revision of the local and online trees and tell the user if # its up to date or not. elseif ("$($args[0])" -eq "status") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -196,11 +196,13 @@ echo Creates, updates or cleans up your ReactOS source tree or shows the revision echo number of the local and online trees. echo. - echo update - Updates to HEAD revision or to a specific one when the second - echo parameter specifies one. - echo create - Creates a new ReactOS source tree. - echo cleanup - Cleans up and fixes errors in the source tree. - echo status - Show the current local and online revision numbers. + echo update - Updates to HEAD revision or to a specific one when the second + echo parameter specifies one. + echo create - Creates a new ReactOS source tree. + echo rosapps - Creates a new ReactOS RosApps source tree. + echo rostests - Creates a new ReactOS RosTests source tree. + echo cleanup - Cleans up and fixes errors in the source tree. + echo status - Show the current local and online revision numbers. ) ) else if /i "%1" == "options" ( if exist "%_ROSBE_BASEDIR%\options.cmd" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -51,7 +51,48 @@ ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) + goto :EOC +) +:: Check if the folder is empty. If not, output an error. +if /i "%1" == "rosapps" ( + title SVN RosApps Creating... + if exist "modules\rosapps\.svn\." ( + echo ERROR: Folder already contains a RosApps repository. + goto :EOC + ) + if not exist "modules\rosapps\." ( + md modules\rosapps + ) + cd modules\rosapps + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps . + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + cd "%_ROSBE_ROSSOURCEDIR%" + goto :EOC +) + +:: Check if the folder is empty. If not, output an error. +if /i "%1" == "rostests" ( + title SVN RosTests Creating... + if exist "modules\rostests\.svn\." ( + echo ERROR: Folder already contains a RosTests repository. + goto :EOC + ) + if not exist "modules\rostests\." ( + md modules\rostests + ) + cd modules\rostests + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests . + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + cd "%_ROSBE_ROSSOURCEDIR%" goto :EOC ) @@ -86,8 +127,28 @@ if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + if exist "modules\rosapps\." ( + cd modules\rosapps + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + cd "%_ROSBE_ROSSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd modules\rostests + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + cd "%_ROSBE_ROSSOURCEDIR%" + ) ) else ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update + if exist "modules\rosapps\." ( + cd modules\rosapps + "%_ROSBE_BASEDIR%\Tools\svn.exe" update + cd "%_ROSBE_ROSSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd modules\rostests + "%_ROSBE_BASEDIR%\Tools\svn.exe" update + cd "%_ROSBE_ROSSOURCEDIR%" + ) ) ) echo Do you want to see the changelog?

15 years, 3 months

[khornicek] 42983: - update wined3d, d3d8, d3d9, ddraw to Wine 1.1.28

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Sep 3 11:18:38 2009 New Revision: 42983 URL: http://svn.reactos.org/svn/reactos?rev=42983&view=rev Log: - update wined3d, d3d8, d3d9, ddraw to Wine 1.1.28 Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/parent.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Modified: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

15 years, 3 months

[dchapyshev] 42982: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Sep 2 16:59:50 2009 New Revision: 42982 URL: http://svn.reactos.org/svn/reactos?rev=42982&view=rev Log: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl) Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,7 +5,7 @@ Version = 2.6.4 Licence = GPL Description = Word processor. -Size = Unknown +Size = 5.9MB Category = 6 URLSite = http://www.abiword.org URLDownload = http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.… @@ -13,8 +13,6 @@ [Section.0407] Description = Textverarbeitung -Size = Unbekannt [Section.0415] Description = Edytor tekstu -Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,7 +5,7 @@ Version = 5.10.00.3610 Licence = Unknown Description = Unzip in the "ReactOS" folder then restart ReactOS twice. -Size = Unknown +Size = 186kB Category = 13 URLSite = Unknown URLDownload = http://svn.reactos.org/packages/ac97_vbox.exe @@ -16,5 +16,10 @@ Name = AC97 Treiber fÃ¼r VirtualBox Licence = Unbekannt Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. -Size = Unbekannt URLSite = Unbekannt + +[Section.0415] +Name = Sterownik AC97 dla VirtualBox +Licence = Nieznana +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. +URLSite = Nieznana Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,15 +5,15 @@ Version = 1.4 Licence = Shareware Description = Diablo 2 Shareware. zeckensack's glide wrapper is req. to run it. -Size = Unknown +Size = 132MB Category = 4 -URLSite = Unknown +URLSite = http://www.blizzard.com/diablo2 URLDownload = http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Diablo 2 Shareware. zeckensacks glide wrapper wird zum AusfÃ¼hren benÃ¶tigt. -URLSite = Unbekannt -Size = Unbekannt + +[Section.0415] +Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,10 +2,10 @@ [Section] Name = DOSBox -Version = 0.72 +Version = 0.73 Licence = GPL Description = DOSBox is a DOS emulator. -Size = Unknown +Size = 1.4MB Category = 15 URLSite = http://www.dosbox.com URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.73-win32-installer… @@ -14,8 +14,6 @@ [Section.0407] Description = DOSBox ist ein DOS Emulator. -Size = Unbekannt [Section.0415] Description = DOSBox - emulator DOSa. -Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -31,7 +31,7 @@ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… [Section.0415] -Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÐâ¦darek internetowych. +Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 6.3M URLSite = http://www.mozilla-europe.org/pl/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,30 +2,36 @@ [Section] Name = Mozilla Firefox 3.0 -Version = 3.0.9 +Version = 3.0.13 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 7.2M +Size = 7.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/e… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/ru… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/r… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 7.0M +Size = 6.9M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/de… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/d… [Section.0405] Description = Mest populÃÂ¦re og best ogsÃÂ¥ gratis nettleserene der ute. -Size = 7.0M +Size = 6.9M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/nb… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/n… + +[Section.0415] +Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. +Size = 7.8M +URLSite = http://www.mozilla-europe.org/pl/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/p… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -16,4 +16,4 @@ Description = Open Source BASIC Compiler. Die BASIC Syntax ist kompatibel zu QBASIC. [Section.0415] -Description = Otwarty kompilator BASIC, ze skÐâadniÐâ¦ kompatybilnÐâ¦ z QBASIC. +Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -16,3 +16,6 @@ [Section.0407] Description = Der populÃ¤re Opera Browser mit vielen fortschrittlichen Eigenschaften, enthÃ¤lt einen Mail und BitTorrent Client. + +[Section.0415] +Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,23 +2,26 @@ [Section] Name = Mozilla SeaMonkey -Version = 1.1.16 -Licence = Unknown +Version = 1.1.17 +Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 12.4M +Size = 12.4MB Category = 5 -URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-… +URLSite = http://www.seamonkey-project.org/ +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/seamonkey-1.1.17.en-… CDPath = none [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Licence = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ -URLSite = http://www.mozilla-europe.org/ru/ +Size = 9.0MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… [Section.0407] -Licence = Unbekannt Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 8.9M -URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… +Size = 9.0MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/contrib-localized/se… + +[Section.0415] +Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. +Size = 12.4MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,23 +2,29 @@ [Section] Name = Mozilla Thunderbird 2.0 -Version = 2.0.0.19 +Version = 2.0.0.23 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 6.4M +Size = 6.2M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 7.0M +Size = 7.1M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 6.2M +Size = 6.4M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… + +[Section.0415] +Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. +Size = 7.2M +URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,10 +2,10 @@ [Section] Name = ÂµTorrent -Version = 1.8.3 +Version = 1.8.4 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 281K +Size = 282K Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download.utorrent.com/1.8.3/utorrent.exe @@ -18,3 +18,7 @@ [Section.0407] Licence = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Kleiner und schneller BitTorrent Client. + +[Section.0415] +Licence = Freeware (do uÅ¼ytku domowego) +Description = MaÅy i szybki klient BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -15,6 +15,6 @@ Licence = Unbekannt Description = Visual Studio 6 Laufzeitsystem -[Section.0407] +[Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 6

15 years, 3 months

[dchapyshev] 42981: - Free memory at initialization failure

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Sep 2 15:07:12 2009 New Revision: 42981 URL: http://svn.reactos.org/svn/reactos?rev=42981&view=rev Log: - Free memory at initialization failure Modified: trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=4298… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Wed Sep 2 15:07:12 2009 @@ -55,6 +55,40 @@ PSID SeAnonymousLogonSid = NULL; /* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +FreeInitializedSids(VOID) +{ + if (SeNullSid) ExFreePool(SeNullSid); + if (SeWorldSid) ExFreePool(SeWorldSid); + if (SeLocalSid) ExFreePool(SeLocalSid); + if (SeCreatorOwnerSid) ExFreePool(SeCreatorOwnerSid); + if (SeCreatorGroupSid) ExFreePool(SeCreatorGroupSid); + if (SeCreatorOwnerServerSid) ExFreePool(SeCreatorOwnerServerSid); + if (SeCreatorGroupServerSid) ExFreePool(SeCreatorGroupServerSid); + if (SeNtAuthoritySid) ExFreePool(SeNtAuthoritySid); + if (SeDialupSid) ExFreePool(SeDialupSid); + if (SeNetworkSid) ExFreePool(SeNetworkSid); + if (SeBatchSid) ExFreePool(SeBatchSid); + if (SeInteractiveSid) ExFreePool(SeInteractiveSid); + if (SeServiceSid) ExFreePool(SeServiceSid); + if (SePrincipalSelfSid) ExFreePool(SePrincipalSelfSid); + if (SeLocalSystemSid) ExFreePool(SeLocalSystemSid); + if (SeAuthenticatedUserSid) ExFreePool(SeAuthenticatedUserSid); + if (SeRestrictedCodeSid) ExFreePool(SeRestrictedCodeSid); + if (SeAliasAdminsSid) ExFreePool(SeAliasAdminsSid); + if (SeAliasUsersSid) ExFreePool(SeAliasUsersSid); + if (SeAliasGuestsSid) ExFreePool(SeAliasGuestsSid); + if (SeAliasPowerUsersSid) ExFreePool(SeAliasPowerUsersSid); + if (SeAliasAccountOpsSid) ExFreePool(SeAliasAccountOpsSid); + if (SeAliasSystemOpsSid) ExFreePool(SeAliasSystemOpsSid); + if (SeAliasPrintOpsSid) ExFreePool(SeAliasPrintOpsSid); + if (SeAliasBackupOpsSid) ExFreePool(SeAliasBackupOpsSid); + if (SeAuthenticatedUsersSid) ExFreePool(SeAuthenticatedUsersSid); + if (SeRestrictedSid) ExFreePool(SeRestrictedSid); + if (SeAnonymousLogonSid) ExFreePool(SeAnonymousLogonSid); +} BOOLEAN INIT_FUNCTION @@ -99,7 +133,7 @@ SeAuthenticatedUsersSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); SeRestrictedSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); SeAnonymousLogonSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); - + if (SeNullSid == NULL || SeWorldSid == NULL || SeLocalSid == NULL || SeCreatorOwnerSid == NULL || SeCreatorGroupSid == NULL || SeCreatorOwnerServerSid == NULL || @@ -115,7 +149,7 @@ SeAuthenticatedUsersSid == NULL || SeRestrictedSid == NULL || SeAnonymousLogonSid == NULL) { - /* FIXME: We're leaking memory here. */ + FreeInitializedSids(); return(FALSE); }

15 years, 3 months

[dchapyshev] 42980: - Add missed checks of memory allocation failures

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Sep 2 15:02:30 2009 New Revision: 42980 URL: http://svn.reactos.org/svn/reactos?rev=42980&view=rev Log: - Add missed checks of memory allocation failures Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -1325,6 +1325,10 @@ } Buffer = ExAllocatePool(NonPagedPool, CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8)); + if (!Buffer) + { + KeBugCheck(CACHE_MANAGER); + } RtlInitializeBitMap(&CiCacheSegMappingRegionAllocMap, Buffer, CI_CACHESEG_MAPPING_REGION_SIZE / PAGE_SIZE); RtlClearAllBits(&CiCacheSegMappingRegionAllocMap); Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -452,6 +452,8 @@ PartialInformation = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePool(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(REG_DISK_MOUNT_INFO)); + if (!Buffer1 || !Buffer2 || !PartialInformation) return; + DiskMountInfo = (PREG_DISK_MOUNT_INFO) PartialInformation->Data; /* Open or Create the 'MountedDevices' key */ @@ -526,6 +528,14 @@ goto end_assign_disks; LayoutArray = ExAllocatePool(NonPagedPool, ConfigInfo->DiskCount * sizeof(PDRIVE_LAYOUT_INFORMATION)); + if (!LayoutArray) + { + ExFreePool(PartialInformation); + ExFreePool(Buffer2); + ExFreePool(Buffer1); + if (hKey) ZwClose(hKey); + } + RtlZeroMemory(LayoutArray, ConfigInfo->DiskCount * sizeof(PDRIVE_LAYOUT_INFORMATION)); for (i = 0; i < ConfigInfo->DiskCount; i++) Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -1007,6 +1007,7 @@ ObjectName.Length = (wcslen(Start) + 8) * sizeof(WCHAR); ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); + if (!ObjectName.Buffer) return STATUS_INSUFFICIENT_RESOURCES; wcscpy(ObjectName.Buffer, L"\\Driver\\"); memcpy(ObjectName.Buffer + 8, Start, ObjectName.Length - 8 * sizeof(WCHAR)); ObjectName.Buffer[ObjectName.Length/sizeof(WCHAR)] = 0; Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -2872,7 +2872,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - + /* Ignore exception */ } _SEH2_END; Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -1015,6 +1015,12 @@ { /* Use local event */ Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + /* We failed */ + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } @@ -1548,6 +1554,7 @@ { /* Allocate an MDL */ Mdl = IoAllocateMdl(FileInformation, Length, FALSE, TRUE, Irp); + if (!Mdl) ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1636,6 +1643,7 @@ PVOID NormalContext; KIRQL OldIrql; IO_STATUS_BLOCK KernelIosb; + PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); /* Check if we're called from user mode */ @@ -1749,6 +1757,11 @@ { /* Use local event */ Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } @@ -2666,6 +2679,11 @@ { /* Use local event */ Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } @@ -3102,6 +3120,11 @@ { /* Use local event */ Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } @@ -3263,6 +3286,11 @@ { /* Use local event */ Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -61,6 +61,11 @@ PagedPool, sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION), TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } NotificationInfos->Version = 1; NotificationInfos->Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); @@ -75,6 +80,11 @@ PagedPool, sizeof(HWPROFILE_CHANGE_NOTIFICATION), TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } NotificationInfos->Version = 1; NotificationInfos->Size = sizeof(HWPROFILE_CHANGE_NOTIFICATION); RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); @@ -87,6 +97,11 @@ PagedPool, sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } NotificationInfos->Version = 1; NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -62,6 +62,7 @@ SourceBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KPROFILE_SOURCE_OBJECT), 'forP'); + if (!SourceBuffer) return; RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT)); /* Raise to PROFILE_LEVEL */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -1006,7 +1006,9 @@ sizeof(MEMORY_AREA), TAG_MAREA); } - + + if (!MemoryArea) return STATUS_NO_MEMORY; + RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type; MemoryArea->StartingAddress = *BaseAddress; Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -245,6 +245,8 @@ Region = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_REGION), TAG_MM_REGION); + if (!Region) return; + Region->Type = Type; Region->Protect = Protect; Region->Length = Length; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -2756,6 +2756,10 @@ Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, 'rXmM'); + if (!Buffer) + { + KeBugCheck(MEMORY_MANAGEMENT); + } UsedSize = 0; Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -123,6 +123,7 @@ PWSTR NewTargetPath; ULONG LengthUsed, MaximumLength; NTSTATUS Status; + PAGED_CODE(); /* Assume failure */ *NextObject = NULL; @@ -169,6 +170,7 @@ NewTargetPath = ExAllocatePoolWithTag(NonPagedPool, MaximumLength, TAG_SYMLINK_TTARGET); + if (!NewTargetPath) return STATUS_INSUFFICIENT_RESOURCES; } else { Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -969,6 +969,7 @@ /* Allocate the APC */ Apc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG_TERMINATE_APC); + if (!Apc) return STATUS_INSUFFICIENT_RESOURCES; /* Set the Terminated Flag */ Flags = Thread->CrossThreadFlags | CT_TERMINATED_BIT; Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Wed Sep 2 15:02:30 2009 @@ -86,6 +86,8 @@ NTAPI SepInitializationPhase0(VOID) { + PAGED_CODE(); + ExpInitLuid(); if (!SepInitSecurityIDs()) return FALSE; if (!SepInitDACLs()) return FALSE;

15 years, 3 months

[cfinck] 42979: Michael Bruestle (michael_bruestle@yahoo.com) - Properly handle multiple monitors in the screensavers (expand the screensaver window to all monitors)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Sep 1 20:48:36 2009 New Revision: 42979 URL: http://svn.reactos.org/svn/reactos?rev=42979&view=rev Log: Michael Bruestle (michael_bruestle(a)yahoo.com) - Properly handle multiple monitors in the screensavers (expand the screensaver window to all monitors) Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Tue Sep 1 20:48:36 2009 @@ -174,8 +174,8 @@ else { style = WS_POPUP; - rc.right = GetSystemMetrics(SM_CXSCREEN); - rc.bottom = GetSystemMetrics(SM_CYSCREEN); + rc.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rc.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); style |= WS_VISIBLE; }

15 years, 3 months

[dchapyshev] 42978: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl) See issue #4818, 4807 for more details.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Sep 1 17:12:35 2009 New Revision: 42978 URL: http://svn.reactos.org/svn/reactos?rev=42978&view=rev Log: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl) See issue #4818,4807 for more details. Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,7 +3,7 @@ [Section] Name = AbiWord Version = 2.6.4 -Licence = Unknown +Licence = GPL Description = Word processor. Size = Unknown Category = 6 @@ -12,6 +12,9 @@ CDPath = none [Section.0407] -Licence = Unbekannt Description = Textverarbeitung Size = Unbekannt + +[Section.0415] +Description = Edytor tekstu +Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,17 @@ [Section] Name = Audio Grabber Version = 1.83 SE -Licence = Unknown +Licence = Freeware Description = A very good CD Ripper/Audio File Converter. -Size = Unknown +Size = 1.6MB Category = 1 -URLSite = Unknown +URLSite = http://www.audiograbber.com-us.net/ URLDownload = http://www.audiograbber.de/files/4898276276/agsetup183se.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Ein sehr guter CD-Ripper/Audio-Datei-Konverter. -URLSite = Unbekannt -Size = Unbekannt + +[Section.0415] +Description = Bardzo dobry CD Ripper/konwerter plików audio. Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,19 @@ [Section] Name = DOSBox Version = 0.72 -Licence = Unknown +Licence = GPL Description = DOSBox is a DOS emulator. Size = Unknown Category = 15 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.72-win32-installer… +URLSite = http://www.dosbox.com +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.73-win32-installer… CDPath = none [Section.0407] -Licence = Unbekannt Description = DOSBox ist ein DOS Emulator. -URLSite = Unbekannt Size = Unbekannt + +[Section.0415] +Description = DOSBox - emulator DOSa. +Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -29,3 +29,9 @@ Size = 5.6M URLSite = http://www.mozilla-europe.org/no/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… + +[Section.0415] +Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÐâ¦darek internetowych. +Size = 6.3M +URLSite = http://www.mozilla-europe.org/pl/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,18 @@ [Section] Name = FreeBASIC -Version = 0.18.4b -Licence = Unknown +Version = 0.20.0b +Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = Unknown +Size = 5.5MB Category = 7 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.18.4b-win32.exe +URLSite = http://www.freebasic.net/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.20.0b-win32.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Open Source BASIC Compiler. Die BASIC Syntax ist kompatibel zu QBASIC. -Size = Unbekannt + +[Section.0415] +Description = Otwarty kompilator BASIC, ze skÐâadniÐâ¦ kompatybilnÐâ¦ z QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,16 @@ [Section] Name = GlidewrapZbag Version = 0.84c -Licence = Unknown +Licence = Freeware Description = glidewrapper needed to run Diablo 2 on ReactOS. -Size = Unknown +Size = 249kB Category = 3 -URLSite = Unknown +URLSite = http://www.zeckensack.de/glide/index.html URLDownload = http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe CDPath = none +[Section.0407] +Description = glidewrapper ist erforderlich um Diablo2 in ReactOS auszufÃ¼hren. -[Section.0407] -Licence = Unbekannt -Description = glidewrapper ist erforderlich um Diablo2 in ReactOS auszufÃ¼hren. -Size = Unbekannt -URLSite = Unbekannt +[Section.0415] +Description = glidewrapper jest potrzebny do uruchomienia Diablo2 w ReactOS-ie. Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,16 +3,20 @@ [Section] Name = IrfanView Version = 4.23 -Licence = Unknown +Licence = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. -Size = Unknown +Size = 1.3MB Category = 3 URLSite = http://www.irfanview.com -URLDownload = http://irfanview.tuwien.ac.at/iview423_setup.exe +URLDownload = http://irfanview.tuwien.ac.at/iview425_setup.exe CDPath = none [Section.0407] -Licence = Unbekannt -Description = Anzeigeprogramm fÃ¼r alle Arten von Grafik-/Audio- oder Video-Dateien -Size = Unbekannt +Licence = Freeware fÃ¼r nichtkommerzielle Nutzung +Description = Anzeigeprogramm fÃ¼r alle Arten von Grafik-/Audio- oder Video-Dateien. + +[Section.0415] +Licence = Freeware (dla uÅ¼ytku domowego) +Description = PrzeglÄdarka dla bardzo wielu typÃ³w obrazÃ³w, plikÃ³w audio oraz wideo. + Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,20 @@ [Section] Name = IrfanView Plugins -Version = 4.22 -Licence = Unknown +Version = 4.25 +Licence = Freeware (for personal use) Description = Additional Plugins for supporting more file types. -Size = Unknown +Size = 7.7MB Category = 3 URLSite = http://www.irfanview.com -URLDownload = http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_422_setup.exe +URLDownload = http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_425_setup.exe CDPath = none [Section.0407] -Licence = Unbekannt +Licence = Freeware fÃ¼r nichtkommerzielle Nutzung Description = ZusÃ¤tzlich Plugins zur UnterstÃ¼tzung von weiteren Dateitypen. -Size = Unbekannt + +[Section.0407] +Licence = Freeware (dla uÅ¼ytku domowego) +Description = Wtyczki otwierajÄce dodatkowe typy plikÃ³w w Irfanview. Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,17 @@ [Section] Name = LBreakout2 Version = 2.4.1 -Licence = Unknown +Licence = GPL Description = Breakout Clone using SDL libs. -Size = Unknown +Size = 3.1MB Category = 4 -URLSite = Unknown +URLSite = http://lgames.sourceforge.net/index.php?project=LBreakout2 URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Breakout-Klon verwendet SDL Bibliothek. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Klon Breakouta/Arkanoida napisany przy u¿yciu biblioteki SDL. Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,16 @@ [Section] Name = LGeneral Version = 1.1 -Licence = Unknown +Licence = GPL Description = Panzer General Clone using SDL libs. -Size = Unknown +Size = 2.0MB Category = 4 -URLSite = Unknown +URLSite = http://lgames.sourceforge.net/index.php?project=LGeneral URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe CDPath = none +[Section.0407] +Description = Panzer-General-Klon verwendet SDL Bibliotheken. -[Section.0407] -Licence = Unbekannt -Description = Panzer-General-Klon verwendet SDL Bibliotheken. -Size = Unbekannt -URLSize = Unbekannt +[Section.0415] +Description = Klon gry Panzer General napisany przy u¿yciu biblioteki SDL. Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,17 @@ [Section] Name = LMarbles Version = 1.0.6 -Licence = Unknown +Licence = GPL Description = Atomix Clone using SDL libs. -Size = Unknown +Size = 1.4MB Category = 4 -URLSite = Unknown +URLSite = http://lgames.sourceforge.net/index.php?project=LMarbles URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Atomix-Klon verwendet SDL Bibliotheken. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Klon gry Atomix, u¿ywaj¹cy biblioteki SDL. Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,16 +5,19 @@ Version = 4.0 Licence = Unknown Description = MFC 4 is needed by some applications. -Size = Unknown +Size = 865kB Category = 14 -URLSite = Unknown +URLSite = http://support.microsoft.com/kb/122244 URLDownload = http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe CDPath = none [Section.0407] -Name OLE Anzeige und Microsoft Foundation Classes Version 4 +Name = OLE Anzeige und Microsoft Foundation Classes Version 4 Licence = Unbekannt Description = MFC 4 wird von einigen Anwendungen benÃ¶tigt. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Name = PrzeglÄdarka OLE oraz MFC (Microsoft Foundation Classes) wersja 4 +Licence = Nieznana +Description = Biblioteka MFC 4 jest uÅ¼ywana przez czÄÅÄ aplikacji. Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,18 +2,18 @@ [Section] Name = MinGW -Version = 5.1.3 -Licence = Unknown +Version = 5.1.4 +Licence = Public domain/GPL Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = Unknown +Size = 136kb Category = 7 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe +URLSite = http://mingw.org/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.4.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Eine Portierung der GNU Werkzeugkette mit GCC, GDB, GNU make usw. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Kompilator GCC dla platformy Windows wraz z dodatkowymi narzêdziami (GDB, make, itd.). Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,18 +2,18 @@ [Section] Name = Miranda IM -Version = 0.7.4 -Licence = Unknown +Version = 0.8.5 +Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. -Size = Unknown +Size = 1.6MB Category = 5 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode… +URLSite = http://www.miranda-im.org/ +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.5-unicode.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Open source Multiprotocol Instant Messaging Anwendung - funktioniert mÃ¶glicherweise nicht vollstÃ¤ndig. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Otwarty komunikator internetowy, obsÅugujÄcy wiele rÃ³Å¼nych protokoÅÃ³w (m.in. GG, Tlen, Jabber, ICQ, IRC) - moÅ¼e nie dziaÅaÄ prawidÅowo. Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -14,3 +14,6 @@ [Section.0407] Description = Der populÃ¤rste Client fÃ¼r Internet Relay Chat (IRC). + +[Section.0415] +Description = Najpopularniejszy klient IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,9 +5,9 @@ Version = 3.0 Licence = Unknown Description = MSXML3 is needed for some MSI Installers. -Size = Unknown +Size = 1.0MB Category = 14 -URLSite = Unknown +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=28494391-052B-42FF… URLDownload = http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1… CDPath = none @@ -15,5 +15,7 @@ [Section.0407] Licence = Unbekannt Description = MSXML3 wird von einige MSI Installern benÃ¶tigt. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = NiektÃ³re spoÅrÃ³d plikÃ³w instalacyjnych MSI potrzebujÄ parsera MSXML3. Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,8 +2,8 @@ [Section] Name = Off By One Browser -Version = Unknown -Licence = Unknown +Version = 3.5d +Licence = Freeware Description = The Off By One Browser is a very small and fast web browser with full HTML 3.2 support. Size = 0.98M Category = 5 @@ -13,6 +13,7 @@ [Section.0407] -Licence = Unbekannt Description = Der Off-By-One-Browser ist ein sehr kleiner und schneller Webbrowser mit voller HTML 3.2 UnterstÃ¼tzung. -Size = Unbekannt + +[Section.0415] +Description = Bardzo maÅa i szybka przeglÄdarka internetowa z peÅnÄ obsÅugÄ HTML 3.2. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,9 +3,9 @@ [Section] Name = OpenOffice 2.4 Version = 2.4.2 -Licence = Unknown +Licence = LGPL Description = THE Open Source Office Suite. -Size = Unknown +Size = 127MB Category = 6 URLSite = http://www.openoffice.org URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install… @@ -13,6 +13,13 @@ [Section.0407] -Licence = Unbekannt Description = DIE Open Source Office Suite -Size = Unbekannt +URLSite = http://de.openoffice.org +Size = 114.2MB +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.2/OOo_2.4.2_Win32… + +[Section.0415] +URLSite = http://pl.openoffice.org/ +Description = Otwarty pakiet biurowy +URLDownload = http://www.mirrorservice.org/sites/download.openoffice.org/localized/pl/2.4… +Size = 128.0M Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,25 @@ [Section] Name = OpenOffice 3.0 -Version = 3.0.1 -Licence = Unknown +Version = 3.1.0 +Licence = LGPL Description = THE Open Source Office Suite. -Size = Unknown +Size = 134.3MB Category = 6 URLSite = http://www.openoffice.org -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.0.1/OOo_3.0.1_Win32Intel_… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.0/OOo_3.1.0_Win32Intel_… CDPath = none [Section.0407] -Licence = Unbekannt Description = DIE Open Source Office Suite -Size = Unbekannt +URLSite = http://de.openoffice.org +Size = 156.8MB +Version = 3.1.1 +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.1.1/OOo_3.1.1_Win32… + +[Section.0415] +Description = Otwarty pakiet biurowy +URLSite = http://pl.openoffice.org +Size = 147.1MB +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.0/OOo_3.1.0_Win32… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,18 +2,18 @@ [Section] Name = OpenTTD -Version = 0.6.0 -Licence = Unknown +Version = 0.7.2 +Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. -Size = Unknown +Size = 2.9MB Category = 4 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe +URLSite = http://www.openttd.org +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.2-win32.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Open Source Klon der "Transport Tycoon Deluxe" Spiel-Engine. Sie benÃ¶tigen eine Kopie von Transport Tycoon. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego dziaÅania potrzebna jest kopia gry Transport Tycoon. Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,15 @@ Version = 0.60 Licence = MIT Description = A free SSH, Telnet, rlogin, and raw TCP client. -Size = Unknown +Size = 1.7MB Category = 5 -URLSite = Unknown +URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe CDPath = none [Section.0407] Description = Ein freier SSH-, Telnet-, rlogin- und TCP-Client -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Darmowy klient obs³uguj¹cy protoko³y SSH, Telnet, rlogin oraz bezporednie TCP. Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,18 @@ [Section] Name = ReactOS Build Environment -Version = 1.2 +Version = 1.4.4 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = Unknown +Size = 14.9MB Category = 7 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe +URLSite = http://reactos.org/wiki/Build_Environment +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe CDPath = none [Section.0407] Description = Erlaubt es Ihnen ReactOS aus den Quellen zu bauen. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,19 +2,18 @@ [Section] Name = Samba TNG -Version = Unknown -Licence = Unknown +Version = 0.4.99cvs +Licence = GPL Description = This tool allows you to access your Windows shared folders/printers with ReactOS. -Size = Unknown +Size = 1MB Category = 5 -URLSite = Unknown +URLSite = http://samba-tng.org URLDownload = http://svn.reactos.org/packages/samba-tng.exe CDPath = none [Section.0407] -Version = Unbekannt -Licence = Unbekannt Description = Dieses Werkzeug erlaubt den Zugriff auf Windows' gemeinsame Verzeichnisse und Drucker aus ReactOS heraus. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Narzêdzie pozwalaj¹ce na dostêp z poziomu ReactOSa do wspó³dzielonych folderów/drukarek Windows. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,18 +2,18 @@ [Section] Name = ScummVM -Version = 0.11.1 -Licence = Unknown +Version = 0.13.1 +Licence = GPL Description = Sam and Max, Day of the Tentacle, etc on ReactOS. -Size = Unknown +Size = 2.9MB Category = 4 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.11.1-win32.exe +URLSite = http://scummvm.org/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.13.1-win32.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Sam and Max, Day of the Tentacle usw in ReactOS -Size = Unbekannt -URLSize = Unbekannt + +[Section.0415] +Description = Program pozwalaj¹cy uruchomiæ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,17 @@ [Section] Name = Simple Direct Media Layer (SDL) Mixer Version = 1.2.8 -Licence = Unknown +Licence = LGPL Description = Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it. -Size = Unknown +Size = 307kB Category = 14 -URLSite = Unknown +URLSite = http://www.libsdl.org/projects/SDL_mixer/ URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip CDPath = none [Section.0407] -Licence = Unbekannt Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Biblioteka wymagana przez niektÃ³re gry (zwÅaszcza te o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest 7-Zip lub podobny program. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -3,17 +3,18 @@ [Section] Name = Simple Direct Media Layer (SDL) Runtime Version = 1.2.13 -Licence = Unknown +Licence = LGPL Description = Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it. -Size = Unknown +Size = 145kB Category = 14 -URLSite = Unknown +URLSite = http://www.libsdl.org/ URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip CDPath = none [Section.0407] Name = Simple Direct Media Layer (SDL) Laufzeitsystem -Licence = Unbekannt Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL) +Description = Wymagana przez wiele gier (gÅÃ³wnie o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny. Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,19 @@ [Section] Name = SMPlayer -Version = 0.6.7 -Licence = Unknown +Version = 0.6.8 +Licence = GPL Description = SMPlayer. -Size = Unknown +Size = 13.38MB Category = 1 -URLSite = Unknown -URLDownload = http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe +URLSite = http://smplayer.sourceforge.net/ +URLDownload = http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.8_setup.exe CDPath = none [Section.0407] -Licence = Unbekannt -Size = Unbekannt -URLSite = Unbekannt +URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=de + +[Section.0415] +URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=pl +Description = Graficzna nak³adka na MPlayer, otwarty odtwarzacz filmów. Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,17 @@ [Section] Name = Tile World -Version = Unknown -Licence = Unknown +Version = 1.3.0 +Licence = GPL Description = Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original. -Size = Unknown +Size = 1.2MB Category = 4 -URLSite = Unknown +URLSite = http://www.muppetlabs.com/~breadbox/software/tworld/ URLDownload = http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-… CDPath = none [Section.0407] -Licence = Unbekannt -Description = SchÃ¶ner Klon von Chip's Challange ursprÃ¼nglich etnwickelt fÃ¼r Atari Lynx. EnthÃ¤lt CCLP2 Graphics Pack, deshalb wird das urheberrechtlich geschÃ¼tzte Original nicht benÃ¶tigt. -Size = Unbekannt -URLSite = Unbekannt +Description = SchÃ¶ner Klon von Chip's Challenge ursprÃ¼nglich etnwickelt fÃ¼r Atari Lynx. EnthÃ¤lt CCLP2 Graphics Pack, deshalb wird das urheberrechtlich geschÃ¼tzte Original nicht benÃ¶tigt. + +[Section.0415] +Description = Udany klon gry Chip's Challenge z Atari Lynx. Zawiera darmowy zestaw grafik CCLP2. Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -2,17 +2,17 @@ [Section] Name = TuxPaint -Version = 0.9.19 -Licence = Unknown +Version = 0.9.21 +Licence = GPL Description = An Open Source bitmap graphics editor geared towards young children. -Size = Unknown +Size = 10MB Category = 3 -URLSite = Unknown -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.19-win32-in… +URLSite = http://tuxpaint.org +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.21-win32-in… CDPath = none [Section.0407] -Licence = Unbekannt Description = Ein Open Source Bitmap Zeichenprogramm fÃ¼r kleine Kinder. -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Description = Otwarty program graficzny przeznaczony gÅÃ³wnie dla dzieci. Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 5.0 Licence = Unknown Description = Visual Basic 5 Runtime. -Size = Unknown +Size = 970kB Category = 14 -URLSite = Unknown +URLSite = http://support.microsoft.com/kb/180071 URLDownload = http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Basic 5 Laufzeitsystem -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Basic 5 Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 6.0 Licence = Unknown Description = Visual Basic 6 Runtime. -Size = Unknown +Size = 1.0MB Category = 14 -URLSite = Unknown +URLSite = http://support.microsoft.com/kb/192461 URLDownload = http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Basic 6 Laufzeitsystem -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Basic 6 Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 7.0 Licence = Unknown Description = Visual Studio 2005 Runtime. -Size = Unknown +Size = 2.6MB Category = 14 -URLSite = Unknown +URLSite = http://www.microsoft.com/Downloads/details.aspx?displaylang=en&FamilyID=32b… URLDownload = http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Studio 2005 Laufzeitsystem -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Studio 2005 Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 7.1 Licence = Unknown Description = Visual Studio 2005 Runtime SP1. -Size = Unknown +Size = 2.6MB Category = 14 -URLSite = Unknown +URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=200b2fd9-ae1a-4a14… URLDownload = http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Studio 2005 Laufzeitsystem SP1 -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Studio 2005 SP1 Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 8.0 Licence = Unknown Description = Visual Studio 2008 Runtime. -Size = Unknown +Size = 1.7MB Category = 14 -URLSite = Unknown +URLSite = http://www.microsoft.com/DOWNLOADS/details.aspx?FamilyID=9b2da534-3e03-4391… URLDownload = http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Studio 2008 Laufzeitsystem -Size = Unbekannt -URLSite = Unbekannt + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Studio 2008 Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,14 +5,16 @@ Version = 6.0 Licence = Unknown Description = Visual Studio 6 Runtime. -Size = Unknown +Size = 1.7MB Category = 14 -URLSite = Unknown +URLSite = http://support.microsoft.com/kb/259403 URLDownload = http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red… CDPath = none [Section.0407] Licence = Unbekannt Description = Visual Studio 6 Laufzeitsystem -Size = Unbekannt -URLSite = Unbekannt + +[Section.0407] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Studio 6 Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Tue Sep 1 17:12:35 2009 @@ -5,15 +5,14 @@ Version = 4.2.7b Licence = GPL 3 Description = WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess. -Size = Unknown +Size = 5.9MB Category = 4 -URLSite = Unknown +URLSite = http://www.gnu.org/software/xboard/ URLDownload = http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe CDPath = none [Section.0407] Description = WinBoard ist ein grafisches Schachbrett fÃ¼r Windows/ReactOS welches als Nutzerinterface fÃ¼r GNU Chess, Crafty oder andere Schachprogramme, fÃ¼r Internet Schachserver und fÃ¼r Briefschach dient. -Size = Unbekannt -URLSite = Unbekannt - +[Section.0415] +Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych(w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych.

15 years, 3 months

[cgutman] 42977: - Send NetEventBindsComplete when binding has completed (required for the WDK example ndis protocol driver to work)

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 1 02:15:30 2009 New Revision: 42977 URL: http://svn.reactos.org/svn/reactos?rev=42977&view=rev Log: - Send NetEventBindsComplete when binding has completed (required for the WDK example ndis protocol driver to work) Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Sep 1 02:15:30 2009 @@ -1034,6 +1034,7 @@ PPROTOCOL_BINDING Protocol; NTSTATUS NtStatus; UINT MinSize; + PNET_PNP_EVENT PnPEvent; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -1100,6 +1101,23 @@ *NdisProtocolHandle = Protocol; ndisBindMiniportsToProtocol(Status, &Protocol->Chars); + + /* Should we only send this if ndisBindMiniportsToProtocol succeeds? */ + PnPEvent = ProSetupPnPEvent(NetEventBindsComplete, NULL, 0); + if (PnPEvent) + { + if (Protocol->Chars.PnPEventHandler) + { + /* We call this with a NULL binding context because it affects all bindings */ + NtStatus = (*Protocol->Chars.PnPEventHandler)(NULL, + PnPEvent); + + /* FIXME: We don't support this yet */ + ASSERT(NtStatus != NDIS_STATUS_PENDING); + } + + ExFreePool(PnPEvent); + } if (*Status == NDIS_STATUS_SUCCESS) { ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock);

15 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2009