wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Alexandre Julliard : gdi32: Work around a gcc array out of bounds warning.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 592e6aa94234299c7696abce28df762f16054d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592e6aa94234299c7696abce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 14:51:50 2012 +0200 gdi32: Work around a gcc array out of bounds warning. --- dlls/gdi32/palette.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 338d860..afb723b 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -89,18 +89,11 @@ HPALETTE PALETTE_Init(void) palPtr->palVersion = 0x300; palPtr->palNumEntries = 20; - for (i = 0; i < 10; i++) + for (i = 0; i < 20; i++) { - palPtr->palPalEntry[i].peRed = entries[i].rgbRed; - palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen; - palPtr->palPalEntry[i].peBlue = entries[i].rgbBlue; - palPtr->palPalEntry[i].peFlags = 0; - } - for (i = 10; i < 20; i++) - { - palPtr->palPalEntry[i].peRed = entries[236 + i].rgbRed; - palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen; - palPtr->palPalEntry[i].peBlue = entries[236 + i].rgbBlue; + palPtr->palPalEntry[i].peRed = entries[i < 10 ? i : 236 + i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[i < 10 ? i : 236 + i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[i < 10 ? i : 236 + i].rgbBlue; palPtr->palPalEntry[i].peFlags = 0; } return CreatePalette( palPtr );

1 0

Dmitry Timoshkov : windowscodecs: Add a test for invalid predefined palette type.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 9083bcc59c48736641381dd87551c47804be5572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083bcc59c48736641381dd87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:49:03 2012 +0900 windowscodecs: Add a test for invalid predefined palette type. --- dlls/windowscodecs/palette.c | 4 ++-- dlls/windowscodecs/tests/palette.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 62c7907..096258a 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -403,8 +403,8 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, break; default: - FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); - return E_NOTIMPL; + WARN("invalid palette type %u\n", type); + return E_INVALIDARG; } EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 5a8c808..499d59d 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -402,6 +402,16 @@ static void test_predefined_palette(void) &IID_IWICImagingFactory, (void **)&factory); ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeMedianCut, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, 0x0f, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + IWICPalette_Release(palette); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { hr = IWICImagingFactory_CreatePalette(factory, &palette);

1 0

Dmitry Timoshkov : windowscodecs: Add support for adding trasparent color to generated palettes.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 106e7fb5896e1d0d4a67a6f043082ad7b74e3cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106e7fb5896e1d0d4a67a6f04… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:47:57 2012 +0900 windowscodecs: Add support for adding trasparent color to generated palettes. --- dlls/windowscodecs/palette.c | 82 ++++++++++++++++++++---------- dlls/windowscodecs/tests/palette.c | 98 +++++++++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=106e7fb5896e1d0d4a67a…

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone252 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 0be2718baae2c0da05934eaf420a8ea68da60ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be2718baae2c0da05934eaf4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:46:54 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone252 palette. --- dlls/windowscodecs/palette.c | 26 ++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 21b6b36..803a138 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -260,6 +260,27 @@ static WICColor *generate_halftone216_palette(UINT *count) return entries; } +static WICColor *generate_halftone252_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 252; + entries = HeapAlloc(GetProcessHeap(), 0, 252 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 252; i++) + { + static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values_rb[i%6]; + entries[i] |= halftone_values_g[(i/6)%7] << 8; + entries[i] |= halftone_values_rb[(i/42)%6] << 16; + } + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -345,6 +366,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone252: + colors = generate_halftone252_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 53d64d4..ce29b6b 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -283,6 +283,23 @@ static void generate_halftone216_palette(DWORD *entries, UINT count) } } +static void generate_halftone252_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; + UINT i; + + assert(count == 252); + + for (i = 0; i < 252; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values_rb[i%6]; + entries[i] |= halftone_values_g[(i/6)%7] << 8; + entries[i] |= halftone_values_rb[(i/42)%6] << 16; + } +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -320,6 +337,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, { WICBitmapPaletteTypeFixedHalftone216, 0, 0, 224, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone252, 0, 0, 252, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -385,6 +403,8 @@ static void test_predefined_palette(void) generate_halftone125_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone216) generate_halftone216_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone252) + generate_halftone252_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone216 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 87b23de9bb6de093a8161924135b6caa51db29d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b23de9bb6de093a81619241… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:45:53 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone216 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a4124a7..21b6b36 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -232,6 +232,34 @@ static WICColor *generate_halftone125_palette(UINT *count) return entries; } +static WICColor *generate_halftone216_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 224; + entries = HeapAlloc(GetProcessHeap(), 0, 224 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 216; i++) + { + static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%6]; + entries[i] |= halftone_values[(i/6)%6] << 8; + entries[i] |= halftone_values[(i/36)%6] << 16; + } + + for (i = 216; i < 224; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-216]; + } + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -312,6 +340,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone216: + colors = generate_halftone216_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 32dbfc9..53d64d4 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -259,6 +259,30 @@ static void generate_halftone125_palette(DWORD *entries, UINT count) entries[i] = 0xffc0c0c0; } +static void generate_halftone216_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + UINT i; + + assert(count == 224); + + for (i = 0; i < 216; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%6]; + entries[i] |= halftone_values[(i/6)%6] << 8; + entries[i] |= halftone_values[(i/36)%6] << 16; + } + + for (i = 216; i < 224; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-216]; + } +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -295,6 +319,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone216, 0, 0, 224, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -358,6 +383,8 @@ static void test_predefined_palette(void) generate_halftone64_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone125) generate_halftone125_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone216) + generate_halftone216_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 97464c508fec781f2aa4ecfbdc8f88d55008f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97464c508fec781f2aa4ecfbd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:44:54 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 74438f6..a4124a7 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -210,6 +210,28 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; } +static WICColor *generate_halftone125_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 126; + entries = HeapAlloc(GetProcessHeap(), 0, 126 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 125; i++) + { + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -285,6 +307,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone125: + colors = generate_halftone125_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 7c4c3d4..32dbfc9 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -241,6 +241,24 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } } +static void generate_halftone125_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + UINT i; + + assert(count == 126); + + for (i = 0; i < 125; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -276,6 +294,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -337,6 +356,8 @@ static void test_predefined_palette(void) generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone125) + generate_halftone125_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 6a7f97f98f394ef3f42f971266bd4840a5822e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7f97f98f394ef3f42f97126… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:43:45 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 4541c7c..74438f6 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -160,6 +160,28 @@ static WICColor *generate_halftone8_palette(UINT *count) return entries; } +static WICColor *generate_halftone27_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 28; + entries = HeapAlloc(GetProcessHeap(), 0, 28 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 27; i++) + { + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone64_palette(UINT *count) { WICColor *entries; @@ -253,6 +275,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone27: + colors = generate_halftone27_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone64: colors = generate_halftone64_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 8e320c5..7c4c3d4 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -199,6 +199,24 @@ static void generate_halftone8_palette(DWORD *entries, UINT count) } } +static void generate_halftone27_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + UINT i; + + assert(count == 28); + + for (i = 0; i < 27; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone64_palette(DWORD *entries, UINT count) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; @@ -256,6 +274,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; @@ -314,6 +333,8 @@ static void test_predefined_palette(void) generate_gray256_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) generate_halftone8_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone27) + generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256)

1 0

Jacek Caban : widl: Add IDL installation directory to include path.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 80d3055869d5135b18308380b09c424baa514cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d3055869d5135b18308380b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 11:38:23 2012 +0200 widl: Add IDL installation directory to include path. --- tools/widl/Makefile.in | 1 + tools/widl/widl.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index f2bd3f3..88558bb 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y +EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) all: $(PROGRAMS) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 85d66d7..fc3d0d9 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -643,6 +643,10 @@ int main(int argc,char *argv[]) } } +#ifdef DEFAULT_INCLUDE_DIR + wpp_add_include_path(DEFAULT_INCLUDE_DIR); +#endif + if(do_everything) { set_everything(TRUE); }

1 0

Michael Stefaniuc : winedump: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 19c9d083047f1af8517662a1687df353581d3e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c9d083047f1af8517662a16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 10:37:06 2012 +0200 winedump: Simplify the "pointer to start of array" idiom. --- tools/winedump/debug.c | 2 +- tools/winedump/minidump.c | 8 ++++---- tools/winedump/pdb.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index c59efa6..961cf42 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -500,7 +500,7 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff { memcpy(namebuff, coff_sym->N.ShortName, 8); namebuff[8] = '\0'; - nampnt = &namebuff[0]; + nampnt = namebuff; } else { diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index ddd0ed6..aaa9dff 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -102,7 +102,7 @@ void mdmp_dump(void) case ThreadListStream: { const MINIDUMP_THREAD_LIST* mtl = (const MINIDUMP_THREAD_LIST*)stream; - const MINIDUMP_THREAD* mt = &mtl->Threads[0]; + const MINIDUMP_THREAD* mt = mtl->Threads; unsigned int i; printf("Threads: %u\n", mtl->NumberOfThreads); @@ -129,7 +129,7 @@ void mdmp_dump(void) case 0xFFF0: { const MINIDUMP_MODULE_LIST* mml = (const MINIDUMP_MODULE_LIST*)stream; - const MINIDUMP_MODULE* mm = &mml->Modules[0]; + const MINIDUMP_MODULE* mm = mml->Modules; unsigned int i; const char* p1; const char* p2; @@ -224,7 +224,7 @@ void mdmp_dump(void) case MemoryListStream: { const MINIDUMP_MEMORY_LIST* mml = (const MINIDUMP_MEMORY_LIST*)stream; - const MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; + const MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; unsigned int i; printf("Memory Ranges: %u\n", mml->NumberOfMemoryRanges); @@ -333,7 +333,7 @@ void mdmp_dump(void) if (msi->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { printf(" x86.VendorId: %.12s\n", - (const char*)&msi->Cpu.X86CpuInfo.VendorId[0]); + (const char*)msi->Cpu.X86CpuInfo.VendorId); printf(" x86.VersionInformation: %x\n", msi->Cpu.X86CpuInfo.VersionInformation); printf(" x86.FeatureInformation: %x\n", diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 7a0bd61..3513452 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -174,12 +174,12 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) if (reader->read_file == pdb_jg_read_file) { - str = &reader->u.jg.root->names[0]; + str = reader->u.jg.root->names; cbstr = reader->u.jg.root->cbNames; } else { - str = &reader->u.ds.root->names[0]; + str = reader->u.ds.root->names; cbstr = reader->u.ds.root->cbNames; } @@ -740,7 +740,7 @@ static void pdb_jg_dump(void) reader.u.jg.root->Age, (unsigned)reader.u.jg.root->cbNames); - pdw = (DWORD*)(&reader.u.jg.root->names[0] + reader.u.jg.root->cbNames); + pdw = (DWORD*)(reader.u.jg.root->names + reader.u.jg.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n" @@ -895,7 +895,7 @@ static void pdb_ds_dump(void) reader.u.ds.root->Age, get_guid_str(&reader.u.ds.root->guid), reader.u.ds.root->cbNames); - pdw = (DWORD*)(&reader.u.ds.root->names[0] + reader.u.ds.root->cbNames); + pdw = (DWORD*)(reader.u.ds.root->names + reader.u.ds.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n"

1 0

Nikolay Sivov : kernel32: Single thread test for InitOnceExecuteOnce().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 9318528702a62da5abf1553c4538f4be83701ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9318528702a62da5abf1553c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 22:59:46 2012 +0400 kernel32: Single thread test for InitOnceExecuteOnce(). --- dlls/kernel32/tests/sync.c | 58 ++++++++++++++++++++++++++++++++++++++++++- include/winbase.h | 2 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ccb21bb..97139a9 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); +static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVOID*); static void test_signalandwait(void) { @@ -1136,19 +1137,71 @@ static void test_WaitForMultipleObjects(void) if (maxevents[i]) CloseHandle(maxevents[i]); } +static BOOL g_initcallback_ret, g_initcallback_called; + +BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) +{ + g_initcallback_called = TRUE; + /* zero bit set means here that initialization is taking place - initialization locked */ + ok(initonce->Ptr == (void*)0x1, "got %p\n", initonce->Ptr); + ok(parameter == (void*)0xdeadbeef, "got wrong parameter\n"); + return g_initcallback_ret; +} + static void test_initonce(void) { INIT_ONCE initonce; + void *ctxt; + BOOL ret; - if (!pInitOnceInitialize) + if (!pInitOnceInitialize || !pInitOnceExecuteOnce) { - win_skip("one-time initialization API not supported\n"); + skip("one-time initialization API not supported\n"); return; } initonce.Ptr = (void*)0xdeadbeef; pInitOnceInitialize(&initonce); ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + + /* initialisation completed successfully */ + g_initcallback_ret = TRUE; + ctxt = NULL; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0x0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* so it's been called already so won't be called again */ + ctxt = NULL; + g_initcallback_called = FALSE; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0, "got %p\n", ctxt); + ok(!g_initcallback_called, "got %d\n", g_initcallback_called); + + pInitOnceInitialize(&initonce); + g_initcallback_called = FALSE; + /* 2 lower order bits should never be used, you'll get a crash in result */ + ctxt = (void*)0xFFFFFFF0; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0xFFFFFFF2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0xFFFFFFF0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* callback failed */ + g_initcallback_ret = FALSE; + g_initcallback_called = FALSE; + ctxt = NULL; + pInitOnceInitialize(&initonce); + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(!ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + ok(ctxt == NULL, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); } START_TEST(sync) @@ -1164,6 +1217,7 @@ START_TEST(sync) pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); + pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); test_signalandwait(); test_mutex(); diff --git a/include/winbase.h b/include/winbase.h index 532dbcd..0bc5755 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1321,6 +1321,8 @@ typedef RTL_RUN_ONCE INIT_ONCE; typedef PRTL_RUN_ONCE PINIT_ONCE; typedef PRTL_RUN_ONCE LPINIT_ONCE; #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +/* initialization callback prototype */ +typedef BOOL (WINAPI *PINIT_ONCE_FN)(PINIT_ONCE,PVOID,PVOID*); WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
72
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

2003

2002

2001

wine-commits July 2012