Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 64343: [NTOS:IO] - Correctly set DRIVER_EXTENSION::ServiceKeyName CORE-8566 #resolve
by tfaber＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: tfaber Date: Sat Sep 27 14:58:40 2014 New Revision: 64343 URL: http://svn.reactos.org/svn/reactos?rev=64343&view=rev Log: [NTOS:IO] - Correctly set DRIVER_EXTENSION::ServiceKeyName CORE-8566 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Sep 27 14:58:40 2014 @@ -1058,6 +1058,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING ServiceName, PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Sep 27 14:58:40 2014 @@ -90,14 +90,12 @@ ExFreePool(DriverObject->DriverName.Buffer); } -#if 0 /* See a bit of hack in IopCreateDriver */ /* Check if it has a service key name */ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } -#endif } NTSTATUS FASTCALL @@ -516,6 +514,7 @@ DriverName.Length > 0 ? &DriverName : NULL, DriverEntry, &RegistryKey, + ServiceName, ModuleObject, &Driver); RtlFreeUnicodeString(&RegistryKey); @@ -558,7 +557,7 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; NTSTATUS Status; - + /* No filter value present */ if (ValueType == REG_NONE) return STATUS_SUCCESS; @@ -594,7 +593,7 @@ /* Remove extra reference */ ObDereferenceObject(DriverObject); - + if (!NT_SUCCESS(Status)) return Status; } @@ -663,7 +662,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load device %s filters: %08X\n", + DPRINT1("Failed to load device %s filters: %08X\n", Lower ? "lower" : "upper", Status); ZwClose(SubKey); ZwClose(EnumRootKey); @@ -737,10 +736,10 @@ /* Clean up */ ZwClose(SubKey); ZwClose(EnumRootKey); - + if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load class %s filters: %08X\n", + DPRINT1("Failed to load class %s filters: %08X\n", Lower ? "lower" : "upper", Status); ZwClose(SubKey); ZwClose(EnumRootKey); @@ -1479,6 +1478,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING ServiceName, PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject) { @@ -1550,9 +1550,9 @@ } /* Set up the service key name buffer */ - ServiceKeyName.Buffer = ExAllocatePoolWithTag(PagedPool, - LocalDriverName.Length + - sizeof(WCHAR), + ServiceKeyName.MaximumLength = ServiceName->Length + sizeof(UNICODE_NULL); + ServiceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + ServiceKeyName.MaximumLength, TAG_IO); if (!ServiceKeyName.Buffer) { @@ -1562,21 +1562,26 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* Fill out the key data and copy the buffer */ - ServiceKeyName.Length = LocalDriverName.Length; - ServiceKeyName.MaximumLength = LocalDriverName.MaximumLength; - RtlCopyMemory(ServiceKeyName.Buffer, - LocalDriverName.Buffer, - LocalDriverName.Length); - - /* Null-terminate it and set it */ - ServiceKeyName.Buffer[ServiceKeyName.Length / sizeof(WCHAR)] = UNICODE_NULL; + /* Copy the name and set it in the driver extension */ + RtlCopyUnicodeString(&ServiceKeyName, + ServiceName); DriverObject->DriverExtension->ServiceKeyName = ServiceKeyName; - /* Also store it in the Driver Object. This is a bit of a hack. */ - RtlCopyMemory(&DriverObject->DriverName, - &ServiceKeyName, - sizeof(UNICODE_STRING)); + /* Make a copy of the driver name to store in the driver object */ + DriverObject->DriverName.MaximumLength = LocalDriverName.Length; + DriverObject->DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, + DriverObject->DriverName.MaximumLength, + TAG_IO); + if (!DriverObject->DriverName.Buffer) + { + /* Fail */ + ObMakeTemporaryObject(DriverObject); + ObDereferenceObject(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyUnicodeString(&DriverObject->DriverName, + &LocalDriverName); /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, @@ -1678,7 +1683,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, NULL, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, DriverName, NULL, &DriverObject); } /*

1 0

[tfaber] 64342: [KMTESTS:IO] - Test more fields of DRIVER_OBJECT CORE-8566
by tfaber＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: tfaber Date: Sat Sep 27 14:56:22 2014 New Revision: 64342 URL: http://svn.reactos.org/svn/reactos?rev=64342&view=rev Log: [KMTESTS:IO] - Test more fields of DRIVER_OBJECT CORE-8566 Modified: trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c Modified: trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoDeviceO… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c [iso-8859-1] Sat Sep 27 14:56:22 2014 @@ -11,15 +11,17 @@ //#define NDEBUG #include <debug.h> +#define BASE_POOL_TYPE_MASK 1 + typedef enum { - DriverEntry, - DriverIrp, - DriverUnload + DriverStatusEntry, + DriverStatusIrp, + DriverStatusUnload } DRIVER_STATUS; static DRIVER_DISPATCH TestDispatch; -static VOID TestDriverObject(IN PDRIVER_OBJECT DriverObject, IN DRIVER_STATUS DriverStatus); +static VOID TestDriverObject(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath OPTIONAL, IN DRIVER_STATUS DriverStatus); static BOOLEAN TestZwLoad(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING DriverRegistryPath, IN PWCHAR NewDriverRegPath); static BOOLEAN TestZwUnload(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING DriverRegistryPath, IN PWCHAR NewDriverRegPath); static VOID TestLowerDeviceKernelAPI(IN PDEVICE_OBJECT DeviceObject); @@ -52,7 +54,7 @@ ThisDriverObject = DriverObject; - TestDriverObject(DriverObject, DriverEntry); + TestDriverObject(DriverObject, RegistryPath, DriverStatusEntry); /* Create and delete device, on return MainDeviceObject has been created */ TestDeviceCreateDelete(DriverObject); @@ -99,7 +101,7 @@ } TestDeviceDeletion(MainDeviceObject, FALSE, FALSE); - TestDriverObject(DriverObject, DriverUnload); + TestDriverObject(DriverObject, NULL, DriverStatusUnload); if (MainDeviceObject) IoDeleteDevice(MainDeviceObject); @@ -131,7 +133,7 @@ return Status; } - TestDriverObject(DeviceObject->DriverObject, DriverIrp); + TestDriverObject(DeviceObject->DriverObject, NULL, DriverStatusIrp); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -141,35 +143,85 @@ return Status; } +extern DRIVER_INITIALIZE DriverEntry; + static VOID TestDriverObject( IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath OPTIONAL, IN DRIVER_STATUS DriverStatus) { BOOLEAN CheckThisDispatchRoutine; PVOID FirstMajorFunc; int i; + UNICODE_STRING HardwareDatabase = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); + UNICODE_STRING RegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Services\\Kmtest-IoDeviceObject"); + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\Kmtest-IoDeviceObject"); + UNICODE_STRING ServiceKeyName = RTL_CONSTANT_STRING(L"Kmtest-IoDeviceObject"); + BOOLEAN Equal; ok(DriverObject->Size == sizeof(DRIVER_OBJECT), "Size does not match, got %x\n",DriverObject->Size); ok(DriverObject->Type == 4, "Type does not match 4. got %d\n", DriverObject->Type); - if (DriverStatus == DriverEntry) + if (DriverStatus == DriverStatusEntry) { ok(DriverObject->DeviceObject == NULL, "Expected DeviceObject pointer to be 0, got %p\n", DriverObject->DeviceObject); ok (DriverObject->Flags == DRVO_LEGACY_DRIVER, "Expected Flags to be DRVO_LEGACY_DRIVER, got %lu\n", DriverObject->Flags); - } - else if (DriverStatus == DriverIrp) + + ok(DriverObject->DriverStart < (PVOID)TestEntry, + "DriverStart is %p, expected < %p\n", + DriverObject->DriverStart, (PVOID)TestEntry); + ok(DriverObject->DriverSize > 0x2000, + "DriverSize 0x%lx\n", DriverObject->DriverSize); + ok_eq_pointer(DriverObject->DriverExtension, (PDRIVER_EXTENSION)(DriverObject + 1)); + ok_eq_pointer(DriverObject->DriverExtension->DriverObject, DriverObject); + ok_eq_pointer(DriverObject->DriverExtension->AddDevice, NULL); + ok_eq_ulong(DriverObject->DriverExtension->Count, 0UL); + Equal = RtlEqualUnicodeString(RegistryPath, + &RegPath, + FALSE); + ok(Equal, "RegistryPath is '%wZ'\n", RegistryPath); + ok((ULONG_PTR)RegistryPath % PAGE_SIZE == 0, "RegistryPath %p not page-aligned\n", RegistryPath); + ok_eq_pointer(RegistryPath->Buffer, (PWCHAR)(RegistryPath + 1)); + ok_eq_uint(RegistryPath->MaximumLength, RegistryPath->Length); + Equal = RtlEqualUnicodeString(&DriverObject->DriverExtension->ServiceKeyName, + &ServiceKeyName, + FALSE); + ok(Equal, "ServiceKeyName is '%wZ'\n", &DriverObject->DriverExtension->ServiceKeyName); + ok_eq_tag(KmtGetPoolTag(DriverObject->DriverExtension->ServiceKeyName.Buffer), ' oI'); + ok_eq_uint((KmtGetPoolType(DriverObject->DriverExtension->ServiceKeyName.Buffer) - 1) & BASE_POOL_TYPE_MASK, NonPagedPool); + ok_eq_uint(DriverObject->DriverExtension->ServiceKeyName.MaximumLength, DriverObject->DriverExtension->ServiceKeyName.Length + sizeof(UNICODE_NULL)); + ok_eq_uint(DriverObject->DriverExtension->ServiceKeyName.Buffer[DriverObject->DriverExtension->ServiceKeyName.Length / sizeof(WCHAR)], UNICODE_NULL); + Equal = RtlEqualUnicodeString(&DriverObject->DriverName, + &DriverName, + FALSE); + ok(Equal, "DriverName is '%wZ'\n", &DriverObject->DriverName); + ok_eq_tag(KmtGetPoolTag(DriverObject->DriverName.Buffer), ' oI'); + ok_eq_uint((KmtGetPoolType(DriverObject->DriverName.Buffer) - 1) & BASE_POOL_TYPE_MASK, PagedPool); + ok_eq_uint(DriverObject->DriverName.MaximumLength, DriverObject->DriverName.Length); + // TODO: show that both string and buffer are constants inside ntos + Equal = RtlEqualUnicodeString(DriverObject->HardwareDatabase, + &HardwareDatabase, + FALSE); + ok(Equal, "HardwareDatabase is '%wZ'\n", DriverObject->HardwareDatabase); + ok_eq_uint(DriverObject->HardwareDatabase->MaximumLength, DriverObject->HardwareDatabase->Length + sizeof(UNICODE_NULL)); + ok_eq_uint(DriverObject->HardwareDatabase->Buffer[DriverObject->HardwareDatabase->Length / sizeof(WCHAR)], UNICODE_NULL); + ok(DriverObject->DriverInit == DriverEntry, + "DriverInit is %p, expected %p\n", + (PVOID)DriverObject->DriverInit, (PVOID)DriverEntry); + } + else if (DriverStatus == DriverStatusIrp) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null\n"); ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED), "Expected Flags to be DRVO_LEGACY_DRIVER | DRVO_INITIALIZED, got %lu\n", DriverObject->Flags); } - else if (DriverStatus == DriverUnload) + else if (DriverStatus == DriverStatusUnload) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null\n"); ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED | DRVO_UNLOAD_INVOKED),

1 0

[akhaldi] 64341: [GDIPLUS_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 12:59:19 2014 New Revision: 64341 URL: http://svn.reactos.org/svn/reactos?rev=64341&view=rev Log: [GDIPLUS_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/image.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 27 12:59:19 2014 @@ -39,11 +39,8 @@ static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; -static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; -static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void set_rect_empty(RectF *rc) { @@ -809,17 +806,23 @@ lf.lfWeight = 0; lf.lfCharSet = 0; lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); /* empty FaceName */ lf.lfFaceName[0] = 0; + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); GdipDeleteGraphics(graphics); DeleteDC(hdc); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sat Sep 27 12:59:19 2014 @@ -98,7 +98,7 @@ return pixels_to_units(pixels, to, dpi); } -static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale) +static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale, GpImage **image) { GpStatus status; union @@ -123,11 +123,8 @@ status = GdipGetImageGraphicsContext(u.image, &graphics); expect(Ok, status); - /* image is intentionally leaked to make sure that there is no - side effects after its destruction. - status = GdipDisposeImage(u.image); - expect(Ok, status); - */ + + *image = u.image; status = GdipGetDpiX(graphics, &res); expect(Ok, status); @@ -3527,7 +3524,9 @@ for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + GpImage *image; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3578,6 +3577,9 @@ status = GdipDeleteGraphics(graphics); expect(Ok, status); + + status = GdipDisposeImage(image); + expect(Ok, status); } GdipDeleteFont(font); @@ -3601,8 +3603,9 @@ for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { REAL unit_scale; - - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + GpImage *image; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3671,6 +3674,9 @@ expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); + expect(Ok, status); + + status = GdipDisposeImage(image); expect(Ok, status); } @@ -3709,12 +3715,13 @@ }; GpStatus status; GpGraphics *graphics; + GpImage *image; GpPointF ptf[2]; UINT i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale); + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale, &image); ptf[0].X = td[i].in[0].X; ptf[0].Y = td[i].in[0].Y; ptf[1].X = td[i].in[1].X; @@ -3732,6 +3739,8 @@ expectf(td[i].in[1].X, ptf[1].X); expectf(td[i].in[1].Y, ptf[1].Y); status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage(image); expect(Ok, status); } } 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] Sat Sep 27 12:59:19 2014 @@ -381,24 +381,48 @@ static void test_LoadingImages(void) { GpStatus stat; + GpBitmap *bm; + GpImage *img; + static const WCHAR nonexistentW[] = {'n','o','n','e','x','i','s','t','e','n','t',0}; stat = GdipCreateBitmapFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); - expect(InvalidParameter, stat); + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(0, &bm); + expect(InvalidParameter, stat); + ok(bm == (GpBitmap *)0xdeadbeef, "returned %p\n", bm); + + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(nonexistentW, &bm); + todo_wine expect(InvalidParameter, stat); + ok(!bm, "returned %p\n", bm); stat = GdipLoadImageFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); - expect(InvalidParameter, stat); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(0, &img); + expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); stat = GdipLoadImageFromFileICM(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); - expect(InvalidParameter, stat); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(0, &img); + expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); } static void test_SavingImages(void)

1 0

[akhaldi] 64340: [GDIPLUS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 12:59:00 2014 New Revision: 64340 URL: http://svn.reactos.org/svn/reactos?rev=64340&view=rev Log: [GDIPLUS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sat Sep 27 12:59:00 2014 @@ -1506,7 +1506,7 @@ if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) { - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; } @@ -1634,7 +1634,7 @@ if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) { free_installed_fonts(); - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; } Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Sep 27 12:59:00 2014 @@ -589,30 +589,47 @@ } } -static ARGB transform_color(ARGB color, const ColorMatrix *matrix) -{ - REAL val[5], res[4]; +static BOOL round_color_matrix(const ColorMatrix *matrix, int values[5][5]) +{ + /* Convert floating point color matrix to int[5][5], return TRUE if it's an identity */ + BOOL identity = TRUE; + int i, j; + + for (i=0; i<4; i++) + for (j=0; j<5; j++) + { + if (matrix->m[j][i] != (i == j ? 1.0 : 0.0)) + identity = FALSE; + values[j][i] = gdip_round(matrix->m[j][i] * 256.0); + } + + return identity; +} + +static ARGB transform_color(ARGB color, int matrix[5][5]) +{ + int val[5], res[4]; int i, j; unsigned char a, r, g, b; - val[0] = ((color >> 16) & 0xff) / 255.0; /* red */ - val[1] = ((color >> 8) & 0xff) / 255.0; /* green */ - val[2] = (color & 0xff) / 255.0; /* blue */ - val[3] = ((color >> 24) & 0xff) / 255.0; /* alpha */ - val[4] = 1.0; /* translation */ + val[0] = ((color >> 16) & 0xff); /* red */ + val[1] = ((color >> 8) & 0xff); /* green */ + val[2] = (color & 0xff); /* blue */ + val[3] = ((color >> 24) & 0xff); /* alpha */ + val[4] = 255; /* translation */ for (i=0; i<4; i++) { - res[i] = 0.0; + res[i] = 0; for (j=0; j<5; j++) - res[i] += matrix->m[j][i] * val[j]; - } - - a = min(max(floorf(res[3]*255.0), 0.0), 255.0); - r = min(max(floorf(res[0]*255.0), 0.0), 255.0); - g = min(max(floorf(res[1]*255.0), 0.0), 255.0); - b = min(max(floorf(res[2]*255.0), 0.0), 255.0); + res[i] += matrix[j][i] * val[j]; + } + + a = min(max(res[3] / 256, 0), 255); + r = min(max(res[0] / 256, 0), 255); + g = min(max(res[1] / 256, 0), 255); + b = min(max(res[2] / 256, 0), 255); return (a << 24) | (r << 16) | (g << 8) | b; } @@ -699,28 +716,41 @@ attributes->colormatrices[ColorAdjustTypeDefault].enabled) { const struct color_matrix *colormatrices; + int color_matrix[5][5]; + int gray_matrix[5][5]; + BOOL identity; if (attributes->colormatrices[type].enabled) colormatrices = &attributes->colormatrices[type]; else colormatrices = &attributes->colormatrices[ColorAdjustTypeDefault]; - for (x=0; x<width; x++) - for (y=0; y<height; y++) + identity = round_color_matrix(&colormatrices->colormatrix, color_matrix); + + if (colormatrices->flags == ColorMatrixFlagsAltGray) + identity = (round_color_matrix(&colormatrices->graymatrix, gray_matrix) && identity); + + if (!identity) + { + for (x=0; x<width; x++) { - ARGB *src_color; - src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); - - if (colormatrices->flags == ColorMatrixFlagsDefault || - !color_is_gray(*src_color)) + for (y=0; y<height; y++) { - *src_color = transform_color(*src_color, &colormatrices->colormatrix); - } - else if (colormatrices->flags == ColorMatrixFlagsAltGray) - { - *src_color = transform_color(*src_color, &colormatrices->graymatrix); + ARGB *src_color; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + if (colormatrices->flags == ColorMatrixFlagsDefault || + !color_is_gray(*src_color)) + { + *src_color = transform_color(*src_color, color_matrix); + } + else if (colormatrices->flags == ColorMatrixFlagsAltGray) + { + *src_color = transform_color(*src_color, gray_matrix); + } } } + } } if (attributes->gamma_enabled[type] || @@ -1989,6 +2019,24 @@ rect->Y = 0; rect->Width = GetDeviceCaps(graphics->hdc, HORZRES); rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); + } + + if (graphics->hdc && + (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + { + POINT points[2]; + + points[0].x = rect->X; + points[0].y = rect->Y; + points[1].x = rect->X + rect->Width; + points[1].y = rect->Y + rect->Height; + + DPtoLP(graphics->hdc, points, sizeof(points)/sizeof(points[0])); + + rect->X = min(points[0].x, points[1].x); + rect->Y = min(points[0].y, points[1].y); + rect->Width = abs(points[1].x - points[0].x); + rect->Height = abs(points[1].y - points[0].y); } return stat; @@ -2835,6 +2883,7 @@ else if (image->type == ImageTypeBitmap) { GpBitmap* bitmap = (GpBitmap*)image; + BOOL do_resampling = FALSE; BOOL use_software = FALSE; TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", @@ -2843,12 +2892,14 @@ graphics->scale, image->xres, image->yres, bitmap->format, imageAttributes ? imageAttributes->outside_color : 0); - if (imageAttributes || graphics->alpha_hdc || - (graphics->image && graphics->image->type == ImageTypeBitmap) || - ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || + if (ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || srcx < 0 || srcy < 0 || srcx + srcwidth > bitmap->width || srcy + srcheight > bitmap->height) + do_resampling = TRUE; + + if (imageAttributes || graphics->alpha_hdc || do_resampling || + (graphics->image && graphics->image->type == ImageTypeBitmap)) use_software = TRUE; if (use_software) @@ -2859,7 +2910,7 @@ int i, x, y, src_stride, dst_stride; GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; - LPBYTE src_data, dst_data; + LPBYTE src_data, dst_data, dst_dyn_data=NULL; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; PixelOffsetMode offset_mode = graphics->pixeloffset; @@ -2904,22 +2955,25 @@ stat = GdipInvertMatrix(&dst_to_src); if (stat != Ok) return stat; - dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) return OutOfMemory; - - dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); - - get_bitmap_sample_size(interpolation, imageAttributes->wrap, - bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + if (do_resampling) + { + get_bitmap_sample_size(interpolation, imageAttributes->wrap, + bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + } + else + { + /* Make sure src_area is equal in size to dst_area. */ + src_area.X = srcx + dst_area.left - pti[0].x; + src_area.Y = srcy + dst_area.top - pti[0].y; + src_area.Width = dst_area.right - dst_area.left; + src_area.Height = dst_area.bottom - dst_area.top; + } TRACE("src_area: %d x %d\n", src_area.Width, src_area.Height); src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); if (!src_data) - { - GdipFree(dst_data); return OutOfMemory; - } src_stride = sizeof(ARGB) * src_area.Width; /* Read the bits we need from the source bitmap into an ARGB buffer. */ @@ -2938,7 +2992,6 @@ if (stat != Ok) { GdipFree(src_data); - GdipFree(dst_data); return stat; } @@ -2946,40 +2999,57 @@ src_area.Width, src_area.Height, src_stride, ColorAdjustTypeBitmap); - /* Transform the bits as needed to the destination. */ - GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); - - x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; - x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; - y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; - y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; - - for (x=dst_area.left; x<dst_area.right; x++) + if (do_resampling) { - for (y=dst_area.top; y<dst_area.bottom; y++) + /* Transform the bits as needed to the destination. */ + dst_data = dst_dyn_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!dst_data) { - GpPointF src_pointf; - ARGB *dst_color; - - src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; - src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; - - dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - - if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, - imageAttributes, interpolation, offset_mode); - else - *dst_color = 0; + GdipFree(src_data); + return OutOfMemory; + } + + dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + + GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); + + x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; + x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; + y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; + y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; + + for (x=dst_area.left; x<dst_area.right; x++) + { + for (y=dst_area.top; y<dst_area.bottom; y++) + { + GpPointF src_pointf; + ARGB *dst_color; + + src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; + src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; + + dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + + if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); + else + *dst_color = 0; + } } } - - GdipFree(src_data); + else + { + dst_data = src_data; + dst_stride = src_stride; + } stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); - GdipFree(dst_data); + GdipFree(src_data); + + GdipFree(dst_dyn_data); return stat; } Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Sep 27 12:59:00 2014 @@ -1369,6 +1369,8 @@ if(!filename || !bitmap) return InvalidParameter; + + *bitmap = NULL; stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); @@ -2928,6 +2930,8 @@ if (!filename || !image) return InvalidParameter; + *image = NULL; + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); if (stat != Ok) Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] Sat Sep 27 12:59:00 2014 @@ -270,11 +270,10 @@ if(!imageAttr || type >= ColorAdjustTypeCount) return InvalidParameter; - memset(&imageAttr->colorkeys[type], 0, sizeof(imageAttr->colorkeys[type])); memset(&imageAttr->colormatrices[type], 0, sizeof(imageAttr->colormatrices[type])); - memset(&imageAttr->colorremaptables[type], 0, sizeof(imageAttr->colorremaptables[type])); - memset(&imageAttr->gamma_enabled[type], 0, sizeof(imageAttr->gamma_enabled[type])); - memset(&imageAttr->gamma[type], 0, sizeof(imageAttr->gamma[type])); - - return Ok; -} + GdipSetImageAttributesColorKeys(imageAttr, type, FALSE, 0, 0); + GdipSetImageAttributesRemapTable(imageAttr, type, FALSE, 0, NULL); + GdipSetImageAttributesGamma(imageAttr, type, FALSE, 0.0); + + return Ok; +} 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 Sep 27 12:59:00 2014 @@ -75,7 +75,7 @@ reactos/dll/win32/faultrep # Synced to Wine-1.7.17 reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to Wine-1.7.27 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 +reactos/dll/win32/gdiplus # Synced to Wine-1.7.27 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 reactos/dll/win32/hlink # Synced to Wine-1.7.17 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.17

1 0

[akhaldi] 64339: [FUSION] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 12:49:52 2014 New Revision: 64339 URL: http://svn.reactos.org/svn/reactos?rev=64339&view=rev Log: [FUSION] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sat Sep 27 12:49:52 2014 @@ -694,6 +694,8 @@ { HeapFree(GetProcessHeap(), 0, name->displayname); HeapFree(GetProcessHeap(), 0, name->name); + HeapFree(GetProcessHeap(), 0, name->culture); + HeapFree(GetProcessHeap(), 0, name->procarch); } return hr; } 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 Sep 27 12:49:52 2014 @@ -74,7 +74,7 @@ reactos/dll/win32/dwmapi # Synced to Wine-1.7.27 reactos/dll/win32/faultrep # Synced to Wine-1.7.17 reactos/dll/win32/fltlib # Synced to Wine-1.7.27 -reactos/dll/win32/fusion # Synced to Wine-1.7.17 +reactos/dll/win32/fusion # Synced to Wine-1.7.27 reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 reactos/dll/win32/hlink # Synced to Wine-1.7.17

1 0

[tkreuzer] 64338: [WIN32K] Fix _FLOATOBJ_IsLong (0 - lMant == 0 / lExp == 0 - was not evaluated as TRUE)
by tkreuzer＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: tkreuzer Date: Sat Sep 27 12:06:03 2014 New Revision: 64338 URL: http://svn.reactos.org/svn/reactos?rev=64338&view=rev Log: [WIN32K] Fix _FLOATOBJ_IsLong (0 - lMant == 0 / lExp == 0 - was not evaluated as TRUE) Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/floatobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] Sat Sep 27 12:06:03 2014 @@ -33,9 +33,11 @@ _FLOATOBJ_IsLong(FLOATOBJ *pf) { EFLOAT_S *pef = (EFLOAT_S*)pf; - ULONG Shift = 32 - pef->lExp; - if (Shift > 31) return FALSE; - return (((pef->lMant >> Shift) << Shift) == pef->lMant); + ULONG ulShift = pef->lExp; + if (ulShift < 32) + return ((pef->lMant << ulShift) == 0); + else + return (ulShift == 32); } FORCEINLINE

1 0

[akhaldi] 64337: [DWMAPI] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 11:58:01 2014 New Revision: 64337 URL: http://svn.reactos.org/svn/reactos?rev=64337&view=rev Log: [DWMAPI] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Sat Sep 27 11:58:01 2014 @@ -33,6 +33,7 @@ @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stdcall DwmGetWindowAttribute(ptr long ptr long) +@ stdcall DwmInvalidateIconicBitmaps(ptr) @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize Modified: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_ma… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Sat Sep 27 11:58:01 2014 @@ -112,6 +112,18 @@ } /********************************************************************** + * DwmInvalidateIconicBitmaps (DWMAPI.@) + */ +HRESULT WINAPI DwmInvalidateIconicBitmaps(HWND hwnd) +{ + static BOOL once; + + if (!once++) FIXME("(%p) stub\n", hwnd); + + return E_NOTIMPL; +} + +/********************************************************************** * DwmSetWindowAttribute (DWMAPI.@) */ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) 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 Sep 27 11:58:01 2014 @@ -71,7 +71,7 @@ reactos/dll/win32/cryptui # Synced to Wine-1.7.27 reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 reactos/dll/win32/dciman32 # Synced to Wine-1.7.27 -reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.27 reactos/dll/win32/faultrep # Synced to Wine-1.7.17 reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to Wine-1.7.17

1 0

[akhaldi] 64336: [DCIMAN32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 11:46:43 2014 New Revision: 64336 URL: http://svn.reactos.org/svn/reactos?rev=64336&view=rev Log: [DCIMAN32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/dciman32/dciman_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman_… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sat Sep 27 11:46:43 2014 @@ -33,18 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI 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 Sep 27 11:46:43 2014 @@ -70,7 +70,7 @@ reactos/dll/win32/cryptnet # Synced to Wine-1.7.27 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.17 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.27 reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 reactos/dll/win32/faultrep # Synced to Wine-1.7.17 reactos/dll/win32/fltlib # Synced to Wine-1.7.27

1 0

[akhaldi] 64335: [DBGHELP] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 11:45:29 2014 New Revision: 64335 URL: http://svn.reactos.org/svn/reactos?rev=64335&view=rev Log: [DBGHELP] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -391,12 +391,14 @@ } u; }; +#ifdef __REACTOS__ struct symt_idx_to_ptr { struct hash_table_elt hash_elt; DWORD idx; const struct symt *sym; }; +#endif extern const struct wine_rb_functions source_rb_functions DECLSPEC_HIDDEN; struct module Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -381,6 +381,11 @@ if (!strncmp(sc->segname, "WINE_", 5)) { TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); + return 0; + } + if (!strncmp(sc->segname, "__PAGEZERO", 10)) + { + TRACE("Ignoring __PAGEZERO segment\n"); return 0; } @@ -1005,6 +1010,8 @@ struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; + if (!load_addr) + load_addr = fmap.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module) Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -1968,7 +1968,12 @@ case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: + case 0x113e: case 0x1139: + case 0x1141: + case 0x1142: + case 0x1143: + case 0x1144: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; @@ -2219,7 +2224,7 @@ HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); } -static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) { DWORD* pdw; DWORD* ok_bits; @@ -2232,7 +2237,7 @@ count = *pdw++; pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return FALSE; + if (!pdb_file->stream_dict) return; cpstr = (char*)(pdb_file->stream_dict + numok + 1); memcpy(cpstr, str, cb); @@ -2242,7 +2247,7 @@ if (*pdw++ != 0) { FIXME("unexpected value\n"); - return -1; + return; } for (i = j = 0; i < count; i++) @@ -2258,7 +2263,6 @@ /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; pdb_file->fpoext_stream = -1; - return j == numok && i == count; } static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) @@ -2900,8 +2904,8 @@ struct hash_table_elt elt; }; -#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)),FALSE -#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)),FALSE +#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)) +#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)) #if 0 static void pev_dump_stack(struct pevaluator* pev) Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -682,7 +682,7 @@ symt_get_tag_str(type->tag)); /* fall through */ case SymTagFunctionType: - return 0; + return FALSE; } break; 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 Sep 27 11:45:29 2014 @@ -69,7 +69,7 @@ reactos/dll/win32/cryptdll # Synced to Wine-1.7.17 reactos/dll/win32/cryptnet # Synced to Wine-1.7.27 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.17 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 reactos/dll/win32/dciman32 # Synced to Wine-1.7.17 reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 reactos/dll/win32/faultrep # Synced to Wine-1.7.17

1 0

[akhaldi] 64334: [CRYPTUI] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 11:40:10 2014 New Revision: 64334 URL: http://svn.reactos.org/svn/reactos?rev=64334&view=rev Log: [CRYPTUI] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc 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/cryptui/lang/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs