February 2010 - Wine-commits

Detlef Riekenberg : shlwapi/tests: HashData is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: cb3e537b034e4000728d6ec264c512340f48e88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3e537b034e4000728d6ec26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 16:34:52 2010 +0100 shlwapi/tests: HashData is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index a253c11..af7f729 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -34,6 +34,7 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pParseURLA)(LPCSTR,PARSEDURLA*); static HRESULT (WINAPI *pParseURLW)(LPCWSTR,PARSEDURLW*); +static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; @@ -1102,36 +1103,36 @@ static void test_HashData(void) int i; /* Test hashing with identically sized input/output buffers. */ - res = HashData(input, 16, output, 16); + res = pHashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected, sizeof(expected)), "Output buffer did not match expected contents\n"); /* Test hashing with larger output buffer. */ - res = HashData(input, 16, output, 32); + res = pHashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected2, sizeof(expected2)), "Output buffer did not match expected contents\n"); /* Test hashing with smaller input buffer. */ - res = HashData(input, 8, output, 16); + res = pHashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected3, sizeof(expected3)), "Output buffer did not match expected contents\n"); /* Test passing NULL pointers for input/output parameters. */ - res = HashData(NULL, 0, NULL, 0); + res = pHashData(NULL, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = HashData(input, 0, NULL, 0); + res = pHashData(input, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = HashData(NULL, 0, output, 0); + res = pHashData(NULL, 0, output, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); @@ -1142,7 +1143,7 @@ static void test_HashData(void) for (i = 0; i < sizeof(output)/sizeof(BYTE); i++) output[i] = 0xFF; - res = HashData(input, 0, output, 0); + res = pHashData(input, 0, output, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); /* The buffers should be unchanged. */ @@ -1159,12 +1160,12 @@ static void test_HashData(void) } /* Input/output parameters are not validated. */ - res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); + res = pHashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if (0) { - res = HashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); + res = pHashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); trace("HashData returned 0x%08x\n", res); } } @@ -1178,6 +1179,7 @@ START_TEST(url) pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); pParseURLA = (void*)GetProcAddress(hShlwapi, (LPCSTR)1); pParseURLW = (void*)GetProcAddress(hShlwapi, (LPCSTR)2); + pHashData = (void*)GetProcAddress(hShlwapi, "HashData"); test_UrlApplyScheme(); test_UrlHash();

1 0

Detlef Riekenberg : shlwapi/tests: PathCreateFromUrl* is not present on Win95B (winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: e3b3b1e27d5dd48c6f6eb53d794821bf03daf834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b3b1e27d5dd48c6f6eb53d7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 22:59:01 2010 +0100 shlwapi/tests: PathCreateFromUrl* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/path.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 5d64a24..e52502f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -32,6 +32,8 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); +static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); +static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); /* ################ */ @@ -207,31 +209,39 @@ static void test_PathCreateFromUrl(void) WCHAR *pathW, *urlW; static const char url[] = "http://www.winehq.org"; + if (!pPathCreateFromUrlA) { + win_skip("PathCreateFromUrlA not found\n"); + return; + } + /* Check ret_path = NULL */ len = sizeof(url); - ret = PathCreateFromUrlA(url, NULL, &len, 0); + ret = pPathCreateFromUrlA(url, NULL, &len, 0); ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; - ret = PathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); + ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(TEST_PATHFROMURL[i].path) { ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); } - len = INTERNET_MAX_URL_LENGTH; - pathW = GetWideString(TEST_PATHFROMURL[i].path); - urlW = GetWideString(TEST_PATHFROMURL[i].url); - ret = PathCreateFromUrlW(urlW, ret_pathW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + if (pPathCreateFromUrlW) { + len = INTERNET_MAX_URL_LENGTH; + pathW = GetWideString(TEST_PATHFROMURL[i].path); + urlW = GetWideString(TEST_PATHFROMURL[i].url); + ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); + WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0); + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + if(TEST_PATHFROMURL[i].path) { + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + } + FreeWideString(urlW); + FreeWideString(pathW); } - FreeWideString(urlW); - FreeWideString(pathW); } } @@ -1307,6 +1317,8 @@ static void test_PathUnquoteSpaces(void) START_TEST(path) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); + pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); test_PathSearchAndQualify(); test_PathCreateFromUrl();

1 0

Igor Paliychuk : shdoclc: Add Ukrainian translations.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 2c9f51089e166b5890b92bc233a518a494353ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9f51089e166b5890b92bc23… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jan 30 16:44:38 2010 +0200 shdoclc: Add Ukrainian translations. --- dlls/shdoclc/Makefile.in | 1 + dlls/shdoclc/Uk.rc | 470 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 471 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c9f51089e166b5890b92…

1 0

Igor Paliychuk : winefile: Add Ukrainian translations.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: e80a1214f857e83b4fee99b0a38ec2602af976cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80a1214f857e83b4fee99b0a… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jan 30 16:35:58 2010 +0200 winefile: Add Ukrainian translations. --- programs/winefile/Makefile.in | 1 + programs/winefile/Uk.rc | 251 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e80a1214f857e83b4fee9…

1 0

Igor Paliychuk : wordpad: Update Ukrainian translations.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: c0c5ab16e15538574d2b65bc5c9675f8af09d723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c5ab16e15538574d2b65bc5… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jan 30 17:00:19 2010 +0200 wordpad: Update Ukrainian translations. --- programs/wordpad/Uk.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/Uk.rc b/programs/wordpad/Uk.rc index 14d8198..8855b0a 100644 --- a/programs/wordpad/Uk.rc +++ b/programs/wordpad/Uk.rc @@ -45,12 +45,12 @@ BEGIN POPUP "&Правка" BEGIN MENUITEM "&Відмінити\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "П&овторити\tCtrl+Y", ID_EDIT_REDO + MENUITEM "Повт&орити\tCtrl+Y", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "Виріза&ти\tCtrl+X", ID_EDIT_CUT MENUITEM "&Копіювати\tCtrl+C", ID_EDIT_COPY MENUITEM "В&ставити\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Очистити\tDEL", ID_EDIT_CLEAR + MENUITEM "О&чистити\tDEL", ID_EDIT_CLEAR MENUITEM "Виб&рати все\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "&Знайти...\tCrtl+F", ID_FIND @@ -58,7 +58,7 @@ BEGIN MENUITEM "За&мінтити...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Лише д&ля читання", ID_EDIT_READONLY - MENUITEM "З&мінений", ID_EDIT_MODIFIED + MENUITEM "Зм&інений", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "Д&одатково" BEGIN @@ -217,6 +217,8 @@ BEGIN STRING_PREVIEW_PREVPAGE, "Попередня сторінка" STRING_PREVIEW_TWOPAGES, "Дві сторінки" STRING_PREVIEW_ONEPAGE, "Одна сторінка" + STRING_PREVIEW_ZOOMIN, "Збільшити" + STRING_PREVIEW_ZOOMOUT, "Зменшити" STRING_PREVIEW_CLOSE, "Закрити" STRING_UNITS_CM, "cm" END

1 0

Vincent Povirk : gdiplus: Implement GdipSetImageAttributesGamma.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 762845ca8c1df295f3819a51849f4f271b406afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=762845ca8c1df295f3819a518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 30 17:09:06 2010 -0600 gdiplus: Implement GdipSetImageAttributesGamma. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/imageattributes.c | 11 ++++--- dlls/gdiplus/tests/image.c | 63 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9d05e0d..d82eec1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -263,6 +263,8 @@ struct GpImageAttributes{ WrapMode wrap; struct color_key colorkeys[ColorAdjustTypeCount]; struct color_matrix colormatrices[ColorAdjustTypeCount]; + BOOL gamma_enabled[ColorAdjustTypeCount]; + REAL gamma[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 56e5ab2..c9c3bcc 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -149,14 +149,15 @@ GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *im GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, ColorAdjustType type, BOOL enableFlag, REAL gamma) { - static int calls; - TRACE("(%p,%u,%i,%0.2f)\n", imageAttr, type, enableFlag, gamma); - if(!(calls++)) - FIXME("not implemented\n"); + if (!imageAttr || (enableFlag && gamma <= 0.0) || type >= ColorAdjustTypeCount) + return InvalidParameter; - return NotImplemented; + imageAttr->gamma_enabled[type] = enableFlag; + imageAttr->gamma[type] = gamma; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e93b745..fe49425 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1365,6 +1365,68 @@ static void test_colormatrix(void) GdipDisposeImageAttributes(imageattr); } +static void test_gamma(void) +{ + GpStatus stat; + GpImageAttributes *imageattr; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + stat = GdipSetImageAttributesGamma(NULL, ColorAdjustTypeDefault, TRUE, 1.0); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, TRUE, 1.0); + expect(Ok, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeAny, TRUE, 1.0); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, TRUE, -1.0); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, TRUE, 0.0); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, TRUE, 0.5); + expect(Ok, stat); + + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, FALSE, 0.0); + expect(Ok, stat); + + /* Drawing a bitmap transforms the colors */ + stat = GdipSetImageAttributesGamma(imageattr, ColorAdjustTypeDefault, TRUE, 3.0); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff80ffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xff20ffff, color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + /* 1x1 pixel gif, 2 frames; first frame is white, second is black */ static const unsigned char gifanimation[72] = { 0x47,0x49,0x46,0x38,0x39,0x61,0x01,0x00,0x01,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, @@ -1533,6 +1595,7 @@ START_TEST(image) test_getsetpixel(); test_palette(); test_colormatrix(); + test_gamma(); test_multiframegif(); GdiplusShutdown(gdiplusToken);

1 0

Vincent Povirk : gdiplus: Test getting/ setting pixels of indexed color bitmaps.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 3815add31bb7db8b02710f4297ca829e7161f71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3815add31bb7db8b02710f429… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 30 18:43:31 2010 -0600 gdiplus: Test getting/setting pixels of indexed color bitmaps. --- dlls/gdiplus/tests/image.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index fe49425..53d66e0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1133,6 +1133,7 @@ static void test_palette(void) INT size; BYTE buffer[1040]; ColorPalette *palette=(ColorPalette*)buffer; + ARGB color=0; /* test initial palette from non-indexed bitmap */ stat = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppRGB, NULL, &bitmap); @@ -1178,6 +1179,22 @@ static void test_palette(void) expect(0xff000000, palette->Entries[0]); expect(0xffffffff, palette->Entries[1]); + /* test getting/setting pixels */ + stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); + todo_wine expect(Ok, stat); + todo_wine expect(0xff000000, color); + + stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffffffff); + todo_wine ok((stat == Ok) || + broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); + + if (stat == Ok) + { + stat = GdipBitmapGetPixel(bitmap, 0, 1, &color); + expect(Ok, stat); + expect(0xffffffff, color); + } + GdipDisposeImage((GpImage*)bitmap); /* test initial palette on 4-bit bitmap */ @@ -1195,6 +1212,22 @@ static void test_palette(void) check_halftone_palette(palette); + /* test getting/setting pixels */ + stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); + todo_wine expect(Ok, stat); + todo_wine expect(0xff000000, color); + + stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffff00ff); + todo_wine ok((stat == Ok) || + broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); + + if (stat == Ok) + { + stat = GdipBitmapGetPixel(bitmap, 0, 1, &color); + expect(Ok, stat); + expect(0xffff00ff, color); + } + GdipDisposeImage((GpImage*)bitmap); /* test initial palette on 8-bit bitmap */ @@ -1212,6 +1245,22 @@ static void test_palette(void) check_halftone_palette(palette); + /* test getting/setting pixels */ + stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); + todo_wine expect(Ok, stat); + todo_wine expect(0xff000000, color); + + stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffcccccc); + todo_wine ok((stat == Ok) || + broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); + + if (stat == Ok) + { + stat = GdipBitmapGetPixel(bitmap, 0, 1, &color); + expect(Ok, stat); + expect(0xffcccccc, color); + } + /* test setting/getting a different palette */ palette->Entries[1] = 0xffcccccc;

1 0

Vincent Povirk : gdiplus: Implement GetPixel for indexed color bitmaps.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 4d53a4c9f540275314111c1e26b2cddbb83a0a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d53a4c9f540275314111c1e2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 30 19:01:52 2010 -0600 gdiplus: Implement GetPixel for indexed color bitmaps. --- dlls/gdiplus/image.c | 33 ++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 12 ++++++------ 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4d6448e..4fd593f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -94,6 +94,24 @@ GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap** inputBitmaps, return NotImplemented; } +static inline void getpixel_1bppIndexed(BYTE *index, const BYTE *row, UINT x) +{ + *index = (row[x/8]>>(7-x%8)) & 1; +} + +static inline void getpixel_4bppIndexed(BYTE *index, const BYTE *row, UINT x) +{ + if (x & 1) + *index = row[x/2]&0xf; + else + *index = row[x/2]>>4; +} + +static inline void getpixel_8bppIndexed(BYTE *index, const BYTE *row, UINT x) +{ + *index = row[x]; +} + static inline void getpixel_16bppGrayScale(BYTE *r, BYTE *g, BYTE *b, BYTE *a, const BYTE *row, UINT x) { @@ -211,6 +229,7 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { BYTE r, g, b, a; + BYTE index; BYTE *row; TRACE("%p %d %d %p\n", bitmap, x, y, color); @@ -222,6 +241,15 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, switch (bitmap->format) { + case PixelFormat1bppIndexed: + getpixel_1bppIndexed(&index,row,x); + break; + case PixelFormat4bppIndexed: + getpixel_4bppIndexed(&index,row,x); + break; + case PixelFormat8bppIndexed: + getpixel_8bppIndexed(&index,row,x); + break; case PixelFormat16bppGrayScale: getpixel_16bppGrayScale(&r,&g,&b,&a,row,x); break; @@ -260,7 +288,10 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return NotImplemented; } - *color = a<<24|r<<16|g<<8|b; + if (bitmap->format & PixelFormatIndexed) + *color = bitmap->image.palette_entries[index]; + else + *color = a<<24|r<<16|g<<8|b; return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 53d66e0..10dc21e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1181,8 +1181,8 @@ static void test_palette(void) /* test getting/setting pixels */ stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); - todo_wine expect(Ok, stat); - todo_wine expect(0xff000000, color); + expect(Ok, stat); + expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffffffff); todo_wine ok((stat == Ok) || @@ -1214,8 +1214,8 @@ static void test_palette(void) /* test getting/setting pixels */ stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); - todo_wine expect(Ok, stat); - todo_wine expect(0xff000000, color); + expect(Ok, stat); + expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffff00ff); todo_wine ok((stat == Ok) || @@ -1247,8 +1247,8 @@ static void test_palette(void) /* test getting/setting pixels */ stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); - todo_wine expect(Ok, stat); - todo_wine expect(0xff000000, color); + expect(Ok, stat); + expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffcccccc); todo_wine ok((stat == Ok) ||

1 0

Piotr Caban : shlwapi: Added OS_VISTAORGREATER flag to IsOS (undocumented).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 09a78cd566a1b8f67f8b4be441ab14563bdabc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a78cd566a1b8f67f8b4be44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jan 31 23:02:04 2010 +0100 shlwapi: Added OS_VISTAORGREATER flag to IsOS (undocumented). --- dlls/shlwapi/ordinal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3098af4..9bb26cf 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3913,6 +3913,8 @@ BOOL WINAPI IsOS(DWORD feature) case OS_APPLIANCE: FIXME("(OS_APPLIANCE) What should we return here?\n"); return FALSE; + case 0x25: /*OS_VISTAORGREATER*/ + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 6) } #undef ISOS_RETURN

1 0

Piotr Caban : shlwapi: Update SHRegGetValue definition.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: dfe535226ada7939d6577e8e4089ea4a668189df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe535226ada7939d6577e8e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jan 31 23:02:33 2010 +0100 shlwapi: Update SHRegGetValue definition. --- dlls/shlwapi/reg.c | 4 ++-- include/shlwapi.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 9f652c9..55952ba 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1155,7 +1155,7 @@ DWORD WINAPI SHGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, * Success: ERROR_SUCCESS. Output parameters contain the details read. * Failure: An error code from RegOpenKeyExA() or SHQueryValueExA(). */ -DWORD WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWORD srrfFlags, +LSTATUS WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, SRRF srrfFlags, LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) { DWORD dwRet = 0; @@ -1180,7 +1180,7 @@ DWORD WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWOR * * See SHGetValueA. */ -DWORD WINAPI SHRegGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DWORD srrfFlags, +LSTATUS WINAPI SHRegGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, SRRF srrfFlags, LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) { DWORD dwRet = 0; diff --git a/include/shlwapi.h b/include/shlwapi.h index eb36345..fe33a17 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -85,6 +85,34 @@ DWORD WINAPI SHCopyKeyW(HKEY,LPCWSTR,HKEY,DWORD); HKEY WINAPI SHRegDuplicateHKey(HKEY); +/* SHRegGetValue flags */ +typedef INT SRRF; + +#define SRRF_RT_REG_NONE 0x1 +#define SRRF_RT_REG_SZ 0x2 +#define SRRF_RT_REG_EXPAND_SZ 0x4 +#define SRRF_RT_REG_BINARY 0x8 +#define SRRF_RT_REG_DWORD 0x10 +#define SRRF_RT_REG_MULTI_SZ 0x20 +#define SRRF_RT_REG_QWORD 0x40 + +#define SRRF_RT_DWORD (SRRF_RT_REG_BINARY|SRRF_RT_REG_DWORD) +#define SRRF_RT_QWORD (SRRF_RT_REG_BINARY|SRRF_RT_REG_QWORD) +#define SRRF_RT_ANY 0xffff + +#define SRRF_RM_ANY 0 +#define SRRF_RM_NORMAL 0x10000 +#define SRRF_RM_SAFE 0x20000 +#define SRRF_RM_SAFENETWORK 0x40000 + +#define SRRF_NOEXPAND 0x10000000 +#define SRRF_ZEROONFAILURE 0x20000000 +#define SRRF_NOVIRT 0x40000000 + +LSTATUS WINAPI SHRegGetValueA(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); +LSTATUS WINAPI SHRegGetValueW(HKEY,LPCWSTR,LPCWSTR,SRRF,LPDWORD,LPVOID,LPDWORD); +#define SHRegGetValue WINELIB_NAME_AW(SHRegGetValue) + /* Undocumented registry functions */ DWORD WINAPI SHDeleteOrphanKeyA(HKEY,LPCSTR);

1 0