Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70004: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 10:10:22 2015 New Revision: 70004 URL: http://svn.reactos.org/svn/reactos?rev=70004&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/metafile.c Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sun Nov 22 10:10:22 2015 @@ -36,6 +36,19 @@ #include <winnls.h> #include <ole2.h> #include <gdiplus.h> + +/* FIXME: They belong to gdipluseffects.h */ +DEFINE_GUID(BlurEffectGuid, 0x633c80a4, 0x1843, 0x482b, 0x9e, 0xf2, 0xbe, 0x28, 0x34, 0xc5, 0xfd, 0xd4); +DEFINE_GUID(SharpenEffectGuid, 0x63cbf3ee, 0xc526, 0x402c, 0x8f, 0x71, 0x62, 0xc5, 0x40, 0xbf, 0x51, 0x42); +DEFINE_GUID(ColorMatrixEffectGuid, 0x718f2615, 0x7933, 0x40e3, 0xa5, 0x11, 0x5f, 0x68, 0xfe, 0x14, 0xdd, 0x74); +DEFINE_GUID(ColorLUTEffectGuid, 0xa7ce72a9, 0x0f7f, 0x40d7, 0xb3, 0xcc, 0xd0, 0xc0, 0x2d, 0x5c, 0x32, 0x12); +DEFINE_GUID(BrightnessContrastEffectGuid, 0xd3a1dbe1, 0x8ec4, 0x4c17, 0x9f, 0x4c, 0xea, 0x97, 0xad, 0x1c, 0x34, 0x3d); +DEFINE_GUID(HueSaturationLightnessEffectGuid, 0x8b2dd6c3, 0xeb07, 0x4d87, 0xa5, 0xf0, 0x71, 0x08, 0xe2, 0x6a, 0x9c, 0x5f); +DEFINE_GUID(LevelsEffectGuid, 0x99c354ec, 0x2a31, 0x4f3a, 0x8c, 0x34, 0x17, 0xa8, 0x03, 0xb3, 0x3a, 0x25); +DEFINE_GUID(TintEffectGuid, 0x1077af00, 0x2848, 0x4441, 0x94, 0x89, 0x44, 0xad, 0x4c, 0x2d, 0x7a, 0x2c); +DEFINE_GUID(ColorBalanceEffectGuid, 0x537e597d, 0x251e, 0x48da, 0x96, 0x64, 0x29, 0xca, 0x49, 0x6b, 0x70, 0xf8); +DEFINE_GUID(RedEyeCorrectionEffectGuid, 0x74d29d05, 0x69a4, 0x4266, 0x95, 0x49, 0x3c, 0xc5, 0x28, 0x36, 0xb6, 0x32); +DEFINE_GUID(ColorCurveEffectGuid, 0xdd6a0022, 0x58e4, 0x4a67, 0x9d, 0x9b, 0xd4, 0x8e, 0xb8, 0x81, 0xa5, 0x3d); #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -1551,6 +1564,22 @@ GdipDisposeImage(img); } +static void test_createfromwmf_noplaceable(void) +{ + HMETAFILE hwmf; + GpImage *img; + GpStatus stat; + + hwmf = SetMetaFileBitsEx(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), + wmfimage+sizeof(WmfPlaceableFileHeader)); + ok(hwmf != 0, "SetMetaFileBitsEx failed\n"); + + stat = GdipCreateMetafileFromWmf(hwmf, TRUE, NULL, (GpMetafile**)&img); + expect(Ok, stat); + + GdipDisposeImage(img); +} + static void test_resolution(void) { GpStatus stat; @@ -2707,6 +2736,7 @@ expect(0, color); stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + expect(Ok, stat); stat = GdipBitmapGetPixel(bmp, 2, 0, &color); expect(Ok, stat); ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color); @@ -4005,6 +4035,50 @@ expect(Ok, status); } +static void test_DrawImage_SourceCopy(void) +{ + DWORD dst_pixels[4] = { 0xffffffff, 0xffffffff, + 0xffffffff, 0xffffffff }; + DWORD src_pixels[4] = { 0, 0xffff0000, + 0, 0xff00ff }; + + GpStatus status; + union + { + GpBitmap *bitmap; + GpImage *image; + } u1, u2; + GpGraphics *graphics; + + status = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppARGB, (BYTE*)dst_pixels, &u1.bitmap); + expect(Ok, status); + + status = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppARGB, (BYTE*)src_pixels, &u2.bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext(u1.image, &graphics); + expect(Ok, status); + status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); + expect(Ok, status); + + status = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, status); + + status = GdipDrawImageI(graphics, u2.image, 0, 0); + expect(Ok, status); + + todo_wine expect(0, dst_pixels[0]); + expect(0xffff0000, dst_pixels[1]); + todo_wine expect(0, dst_pixels[2]); + todo_wine expect(0, dst_pixels[3]); + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage(u1.image); + expect(Ok, status); + status = GdipDisposeImage(u2.image); + expect(Ok, status); +} + static void test_GdipDrawImagePointRect(void) { BYTE black_1x1[4] = { 0,0,0,0 }; @@ -4583,11 +4657,11 @@ static void test_supported_encoders(void) { - static const WCHAR bmp_mimetype[] = {'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p', 0}; - static const WCHAR jpeg_mimetype[] = {'i','m','a','g','e','/','j','p','e','g', 0}; - static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0}; - static const WCHAR tiff_mimetype[] = {'i','m','a','g','e','/','t','i','f','f', 0}; - static const WCHAR png_mimetype[] = {'i','m','a','g','e','/','p','n','g', 0}; + static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; + static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; + static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; + static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; + static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; static const struct test_data { LPCWSTR mime; @@ -4636,6 +4710,47 @@ GdipDisposeImage((GpImage *)bm); } +static void test_createeffect(void) +{ + static const GUID noneffect = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + GpStatus (WINAPI *pGdipCreateEffect)( const GUID guid, CGpEffect **effect); + GpStatus (WINAPI *pGdipDeleteEffect)( CGpEffect *effect); + GpStatus stat; + CGpEffect *effect; + HMODULE mod = GetModuleHandleA("gdiplus.dll"); + int i; + const GUID effectlist[] = + {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid, + BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid, + TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid}; + + pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); + pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); + if(!pGdipCreateEffect || !pGdipDeleteEffect) + { + /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */ + win_skip("GDIPlus version 1.1 not available\n"); + return; + } + + stat = pGdipCreateEffect(BlurEffectGuid, NULL); + expect(InvalidParameter, stat); + + stat = pGdipCreateEffect(noneffect, &effect); + todo_wine expect(Win32Error, stat); + + for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++) + { + stat = pGdipCreateEffect(effectlist[i], &effect); + todo_wine expect(Ok, stat); + if(stat == Ok) + { + stat = pGdipDeleteEffect(effect); + expect(Ok, stat); + } + } +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4654,6 +4769,7 @@ test_DrawImage_scale(); test_image_format(); test_DrawImage(); + test_DrawImage_SourceCopy(); test_GdipDrawImagePointRect(); test_bitmapbits(); test_tiff_palette(); @@ -4678,6 +4794,7 @@ test_getrawformat(); test_loadwmf(); test_createfromwmf(); + test_createfromwmf_noplaceable(); test_resolution(); test_createhbitmap(); test_getthumbnail(); @@ -4690,6 +4807,7 @@ test_remaptable(); test_colorkey(); test_dispose(); + test_createeffect(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/metafil… ============================================================================== --- trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] Sun Nov 22 10:10:22 2015 @@ -30,7 +30,8 @@ #include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) +#define expectf(expected, got) expectf_((expected), (got), 0.001) static BOOL save_metafiles; @@ -292,8 +293,11 @@ GpMetafile *metafile; GpGraphics *graphics; HDC hdc; + GpRectF bounds; + GpUnit unit; + REAL xres, yres; HENHMETAFILE hemf, dummy; - BOOL ret; + MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; @@ -342,6 +346,20 @@ save_metafile(metafile, "empty.emf"); + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -353,8 +371,55 @@ check_emfplus(hemf, empty_records, "empty emf"); - ret = DeleteEnhMetaFile(hemf); - ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromEmf(hemf, &header); + expect(Ok, stat); + expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + expectf(header.DpiX, xres); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + expectf(header.DpiY, yres); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record getdc_records[] = { @@ -513,8 +578,11 @@ GpImage *clone; GpGraphics *graphics; HDC hdc, metafile_dc; + GpRectF bounds; + GpUnit unit; + REAL xres, yres; HENHMETAFILE hemf; - BOOL ret; + MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; @@ -568,6 +636,20 @@ save_metafile(metafile, "emfonly.emf"); + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -636,8 +718,55 @@ check_emfplus(hemf, emfonly_records, "emfonly emf"); - ret = DeleteEnhMetaFile(hemf); - ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromEmf(hemf, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + expect(0x10000, header.Version); + expect(0, header.EmfPlusFlags); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + expectf(header.DpiX, xres); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + expectf(header.DpiY, yres); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record fillrect_records[] = {

1 0

[akhaldi] 70003: [GDIPLUS] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 10:10:02 2015 New Revision: 70003 URL: http://svn.reactos.org/svn/reactos?rev=70003&view=rev Log: [GDIPLUS] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/pathiterator.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… Modified: trunk/reactos/dll/win32/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pathiter… Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re… Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 70002: [PSDK] Update gdipluspixelformats.h. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 10:09:04 2015 New Revision: 70002 URL: http://svn.reactos.org/svn/reactos?rev=70002&view=rev Log: [PSDK] Update gdipluspixelformats.h. CORE-10536 Modified: trunk/reactos/include/psdk/gdipluspixelformats.h Modified: trunk/reactos/include/psdk/gdipluspixelformats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluspixelf… ============================================================================== --- trunk/reactos/include/psdk/gdipluspixelformats.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluspixelformats.h [iso-8859-1] Sun Nov 22 10:09:04 2015 @@ -102,4 +102,33 @@ #endif /* end of c typedefs */ +typedef enum DitherType +{ + DitherTypeNone, + DitherTypeSolid, + DitherTypeOrdered4x4, + DitherTypeOrdered8x8, + DitherTypeOrdered16x16, + DitherTypeSpiral4x4, + DitherTypeSpiral8x8, + DitherTypeDualSpiral4x4, + DitherTypeDualSpiral8x8, + DitherTypeErrorDiffusion, + DitherTypeMax +} DitherType; + +typedef enum PaletteType +{ + PaletteTypeCustom, + PaletteTypeOptimal, + PaletteTypeFixedBW, + PaletteTypeFixedHalftone8, + PaletteTypeFixedHalftone27, + PaletteTypeFixedHalftone64, + PaletteTypeFixedHalftone125, + PaletteTypeFixedHalftone216, + PaletteTypeFixedHalftone252, + PaletteTypeFixedHalftone256 +} PaletteType; + #endif

1 0

[rnaumann] 70001: [EXPLORER] -Implement The "Add...", "Advanced" and "Clear" buttons of the Startmenu customization dialog -Enable some controls that shouldn't be disabled -> Spotted by Jared -Yest...
by rnaumann＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: rnaumann Date: Sun Nov 22 09:28:45 2015 New Revision: 70001 URL: http://svn.reactos.org/svn/reactos?rev=70001&view=rev Log: [EXPLORER] -Implement The "Add...", "Advanced" and "Clear" buttons of the Startmenu customization dialog -Enable some controls that shouldn't be disabled -> Spotted by Jared -Yesterday I heard the whispered word "alphabet", correctly order file/fuction names Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/shell/explorer/lang/en-US.rc trunk/reactos/base/shell/explorer/lang/ms-MY.rc trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/startmnucust.cpp Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sun Nov 22 09:28:45 2015 @@ -12,8 +12,8 @@ shellservice.cpp startctxmnu.cpp startmnu.cpp + startmnucust.cpp startmnusite.cpp - startmnucust.cpp startup.cpp taskband.cpp taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/e… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/en-US.rc [iso-8859-1] Sun Nov 22 09:28:45 2015 @@ -92,9 +92,9 @@ AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 + LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 Modified: trunk/reactos/base/shell/explorer/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/m… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ms-MY.rc [iso-8859-1] Sun Nov 22 09:28:45 2015 @@ -94,9 +94,9 @@ AUTORADIOBUTTON "Menu Mula(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED LTEXT "Gaya menu ini memberikan anda akses ke folder, programs kegemaran anda, dan cari fail anda.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED - AUTORADIOBUTTON "Klasik &menu mula", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10, WS_DISABLED - LTEXT "Gaya menu ini memberikan anda lihat klasik dan berfungsi", IDC_STATIC, 20, 185, 150, 24, WS_DISABLED - PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Klasik &menu mula", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 + LTEXT "Gaya menu ini memberikan anda lihat klasik dan berfungsi", IDC_STATIC, 20, 185, 150, 24 + PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sun Nov 22 09:28:45 2015 @@ -309,17 +309,17 @@ IN BOOL bSmallIcons); /* + * startmnucust.cpp + */ +VOID +ShowCustomizeClassic(HINSTANCE, HWND); + +/* * startmnusite.cpp */ HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); - -/* - * startmnucust.cpp - */ -VOID -ShowCustomizeClassic(HINSTANCE, HWND); /* * trayntfy.c Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] Sun Nov 22 09:28:45 2015 @@ -2,7 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> - * 2015 Robert Naumann <gonzomdx(a)gmail.com| + * 2015 Robert Naumann <gonzomdx(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,16 +21,68 @@ #include "precomp.h" +VOID OnAddStartmenuItems(HWND hDlg) +{ + WCHAR szPath[MAX_PATH]; + + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + { + WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere "; + if(SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath))) + ShellExecuteW(hDlg, L"open", L"rundll32.exe", szCommand, NULL, SW_SHOWNORMAL); + } +} + +VOID OnAdvancedStartMenuItems() +{ + WCHAR szPath[MAX_PATH]; + + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + { + ShellExecuteW(NULL, L"explore", szPath, NULL, NULL, SW_SHOWNORMAL); + } +} + +VOID OnClearRecentItems() +{ + WCHAR szPath[MAX_PATH], szFile[MAX_PATH]; + WIN32_FIND_DATA info; + HANDLE hPath; + + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath))) + { + StringCchPrintf(szFile,MAX_PATH, L"%s\\*.*", szPath); + hPath = FindFirstFileW(szFile, &info); + do + { + StringCchPrintf(szFile,MAX_PATH, L"%s\\%s", szPath, info.cFileName); + DeleteFileW(szFile); + + }while(FindNextFileW(hPath, &info)); + FindClose(hPath); + /* FIXME: Disable the button*/ + } +} + BOOL CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { switch(Message) { case WM_INITDIALOG: - + /* FIXME: Properly intialize the dialog (check whether 'clear' button must be disabled, for example) */ return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { + case IDC_CLASSICSTART_ADD: + OnAddStartmenuItems(hwnd); + break; + case IDC_CLASSICSTART_ADVANCED: + OnAdvancedStartMenuItems(); + break; + case IDC_CLASSICSTART_CLEAR: + OnClearRecentItems(); + break; case IDOK: EndDialog(hwnd, IDOK); break;

1 0

[akhaldi] 70000: [EPIC] * Ladies and gentlemen, I present to you, the 0.4.0 release branch!
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 07:59:08 2015 New Revision: 70000 URL: http://svn.reactos.org/svn/reactos?rev=70000&view=rev Log: [EPIC] * Ladies and gentlemen, I present to you, the 0.4.0 release branch! Added: branches/ros-branch-0_4_0/ - copied from r69999, trunk/

1 0

[hbelusca] 69999: [WORDPAD] - Add document icon to wordpad. [SHELL32] - Add FriendlyTypeName support to HCR_MapTypeToValueW as well. - Sync HCR_GetClassNameA ReactOS additions into HCR_GetClassName...
by hbelusca＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: hbelusca Date: Sun Nov 22 03:25:38 2015 New Revision: 69999 URL: http://svn.reactos.org/svn/reactos?rev=69999&view=rev Log: [WORDPAD] - Add document icon to wordpad. [SHELL32] - Add FriendlyTypeName support to HCR_MapTypeToValueW as well. - Sync HCR_GetClassNameA ReactOS additions into HCR_GetClassNameW. [NOTEPAD][SHIMGVW] - Add localized FriendlyTypeName file type strings. [SHELL32][HIVECLS] Update the FriendlyTypeName file type strings. This commit is an addendum to revision range r32966-r32969 and r32973. Added: trunk/reactos/base/applications/wordpad/res/document.ico - copied unchanged from r69993, trunk/reactos/dll/win32/shell32/res/icons/2.ico Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/lt-LT.rc trunk/reactos/base/applications/notepad/lang/ms-MY.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-BR.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sq-AL.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/notepad/lang/zh-TW.rc trunk/reactos/base/applications/notepad/notepad_res.h trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/wine/classes.c trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc trunk/reactos/dll/win32/shimgvw/lang/en-US.rc trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc trunk/reactos/dll/win32/shimgvw/lang/fr-FR.rc trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc trunk/reactos/dll/win32/shimgvw/lang/sq-AL.rc trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc trunk/reactos/dll/win32/shimgvw/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/notepad_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/dll/win32/shell32/wine/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cla… Modified: trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/bg-… Modified: trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/cs-… Modified: trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/de-… Modified: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/en-… Modified: trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/es-… Modified: trunk/reactos/dll/win32/shimgvw/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/fr-… Modified: trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/he-… Modified: trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/it-… Modified: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/lt-… Modified: trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/no-… Modified: trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/pl-… Modified: trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ro-… Modified: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-… Modified: trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/sk-… Modified: trunk/reactos/dll/win32/shimgvw/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/sq-… Modified: trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/tr-… Modified: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/uk-… Modified: trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/zh-… Modified: trunk/reactos/dll/win32/shimgvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/resource…

1 0

[aandrejevic] 69998: [CRT] Check for positive and negative infinity in exp().
by aandrejevic＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: aandrejevic Date: Sun Nov 22 01:12:34 2015 New Revision: 69998 URL: http://svn.reactos.org/svn/reactos?rev=69998&view=rev Log: [CRT] Check for positive and negative infinity in exp(). Modified: trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/exp_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] Sun Nov 22 01:12:34 2015 @@ -11,6 +11,18 @@ mov ebp, esp fld qword ptr [ebp + 8] + fxam + fstsw ax + fwait + sahf + jnp .not_inf + jnc .not_inf + test ah, 2 + jz .done + fstp st + fldz + jmp .done +.not_inf: fldl2e fmul st, st(1) fst st(1) @@ -22,7 +34,7 @@ faddp st(1), st fscale fstp st(1) - +.done: pop ebp ret

1 0

[spetreolle] 69997: French translations updates for newdev and taskmgr.
by spetreolle＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: spetreolle Date: Sat Nov 21 16:59:41 2015 New Revision: 69997 URL: http://svn.reactos.org/svn/reactos?rev=69997&view=rev Log: French translations updates for newdev and taskmgr. Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sat Nov 21 16:59:41 2015 @@ -48,17 +48,17 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" - BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + POPUP "Ã&teindre" + BEGIN + MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY + MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE + MENUITEM "Ã&teindre", ID_SHUTDOWN_POWEROFF + MENUITEM "&RedÃ©marrer", ID_SHUTDOWN_REBOOT + MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&DÃ©connecter", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "LibÃ©r&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aide" BEGIN Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] Sat Nov 21 16:59:41 2015 @@ -8,7 +8,7 @@ LTEXT "Bienvenue", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Cet assistant installe un nouveau pilote pour :", IDC_STATIC, 120, 21, 195, 16 LTEXT "Cliquer sur Suivant pour continuer.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 148, 36, 147, 12 LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !", IDC_STATIC, 120, 59, 200, 16 CONTROL "Installer le pilote automatiquement", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Installer le pilote depuis un endroit spÃ©cifiÃ©", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ BEGIN LTEXT "L'installation a Ã©chouÃ©", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Le matÃ©riel n'a pu etre installÃ© en raison d'une erreur inattendue.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -53,7 +53,7 @@ CAPTION "Installation de matÃ©riel" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 51, 20, 169, 16 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 51, 20, 169, 16 END IDD_INSTALLDRV DIALOGEX 0, 0, 317, 143 @@ -61,7 +61,7 @@ CAPTION "Installation de matÃ©riel" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 51, 20, 169, 16 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 51, 20, 169, 16 END IDD_NEEDREBOOT DIALOGEX 0, 0, 317, 193 @@ -72,7 +72,7 @@ LTEXT "Installation terminÃ©e", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Vous devez redÃ©marrer l'ordinateur avant d'utiliser :", IDC_STATIC, 120, 32, 195, 16 LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 120, 174, 179, 12 - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,14 +83,14 @@ LTEXT "Installation terminÃ©e", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "L'assistant a fini d'installer le pilote pour :", IDC_STATIC, 120, 32, 195, 16 LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 120, 174, 179, 12 - LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÃRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 END STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New Hardware Wizard" - IDS_UPDATEWIZARDTITLE "Update Driver Wizard" - IDS_CHSOURCE_TITLE "Choose search and install options" - IDS_SEARCHDRV_TITLE "Searching..." - IDS_INSTALLDRV_TITLE "Installing..." + IDS_INSTALLWIZARDTITLE "Assistant d'installation de matÃ©riel" + IDS_UPDATEWIZARDTITLE "Assistant de mise Ã jour des pilotes" + IDS_CHSOURCE_TITLE "Options de recherche et d'installation" + IDS_SEARCHDRV_TITLE "Recherche..." + IDS_INSTALLDRV_TITLE "Installation..." END

1 0

[akhaldi] 69996: [MSI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 16:45:05 2015 New Revision: 69996 URL: http://svn.reactos.org/svn/reactos?rev=69996&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Sat Nov 21 16:45:05 2015 @@ -214,7 +214,8 @@ "Var23\t+-MSITESTVAR19\t1\tOne\n" "Var24\t+-MSITESTVAR19\t[~]2\tOne\n" "Var25\t+-MSITESTVAR20\t1\tOne\n" - "Var26\t+-MSITESTVAR20\t2[~]\tOne\n"; + "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" + "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -1201,7 +1202,13 @@ "var2\t=+-MSITESTVAR2\t1\tenvvar\n" "var3\t=MSITESTVAR3\t1\tenvvar\n" "var4\t=-MSITESTVAR4\t\tenvvar\n" - "var5\t=MSITESTVAR5\t\tenvvar\n"; + "var5\t=MSITESTVAR5\t\tenvvar\n" + "Var6\t-MSITESTVAR6\t1;[~]\tenvvar\n" + "Var7\t-MSITESTVAR7\t[~];1\tenvvar\n" + "Var8\t-MSITESTVAR8\t1;[~]\tenvvar\n" + "Var9\t-MSITESTVAR9\t[~];1\tenvvar\n" + "Var10\t-MSITESTVAR10\t1\tenvvar\n" + "Var11\t-MSITESTVAR11\t2\tenvvar\n"; static const char res_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -5135,6 +5142,7 @@ "1;;2;;", /* MSITESTVAR18 */ "1", /* MSITESTVAR19 */ "1", /* MSITESTVAR20 */ + "1", /* MSITESTVAR21 */ NULL }; UINT r; @@ -5160,6 +5168,9 @@ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR21", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -5254,6 +5265,7 @@ error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); + RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); delete_test_files(); @@ -5838,10 +5850,14 @@ { static const char keypath[] = "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; + static const char keypath2[] = + "Software\\Classes\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; UINT r; LONG res; HKEY key; + BYTE *data; + DWORD size; if (is_process_limited()) { @@ -5863,11 +5879,49 @@ } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + size = 0; + r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", + "english.txt", INSTALLMODE_DEFAULT, NULL, &size); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); ok(res == ERROR_SUCCESS, "components key not created %d\n", res); - res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); + res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, &size); ok(res == ERROR_SUCCESS, "value not found %d\n", res); + + data = HeapAlloc(GetProcessHeap(), 0, size); + res = RegQueryValueExA(key, "english.txt", NULL, NULL, data, &size); + ok(res == ERROR_SUCCESS, "value not found %d\n", res); + RegCloseKey(key); + + res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + + res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE, + MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL ); + ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %d\n", res); + res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + RegCloseKey(key); + + size = 0; + r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", + "english.txt", INSTALLMODE_DEFAULT, NULL, &size); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + + if (pRegDeleteKeyExA) + res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); + else + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + + res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); + + res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + HeapFree(GetProcessHeap(), 0, data); RegCloseKey(key); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -6188,6 +6242,12 @@ RegSetValueExA(key, "MSITESTVAR3", 0, REG_SZ, (const BYTE *)"1", 2); RegSetValueExA(key, "MSITESTVAR4", 0, REG_SZ, (const BYTE *)"1", 2); RegSetValueExA(key, "MSITESTVAR5", 0, REG_SZ, (const BYTE *)"1", 2); + RegSetValueExA(key, "MSITESTVAR6", 0, REG_SZ, (const BYTE *)"1;2", 4); + RegSetValueExA(key, "MSITESTVAR7", 0, REG_SZ, (const BYTE *)"1;2", 4); + RegSetValueExA(key, "MSITESTVAR8", 0, REG_SZ, (const BYTE *)"2;1;0", 6); + RegSetValueExA(key, "MSITESTVAR9", 0, REG_SZ, (const BYTE *)"0;1;2", 6); + RegSetValueExA(key, "MSITESTVAR10", 0, REG_SZ, (const BYTE *)"1", 2); + RegSetValueExA(key, "MSITESTVAR11", 0, REG_SZ, (const BYTE *)"1", 2); RegCloseKey(key); @@ -6276,6 +6336,57 @@ ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); RegDeleteValueA(key, "MSITESTVAR5"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR6", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR6"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR7", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR7"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR8", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2;0"), "expected \"2;0\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR8"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR9", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "0;2"), "expected \"0;2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR9"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR10", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR11", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR11"); ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); @@ -6286,6 +6397,12 @@ RegDeleteValueA(key, "MSITESTVAR3"); RegDeleteValueA(key, "MSITESTVAR4"); RegDeleteValueA(key, "MSITESTVAR5"); + RegDeleteValueA(key, "MSITESTVAR6"); + RegDeleteValueA(key, "MSITESTVAR7"); + RegDeleteValueA(key, "MSITESTVAR8"); + RegDeleteValueA(key, "MSITESTVAR9"); + RegDeleteValueA(key, "MSITESTVAR10"); + RegDeleteValueA(key, "MSITESTVAR11"); RegCloseKey(key); DeleteFileA("msitest\\envvar.txt"); Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Sat Nov 21 16:45:05 2015 @@ -1127,6 +1127,25 @@ return invoke(pInstaller, "UILevel", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT Installer_SummaryInformation(BSTR PackagePath, int UpdateCount, IDispatch **pSumInfo) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(PackagePath); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = UpdateCount; + + hr = invoke(pInstaller, "SummaryInformation", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pSumInfo = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) { VARIANT varresult; @@ -1184,7 +1203,7 @@ return hr; } -static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) +static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, VARIANT_BOOL *mode) { VARIANT varresult; VARIANTARG vararg[1]; @@ -1196,12 +1215,12 @@ V_I4(&vararg[0]) = iFlag; hr = invoke(pSession, "Mode", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BOOL); - *pMode = V_BOOL(&varresult); + *mode = V_BOOL(&varresult); VariantClear(&varresult); return hr; } -static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) +static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, VARIANT_BOOL mode) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1213,7 +1232,7 @@ V_I4(&vararg[1]) = iFlag; VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BOOL; - V_BOOL(&vararg[0]) = bMode; + V_BOOL(&vararg[0]) = mode; return invoke(pSession, "Mode", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } @@ -1856,7 +1875,7 @@ WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; - BOOL bool; + VARIANT_BOOL bool; int myint; IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; ULONG refs_before, refs_after; @@ -1924,15 +1943,15 @@ ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); @@ -1940,11 +1959,11 @@ ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); - hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); @@ -2601,7 +2620,7 @@ static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; - IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; + IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL, *pSumInfo = NULL; int iValue, iCount; if (!pInstaller) return; @@ -2676,6 +2695,18 @@ test_Database(pDatabase, FALSE); IDispatch_Release(pDatabase); } + + /* Installer::SummaryInformation */ + hr = Installer_SummaryInformation(szPath, 0, &pSumInfo); + ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + test_SummaryInfo(pSumInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info), TRUE); + IDispatch_Release(pSumInfo); + } + + hr = Installer_SummaryInformation(NULL, 0, &pSumInfo); + ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); /* Installer::RegistryValue */ test_Installer_RegistryValue(); Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Sat Nov 21 16:45:05 2015 @@ -1110,10 +1110,16 @@ "CustomAction\tAction\n" "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRequired0\t19\t\tPrimaryVolumeSpaceRequired set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRemaining0\t19\t\tPrimaryVolumeSpaceRemaining set before CostFinalize\t\n" "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired1\t19\t\tPrimaryVolumeSpaceRequired not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining1\t19\t\tPrimaryVolumeSpaceRemaining not set before InstallValidate\t\n" "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" - "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired2\t19\t\tPrimaryVolumeSpaceRequired not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining2\t19\t\tPrimaryVolumeSpaceRemaining not set after InstallValidate\t\n"; static const char vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1124,12 +1130,18 @@ "FileCost\t\t300\n" "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "TestPrimaryVolumeSpaceRequired0\tPrimaryVolumeSpaceRequired AND NOT REMOVE\t510\n" + "TestPrimaryVolumeSpaceRemaining0\tPrimaryVolumeSpaceRemaining AND NOT REMOVE\t520\n" "CostFinalize\t\t600\n" "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "TestPrimaryVolumeSpaceRequired1\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t810\n" + "TestPrimaryVolumeSpaceRemaining1\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t820\n" "InstallValidate\t\t900\n" "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "TestPrimaryVolumeSpaceRequired2\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t1110\n" + "TestPrimaryVolumeSpaceRemaining2\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t1120\n" "InstallInitialize\t\t1200\n" "ProcessComponents\t\t1300\n" "RemoveFiles\t\t1400\n" @@ -3157,6 +3169,11 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3165,6 +3182,8 @@ ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3179,6 +3198,12 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3187,6 +3212,8 @@ ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); } @@ -4687,6 +4714,16 @@ ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); + r = MsiInstallProductA(msifile, "Prop1=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + r = MsiInstallProductA(msifile, "Prop1=\"\"\"install.exe\"\" /Install\" MyProp=\"42\""); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\augustus"); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Sat Nov 21 16:45:05 2015 @@ -48,6 +48,8 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); +static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) + (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentA) (LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentW) @@ -90,6 +92,7 @@ trace("GetProcAddress(%s) failed\n", #func); GET_PROC(hmsi, MsiGetComponentPathA) + GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiProvideComponentA) GET_PROC(hmsi, MsiProvideComponentW) GET_PROC(hmsi, MsiGetFileHashA) @@ -4224,12 +4227,11 @@ ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* pcchLangBuf not big enough */ - langsz = 3; + langsz = 4; lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - ok(!strncmp(lang, langcheck, 2), - "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang); + ok(lstrcmpA(lang, "lang"), "lang not set\n"); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf big enough, pcchLangBuf not big enough */ @@ -4250,7 +4252,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); - ok(lstrcmpA(lang, "lang"), "lang buffer not modified\n"); + ok(strstr(lang, langcheck) != NULL, "expected %s in %s\n", langcheck, lang); /* NULL pcchVersionBuf and pcchLangBuf */ r = MsiGetFileVersionA(path, version, NULL, lang, NULL); @@ -14432,7 +14434,8 @@ test_lastusedsource(); test_setpropertyfolder(); test_sourcedir_props(); - test_concurrentinstall(); + if (pMsiGetComponentPathExA) + test_concurrentinstall(); test_command_line_parsing(); SetCurrentDirectoryA(prev_path); Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Sat Nov 21 16:45:05 2015 @@ -3414,7 +3414,7 @@ /* reinstall the product */ r = MsiInstallProductA(msifile3, "REINSTALL=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE) /* win2k3 */, "Expected ERROR_SUCCESS, got %d\n", r); state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state);

1 0

[akhaldi] 69995: [MSI] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 16:44:38 2015 New Revision: 69995 URL: http://svn.reactos.org/svn/reactos?rev=69995&view=rev Log: [MSI] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -65,7 +65,7 @@ target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader) add_delay_importlibs(msi odbccp32 crypt32 wintrust) -add_importlibs(msi advapi32 cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi urlmon user32 version wininet mspatcha +add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi urlmon user32 version wininet mspatcha #FIXME : should be in delayed imports imagehlp msvcrt Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -239,8 +239,7 @@ len++; break; default: - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -261,8 +260,7 @@ break; default: state = state_token; - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -271,6 +269,7 @@ default: break; } if (!ignore) *out++ = *p; + if (!count) in_quotes = FALSE; } done: @@ -313,7 +312,7 @@ ptr2 = strchrW( ptr, '=' ); if (!ptr2) return ERROR_INVALID_COMMAND_LINE; - + len = ptr2 - ptr; if (!len) return ERROR_INVALID_COMMAND_LINE; @@ -2362,6 +2361,18 @@ TRACE("%s resolves to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); } +static ULONGLONG get_volume_space_required( MSIPACKAGE *package ) +{ + MSICOMPONENT *comp; + ULONGLONG ret = 0; + + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->Cost; + } + return ret; +} + static UINT ACTION_CostFinalize(MSIPACKAGE *package) { static const WCHAR query[] = @@ -2376,6 +2387,12 @@ static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szPrimaryVolumeSpaceRequired[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','q','u','i','r','e','d',0}; + static const WCHAR szPrimaryVolumeSpaceRemaining[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','m','a','i','n','i','n','g',0}; static const WCHAR szOutOfNoRbDiskSpace[] = {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; @@ -2426,6 +2443,8 @@ if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); msi_free(level); + if ((rc = MSI_SetFeatureStates( package ))) return rc; + if ((primary_key = msi_dup_property( package->db, szPrimaryFolder ))) { if ((primary_folder = msi_dup_property( package->db, primary_key ))) @@ -2433,17 +2452,23 @@ if (((primary_folder[0] >= 'A' && primary_folder[0] <= 'Z') || (primary_folder[0] >= 'a' && primary_folder[0] <= 'z')) && primary_folder[1] == ':') { + static const WCHAR fmtW[] = {'%','l','u',0}; ULARGE_INTEGER free; + ULONGLONG required; + WCHAR buf[21]; primary_folder[2] = 0; if (GetDiskFreeSpaceExW( primary_folder, &free, NULL, NULL )) { - static const WCHAR fmtW[] = {'%','l','u',0}; - WCHAR buf[21]; - sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } + required = get_volume_space_required( package ); + sprintfW( buf, fmtW, required / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRequired, buf, -1 ); + + sprintfW( buf, fmtW, (free.QuadPart - required) / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRemaining, buf, -1 ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder ); @@ -2455,7 +2480,7 @@ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); - return MSI_SetFeatureStates(package); + return ERROR_SUCCESS; } static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) @@ -2617,9 +2642,8 @@ return view; } -static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create ) -{ - REGSAM access = KEY_ALL_ACCESS; +static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create, REGSAM access ) +{ WCHAR *subkey, *p, *q; HKEY hkey, ret = NULL; LONG res; @@ -2641,7 +2665,7 @@ } if (q && q[1]) { - ret = open_key( comp, hkey, q + 1, create ); + ret = open_key( comp, hkey, q + 1, create, access ); RegCloseKey( hkey ); } else ret = hkey; @@ -2866,7 +2890,7 @@ strcpyW(uikey,szRoot); strcatW(uikey,deformated); - if (!(hkey = open_key( comp, root_key, deformated, TRUE ))) + if (!(hkey = open_key( comp, root_key, deformated, TRUE, KEY_QUERY_VALUE | KEY_SET_VALUE ))) { ERR("Could not create key %s\n", debugstr_w(deformated)); msi_free(uikey); @@ -2957,13 +2981,17 @@ access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return; - for (;;) - { - if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( comp, root, subkey, FALSE ); - if (!hkey) break; - if (p && p[1]) + do + { + if ((p = strrchrW( subkey, '\\' ))) + { + *p = 0; + if (!p[1]) continue; /* trailing backslash */ + hkey = open_key( comp, root, subkey, FALSE, access ); + if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + RegCloseKey( hkey ); + } else res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) @@ -2971,9 +2999,7 @@ TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); break; } - if (p && p[1]) RegCloseKey( hkey ); - else break; - } + } while (p); msi_free( subkey ); } @@ -2983,7 +3009,7 @@ HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( comp, root, path, FALSE ))) + if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -3004,8 +3030,8 @@ LONG res; HKEY hkey; - if (!(hkey = open_key( comp, root, path, FALSE ))) return; - res = SHDeleteKeyW( hkey, NULL ); + if (!(hkey = open_key( comp, root, path, FALSE, KEY_ALL_ACCESS ))) return; + res = RegDeleteTreeW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); delete_key( comp, root, path ); RegCloseKey( hkey ); @@ -3537,7 +3563,9 @@ if (!comp->KeyPath || !(file = msi_get_loaded_file(package, comp->KeyPath))) continue; - row = MSI_QueryGetRecord(package->db, query, file->Sequence); + if (!(row = MSI_QueryGetRecord(package->db, query, file->Sequence))) + return ERROR_FUNCTION_FAILED; + sprintfW(source, fmt, MSI_RecordGetInteger(row, 1)); ptr2 = strrchrW(source, '\\') + 1; msiobj_release(&row->hdr); @@ -5857,8 +5885,8 @@ if (image_path != file->TargetPath) msi_free(image_path); done: - CloseServiceHandle(service); - CloseServiceHandle(hscm); + if (service) CloseServiceHandle(service); + if (hscm) CloseServiceHandle(hscm); msi_free(name); msi_free(disp); msi_free(sd.lpDescription); @@ -6032,8 +6060,8 @@ msi_ui_actiondata( package, szStartServices, uirow ); msiobj_release( &uirow->hdr ); - CloseServiceHandle(service); - CloseServiceHandle(scm); + if (service) CloseServiceHandle(service); + if (scm) CloseServiceHandle(scm); msi_free(name); msi_free(args); @@ -6142,8 +6170,8 @@ WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); done: - CloseServiceHandle(service); - CloseServiceHandle(scm); + if (service) CloseServiceHandle(service); + if (scm) CloseServiceHandle(scm); return ERROR_SUCCESS; } @@ -6280,8 +6308,8 @@ msi_ui_actiondata( package, szDeleteServices, uirow ); msiobj_release( &uirow->hdr ); - CloseServiceHandle( service ); - CloseServiceHandle( scm ); + if (service) CloseServiceHandle( service ); + if (scm) CloseServiceHandle( scm ); msi_free( name ); msi_free( display_name ); @@ -6903,13 +6931,13 @@ { MSIPACKAGE *package = param; LPCWSTR name, value, component; - LPWSTR data = NULL, newval = NULL, deformatted = NULL, ptr; - DWORD flags, type, size; + WCHAR *data = NULL, *newval = NULL, *deformatted = NULL, *p, *q; + DWORD flags, type, size, len, len_value = 0; UINT res; HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; - int action = 0; + int action = 0, found = 0; component = MSI_RecordGetString(rec, 4); comp = msi_get_loaded_component(package, component); @@ -6937,7 +6965,20 @@ goto done; } - value = deformatted; + if ((value = deformatted)) + { + if (flags & ENV_MOD_PREFIX) + { + p = strrchrW( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = strchrW( value, ';' ) + 1; + len_value = strlenW( value ); + } + else len_value = strlenW( value ); + } res = open_env_key( flags, &env ); if (res != ERROR_SUCCESS) @@ -6963,10 +7004,6 @@ res = ERROR_SUCCESS; goto done; } - - /* If we are appending but the string was empty, strip ; */ - if ((flags & ENV_MOD_APPEND) && (value[0] == szSemiColon[0])) value++; - size = (lstrlenW(value) + 1) * sizeof(WCHAR); newval = strdupW(value); if (!newval) @@ -6986,15 +7023,14 @@ goto done; } - data = msi_alloc(size); - if (!data) + if (!(p = q = data = msi_alloc( size ))) { msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; } - res = RegQueryValueExW(env, name, NULL, &type, (LPVOID)data, &size); + res = RegQueryValueExW( env, name, NULL, &type, (BYTE *)data, &size ); if (res != ERROR_SUCCESS) goto done; @@ -7007,20 +7043,28 @@ goto done; } - size = (lstrlenW(data) + 1) * sizeof(WCHAR); - if (flags & ENV_MOD_MASK) - { - DWORD mod_size; - int multiplier = 0; - if (flags & ENV_MOD_APPEND) multiplier++; - if (flags & ENV_MOD_PREFIX) multiplier++; - mod_size = lstrlenW(value) * multiplier; - size += mod_size * sizeof(WCHAR); - } - - newval = msi_alloc(size); - ptr = newval; - if (!newval) + for (;;) + { + while (*q && *q != ';') q++; + len = q - p; + if (value && len == len_value && !memcmp( value, p, len * sizeof(WCHAR) ) && + (!p[len] || p[len] == ';')) + { + found = 1; + break; + } + if (!*q) break; + p = ++q; + } + + if (found) + { + TRACE("string already set\n"); + goto done; + } + + size = (len_value + 1 + strlenW( data ) + 1) * sizeof(WCHAR); + if (!(p = newval = msi_alloc( size ))) { res = ERROR_OUTOFMEMORY; goto done; @@ -7028,21 +7072,24 @@ if (flags & ENV_MOD_PREFIX) { - lstrcpyW(newval, value); - ptr = newval + lstrlenW(value); + memcpy( newval, value, len_value * sizeof(WCHAR) ); + newval[len_value] = ';'; + p = newval + len_value + 1; action |= 0x80000000; } - lstrcpyW(ptr, data); + strcpyW( p, data ); if (flags & ENV_MOD_APPEND) { - lstrcatW(newval, value); + p += strlenW( data ); + *p++ = ';'; + memcpy( p, value, (len_value + 1) * sizeof(WCHAR) ); action |= 0x40000000; } } TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); - res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + res = RegSetValueExW( env, name, 0, type, (BYTE *)newval, size ); if (res) { WARN("Failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(newval), res); @@ -7084,8 +7131,8 @@ { MSIPACKAGE *package = param; LPCWSTR name, value, component; - LPWSTR deformatted = NULL; - DWORD flags; + WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; + DWORD flags, type, size, len, len_value = 0, len_new_value; HKEY env; MSICOMPONENT *comp; MSIRECORD *uirow; @@ -7122,7 +7169,20 @@ if (value && !deformat_string( package, value, &deformatted )) return ERROR_OUTOFMEMORY; - value = deformatted; + if ((value = deformatted)) + { + if (flags & ENV_MOD_PREFIX) + { + p = strchrW( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = strchrW( value, ';' ) + 1; + len_value = strlenW( value ); + } + else len_value = strlenW( value ); + } r = open_env_key( flags, &env ); if (r != ERROR_SUCCESS) @@ -7134,13 +7194,48 @@ if (flags & ENV_MOD_MACHINE) action |= 0x20000000; - TRACE("Removing %s\n", debugstr_w(name)); - - res = RegDeleteValueW( env, name ); + size = 0; + type = REG_SZ; + res = RegQueryValueExW( env, name, NULL, &type, NULL, &size ); + if (res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) + goto done; + + if (!(new_value = msi_alloc( size ))) goto done; + + res = RegQueryValueExW( env, name, NULL, &type, (BYTE *)new_value, &size ); if (res != ERROR_SUCCESS) - { - WARN("Failed to delete value %s (%d)\n", debugstr_w(name), res); - r = ERROR_SUCCESS; + goto done; + + len_new_value = size / sizeof(WCHAR) - 1; + p = q = new_value; + for (;;) + { + while (*q && *q != ';') q++; + len = q - p; + if (value && len == len_value && !memcmp( value, p, len * sizeof(WCHAR) )) + { + if (*q == ';') q++; + memmove( p, q, (len_new_value - (q - new_value) + 1) * sizeof(WCHAR) ); + break; + } + if (!*q) break; + p = ++q; + } + + if (!new_value[0] || !value) + { + TRACE("removing %s\n", debugstr_w(name)); + res = RegDeleteValueW( env, name ); + if (res != ERROR_SUCCESS) + WARN("failed to delete value %s (%d)\n", debugstr_w(name), res); + } + else + { + TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(new_value)); + size = (strlenW( new_value ) + 1) * sizeof(WCHAR); + res = RegSetValueExW( env, name, 0, type, (BYTE *)new_value, size ); + if (res != ERROR_SUCCESS) + WARN("failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(new_value), res); } done: @@ -7153,6 +7248,7 @@ if (env) RegCloseKey( env ); msi_free( deformatted ); + msi_free( new_value ); return r; } Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… ============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -1421,7 +1421,7 @@ hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)) ? VARIANT_TRUE : VARIANT_FALSE; } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -1816,12 +1816,36 @@ EXCEPINFO* pExcepInfo, UINT* puArgErr) { - if (!(wFlags & DISPATCH_METHOD)) + UINT ret; + HRESULT hr; + MSIHANDLE hsuminfo; + IDispatch *dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_PROPERTYGET)) return DISP_E_MEMBERNOTFOUND; - FIXME("\n"); - - VariantInit(pVarResult); + VariantInit(&varg1); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + return hr; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + ret = MsiGetSummaryInformationW(0, V_BSTR(&varg0), V_I4(&varg1), &hsuminfo); + VariantClear(&varg0); + if (ret != ERROR_SUCCESS) + return DISP_E_EXCEPTION; + + hr = create_summaryinfo(hsuminfo, &dispatch); + if (FAILED(hr)) + return hr; + + V_VT(pVarResult) = VT_DISPATCH; + V_DISPATCH(pVarResult) = dispatch; return S_OK; } @@ -2013,7 +2037,7 @@ /* Return VT_BOOL clarifying whether registry key exists or not. */ case VT_EMPTY: V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = (ret == ERROR_SUCCESS); + V_BOOL(pVarResult) = (ret == ERROR_SUCCESS) ? VARIANT_TRUE : VARIANT_FALSE; break; /* Return the value of specified key if it exists. */ Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -953,7 +953,7 @@ cls->action = INSTALLSTATE_ABSENT; - res = SHDeleteKeyW( hkey, cls->clsid ); + res = RegDeleteTreeW( hkey, cls->clsid ); if (res != ERROR_SUCCESS) WARN("Failed to delete class key %d\n", res); @@ -975,7 +975,7 @@ { strcpyW( filetype, szFileType ); strcatW( filetype, cls->clsid ); - res = SHDeleteKeyW( HKEY_CLASSES_ROOT, filetype ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, filetype ); msi_free( filetype ); if (res != ERROR_SUCCESS) @@ -1148,7 +1148,7 @@ } TRACE("Unregistering progid %s\n", debugstr_w(progid->ProgID)); - res = SHDeleteKeyW( HKEY_CLASSES_ROOT, progid->ProgID ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID ); if (res != ERROR_SUCCESS) TRACE("Failed to delete progid key %d\n", res); @@ -1392,7 +1392,7 @@ { extension[0] = '.'; strcpyW( extension + 1, ext->Extension ); - res = SHDeleteKeyW( HKEY_CLASSES_ROOT, extension ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, extension ); msi_free( extension ); if (res != ERROR_SUCCESS) WARN("Failed to delete extension key %d\n", res); @@ -1414,7 +1414,7 @@ { strcpyW( progid_shell, progid ); strcatW( progid_shell, shellW ); - res = SHDeleteKeyW( HKEY_CLASSES_ROOT, progid_shell ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid_shell ); msi_free( progid_shell ); if (res != ERROR_SUCCESS) WARN("Failed to delete shell key %d\n", res); Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -35,6 +35,13 @@ */ #define IS_INTMSIDBOPEN(x) (((ULONG_PTR)(x) >> 16) == 0) + +struct row_export_info +{ + HANDLE handle; + LPCWSTR folder; + LPCWSTR table; +}; static void free_transforms( MSIDATABASE *db ) { @@ -763,6 +770,8 @@ lstrcatW( path, file ); data = msi_read_text_archive( path, &len ); + if (data == NULL) + return ERROR_BAD_PATHNAME; ptr = data; msi_parse_line( &ptr, &columns, &num_columns, &len ); @@ -901,50 +910,131 @@ return r; } -static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) -{ - UINT i, count, len, r = ERROR_SUCCESS; +static UINT msi_export_field( HANDLE handle, MSIRECORD *row, UINT field ) +{ + char *buffer; + BOOL bret; + DWORD sz; + UINT r; + + sz = 0x100; + buffer = msi_alloc( sz ); + if (!buffer) + return ERROR_OUTOFMEMORY; + + r = MSI_RecordGetStringA( row, field, buffer, &sz ); + if (r == ERROR_MORE_DATA) + { + char *p; + + sz++; /* leave room for NULL terminator */ + p = msi_realloc( buffer, sz ); + if (!p) + { + msi_free( buffer ); + return ERROR_OUTOFMEMORY; + } + buffer = p; + + r = MSI_RecordGetStringA( row, field, buffer, &sz ); + if (r != ERROR_SUCCESS) + { + msi_free( buffer ); + return r; + } + } + else if (r != ERROR_SUCCESS) + return r; + + bret = WriteFile( handle, buffer, sz, &sz, NULL ); + msi_free( buffer ); + if (!bret) + return ERROR_FUNCTION_FAILED; + + return r; +} + +static UINT msi_export_stream( LPCWSTR folder, LPCWSTR table, MSIRECORD *row, UINT field, + UINT start ) +{ + static const WCHAR fmt_file[] = { '%','s','/','%','s','/','%','s',0 }; + static const WCHAR fmt_folder[] = { '%','s','/','%','s',0 }; + WCHAR stream_name[256], stream_filename[MAX_PATH]; + DWORD sz, read_size, write_size; + char buffer[1024]; + HANDLE file; + UINT r; + + /* get the name of the file */ + sz = sizeof(stream_name)/sizeof(WCHAR); + r = MSI_RecordGetStringW( row, start, stream_name, &sz ); + if (r != ERROR_SUCCESS) + return r; + + /* if the destination folder does not exist then create it (folder name = table name) */ + snprintfW( stream_filename, sizeof(stream_filename), fmt_folder, folder, table ); + if (GetFileAttributesW( stream_filename ) == INVALID_FILE_ATTRIBUTES) + { + if (!CreateDirectoryW( stream_filename, NULL )) + return ERROR_PATH_NOT_FOUND; + } + + /* actually create the file */ + snprintfW( stream_filename, sizeof(stream_filename), fmt_file, folder, table, stream_name ); + file = CreateFileW( stream_filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) + return ERROR_FILE_NOT_FOUND; + + /* copy the stream to the file */ + read_size = sizeof(buffer); + while (read_size == sizeof(buffer)) + { + r = MSI_RecordReadStream( row, field, buffer, &read_size ); + if (r != ERROR_SUCCESS) + { + CloseHandle( file ); + return r; + } + if (!WriteFile( file, buffer, read_size, &write_size, NULL ) || read_size != write_size) + { + CloseHandle( file ); + return ERROR_WRITE_FAULT; + } + } + CloseHandle( file ); + return r; +} + +static UINT msi_export_record( struct row_export_info *row_export_info, MSIRECORD *row, UINT start ) +{ + HANDLE handle = row_export_info->handle; + UINT i, count, r = ERROR_SUCCESS; const char *sep; - char *buffer; DWORD sz; - len = 0x100; - buffer = msi_alloc( len ); - if ( !buffer ) - return ERROR_OUTOFMEMORY; - count = MSI_RecordGetFieldCount( row ); - for ( i=start; i<=count; i++ ) - { - sz = len; - r = MSI_RecordGetStringA( row, i, buffer, &sz ); - if (r == ERROR_MORE_DATA) - { - char *p = msi_realloc( buffer, sz + 1 ); - if (!p) - break; - len = sz + 1; - buffer = p; - } - sz = len; - r = MSI_RecordGetStringA( row, i, buffer, &sz ); - if (r != ERROR_SUCCESS) - break; - - if (!WriteFile( handle, buffer, sz, &sz, NULL )) - { - r = ERROR_FUNCTION_FAILED; - break; - } + for (i = start; i <= count; i++) + { + r = msi_export_field( handle, row, i ); + if (r == ERROR_INVALID_PARAMETER) + { + r = msi_export_stream( row_export_info->folder, row_export_info->table, row, i, start ); + if (r != ERROR_SUCCESS) + return r; + + /* exporting a binary stream, repeat the "Name" field */ + r = msi_export_field( handle, row, start ); + if (r != ERROR_SUCCESS) + return r; + } + else if (r != ERROR_SUCCESS) + return r; sep = (i < count) ? "\t" : "\r\n"; if (!WriteFile( handle, sep, strlen(sep), &sz, NULL )) - { - r = ERROR_FUNCTION_FAILED; - break; - } - } - msi_free( buffer ); + return ERROR_FUNCTION_FAILED; + } return r; } @@ -968,9 +1058,25 @@ return ERROR_SUCCESS; } +static UINT msi_export_summaryinformation( MSIDATABASE *db, HANDLE handle ) +{ + static const char header[] = "PropertyId\tValue\r\n" + "i2\tl255\r\n" + "_SummaryInformation\tPropertyId\r\n"; + DWORD sz; + + sz = lstrlenA(header); + if (!WriteFile(handle, header, sz, &sz, NULL)) + return ERROR_WRITE_FAULT; + + return msi_export_suminfo( db, handle ); +} + static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, LPCWSTR file ) { + static const WCHAR summaryinformation[] = { + '_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0 }; static const WCHAR query[] = { 's','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','%','s',0 }; static const WCHAR forcecodepage[] = { @@ -1009,14 +1115,22 @@ goto done; } + if (!strcmpW( table, summaryinformation )) + { + r = msi_export_summaryinformation( db, handle ); + goto done; + } + r = MSI_OpenQuery( db, &view, query, table ); if (r == ERROR_SUCCESS) { + struct row_export_info row_export_info = { handle, folder, table }; + /* write out row 1, the column names */ r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1024,7 +1138,7 @@ r = MSI_ViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1033,12 +1147,12 @@ if (r == ERROR_SUCCESS) { MSI_RecordSetStringW( rec, 0, table ); - msi_export_record( handle, rec, 0 ); + msi_export_record( &row_export_info, rec, 0 ); msiobj_release( &rec->hdr ); } /* write out row 4 onwards, the data */ - r = MSI_IterateRecords( view, 0, msi_export_row, handle ); + r = MSI_IterateRecords( view, 0, msi_export_row, &row_export_info ); msiobj_release( &view->hdr ); } Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -2672,7 +2672,7 @@ /* create the treeview control */ style = TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT; - style |= WS_GROUP | WS_VSCROLL; + style |= WS_GROUP | WS_VSCROLL | WS_TABSTOP; control = msi_dialog_add_control( dialog, rec, WC_TREEVIEWW, style ); if (!control) { @@ -3645,8 +3645,11 @@ if (!dialog->default_font) { dialog->default_font = strdupW(dfv); - msiobj_release( &rec->hdr ); - if (!dialog->default_font) return -1; + if (!dialog->default_font) + { + msiobj_release( &rec->hdr ); + return -1; + } } title = msi_get_deformatted_field( dialog->package, rec, 7 ); Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=69… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -4292,6 +4292,17 @@ } /*********************************************************************** + * MsiJoinTransaction [MSI.@] + */ +UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event ) +{ + FIXME("%u %08x %p\n", handle, attrs, event); + + *event = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiEndTransaction [MSI.@] */ UINT WINAPI MsiEndTransaction( DWORD state ) Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -280,7 +280,7 @@ 284 stdcall MsiBeginTransactionA(str long ptr ptr) 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) -287 stub MsiJoinTransaction +287 stdcall MsiJoinTransaction(long long ptr) 288 stub MsiSetOfflineContextW 289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) 290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -968,6 +968,7 @@ extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; +extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN; extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN; extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -335,7 +335,7 @@ if ((type & MSI_DATASIZEMASK) == 2) MSI_RecordSetInteger(*rec, i, ival - (1<<15)); else - MSI_RecordSetInteger(*rec, i, ival - (1<<31)); + MSI_RecordSetInteger(*rec, i, ival - (1u<<31)); } } Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -2100,6 +2100,8 @@ MSIRECORD *row; UINT rc = ERROR_FUNCTION_FAILED; + TRACE("%p %s %p %p\n", db, debugstr_w(szName), szValueBuf, pchValueBuf); + row = msi_get_property_row( db, szName ); if (*pchValueBuf > 0) Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -157,6 +157,10 @@ 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; +static const WCHAR szInstaller_Components[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', + 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; + static const WCHAR szUserFeatures[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','F','e','a','t','u','r','e','s','\\',0}; @@ -466,7 +470,7 @@ strcpyW(keypath, szUninstall); strcatW(keypath, product); } - return SHDeleteKeyW(HKEY_LOCAL_MACHINE, keypath); + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) @@ -517,7 +521,7 @@ strcpyW(keypath, szUserProducts); strcatW(keypath, squished_pc); - return SHDeleteKeyW(HKEY_CURRENT_USER, keypath); + return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) @@ -582,7 +586,7 @@ strcpyW(keypath, szUserFeatures); strcatW(keypath, squished_pc); - return SHDeleteKeyW(HKEY_CURRENT_USER, keypath); + return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } static UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) @@ -634,6 +638,7 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squished_cc[GUID_SIZE], keypath[0x200]; + UINT ret; if (!squash_guid(szComponent, squished_cc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szComponent), debugstr_w(squished_cc)); @@ -642,7 +647,12 @@ strcatW(keypath, squished_cc); if (create) return RegCreateKeyW(HKEY_CURRENT_USER, keypath, key); - return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); + ret = RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); + if (ret != ERROR_FILE_NOT_FOUND) return ret; + + strcpyW(keypath, szInstaller_Components); + strcatW(keypath, squished_cc); + return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) @@ -696,7 +706,7 @@ sprintfW(keypath, szUserDataComponents_fmt, szUserSid); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, comp); + r = RegDeleteTreeW(hkey, comp); RegCloseKey(hkey); return r; } @@ -777,7 +787,7 @@ LocalFree(usersid); } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_patch); + r = RegDeleteTreeW(hkey, squished_patch); RegCloseKey(hkey); return r; } @@ -854,7 +864,7 @@ LocalFree(usersid); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_pc); + r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; } @@ -870,7 +880,7 @@ TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Products, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_pc); + r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; } @@ -927,7 +937,7 @@ strcpyW(keypath, szInstaller_UserUpgradeCodes); strcatW(keypath, squished_pc); - return SHDeleteKeyW(HKEY_CURRENT_USER, keypath); + return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) @@ -941,7 +951,7 @@ TRACE("%s squished %s\n", debugstr_w(szProductCode), debugstr_w(squished_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_pc); + r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; } @@ -957,7 +967,7 @@ TRACE("%s squished %s\n", debugstr_w(szProductCode), debugstr_w(squished_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesFeatures, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_pc); + r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; } @@ -988,7 +998,7 @@ TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; - r = SHDeleteKeyW(hkey, squished_pc); + r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; } Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -194,7 +194,28 @@ static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) { - FIXME("(%p %d): stub!\n", view, row); + MSIDATABASE *db = ((MSISTREAMSVIEW *)view)->db; + UINT i, num_rows = db->num_streams - 1; + const WCHAR *name; + WCHAR *encname; + HRESULT hr; + + TRACE("(%p %d)!\n", view, row); + + name = msi_string_lookup( db->strings, db->streams[row].str_index, NULL ); + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + hr = IStorage_DestroyElement( db->storage, encname ); + msi_free( encname ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + hr = IStream_Release( db->streams[row].stream ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + + for (i = row; i < num_rows; i++) + db->streams[i] = db->streams[i + 1]; + db->num_streams = num_rows; + return ERROR_SUCCESS; } @@ -291,6 +312,10 @@ case MSIMODIFY_UPDATE: r = streams_modify_update(view, rec); + break; + + case MSIMODIFY_DELETE: + r = STREAMS_delete_row(view, row - 1); break; case MSIMODIFY_VALIDATE_NEW: @@ -298,7 +323,6 @@ case MSIMODIFY_REFRESH: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: - case MSIMODIFY_DELETE: case MSIMODIFY_VALIDATE: case MSIMODIFY_VALIDATE_FIELD: case MSIMODIFY_VALIDATE_DELETE: Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -20,6 +20,7 @@ #include "msipriv.h" +#include <stdio.h> #include <propvarutil.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -999,6 +1000,117 @@ return r; } +static UINT save_prop( MSISUMMARYINFO *si, HANDLE handle, UINT row ) +{ + static const char fmt_systemtime[] = "%d/%02d/%02d %02d:%02d:%02d"; + char data[20]; /* largest string: YYYY/MM/DD hh:mm:ss */ + static const char fmt_begin[] = "%u\t"; + static const char data_end[] = "\r\n"; + static const char fmt_int[] = "%u"; + UINT r, data_type, len; + SYSTEMTIME system_time; + FILETIME file_time; + INT int_value; + awstring str; + DWORD sz; + + str.unicode = FALSE; + str.str.a = NULL; + len = 0; + r = get_prop( si, row, &data_type, &int_value, &file_time, &str, &len ); + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) + return r; + if (data_type == VT_EMPTY) + return ERROR_SUCCESS; /* property not set */ + snprintf( data, sizeof(data), fmt_begin, row ); + sz = lstrlenA( data ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + + switch (data_type) + { + case VT_I2: + case VT_I4: + snprintf( data, sizeof(data), fmt_int, int_value ); + sz = lstrlenA( data ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + break; + case VT_LPSTR: + len++; + if (!(str.str.a = msi_alloc( len ))) + return ERROR_OUTOFMEMORY; + r = get_prop( si, row, NULL, NULL, NULL, &str, &len ); + if (r != ERROR_SUCCESS) + { + msi_free( str.str.a ); + return r; + } + sz = lstrlenA( str.str.a ); + if (!WriteFile( handle, str.str.a, sz, &sz, NULL )) + { + msi_free( str.str.a ); + return ERROR_WRITE_FAULT; + } + msi_free( str.str.a ); + break; + case VT_FILETIME: + if (!FileTimeToSystemTime( &file_time, &system_time )) + return ERROR_FUNCTION_FAILED; + snprintf( data, sizeof(data), fmt_systemtime, system_time.wYear, system_time.wMonth, + system_time.wDay, system_time.wHour, system_time.wMinute, + system_time.wSecond ); + sz = lstrlenA( data ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + break; + case VT_EMPTY: + /* cannot reach here, property not set */ + break; + default: + FIXME( "Unknown property variant type\n" ); + return ERROR_FUNCTION_FAILED; + } + + sz = lstrlenA( data_end ); + if (!WriteFile( handle, data_end, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + + return ERROR_SUCCESS; +} + +UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) +{ + UINT i, r, num_rows; + MSISUMMARYINFO *si; + + r = msi_get_suminfo( db->storage, 0, &si ); + if (r != ERROR_SUCCESS) + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + return r; + + num_rows = get_property_count( si->property ); + if (!num_rows) + { + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + + for (i = 0; i < num_rows; i++) + { + r = save_prop( si, handle, i ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &si->hdr ); + return r; + } + } + + msiobj_release( &si->hdr ); + return ERROR_SUCCESS; +} + UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) { MSISUMMARYINFO *si; Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -792,7 +792,7 @@ /* add each column to the _Columns table */ r = TABLE_CreateView( db, szColumns, &tv ); if( r ) - return r; + goto err; r = tv->ops->execute( tv, 0 ); TRACE("tv execute returned %x\n", r); @@ -2308,8 +2308,7 @@ } static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, - IStorage *stg, - const BYTE *rawdata, UINT bytes_per_strref ) + IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; USHORT mask; @@ -2342,12 +2341,14 @@ r = msi_record_encoded_stream_name( tv, rec, &encname ); if ( r != ERROR_SUCCESS ) + { + msiobj_release( &rec->hdr ); return NULL; - - r = IStorage_OpenStream( stg, encname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + } + r = IStorage_OpenStream( stg, encname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if ( r != ERROR_SUCCESS ) { + msiobj_release( &rec->hdr ); msi_free( encname ); return NULL; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 16:44:38 2015 @@ -115,7 +115,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.47 -reactos/dll/win32/msi # Synced to WineStaging-1.7.47 +reactos/dll/win32/msi # Synced to WineStaging-1.7.55 reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.47 reactos/dll/win32/msimtf # Synced to WineStaging-1.7.47 reactos/dll/win32/msisip # Synced to WineStaging-1.7.47

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015