January 2012 - Wine-commits

Henri Verbeet : ddraw/tests: Fix some surface locking calls.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: d6dfb7914a8074c3c21ae49c6133a66fb5fe9b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6dfb7914a8074c3c21ae49c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 11 21:27:31 2012 +0100 ddraw/tests: Fix some surface locking calls. In ddraw7 DDLOCK_WAIT is the default behaviour, in earlier versions it's DDLOCK_DONOTWAIT. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 13464af..846ca19 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -283,7 +283,7 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, 0, NULL); + hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8146ff6..d94af1a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -290,7 +290,7 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, 0, NULL); + hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 65725b3..144f372 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -585,7 +585,7 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr); - hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, 0, NULL); + hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0826346..f130c01 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -86,7 +86,7 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y) memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + hr = IDirectDrawSurface7_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); if (FAILED(hr)) return 0xdeadbeef;

1 0

André Hentschel : setuapi: Add stub for CM_Set_Class_Registry_PropertyA.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: ed4b8cb617096fbb03cbca382e07a35fbeb6432e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4b8cb617096fbb03cbca382… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:07 2012 +0100 setuapi: Add stub for CM_Set_Class_Registry_PropertyA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 ++ dlls/setupapi/setupapi.spec | 2 ++ dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 450ce02..9593746 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -156,6 +156,8 @@ @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex +@ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyA +@ stub CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2d5d80a..e7bcb19 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -173,6 +173,8 @@ @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex +@ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) +@ stub CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b43a343..1f632c1 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -378,6 +378,16 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) } /*********************************************************************** + * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * SetupLogFileW (SETUPAPI.@) */ BOOL WINAPI SetupLogFileW(

1 0

André Hentschel : setuapi: Add stub for CM_Set_Class_Registry_PropertyW.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 33d60e9060daecbe3bd99d4c21c4a3e67569a493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d60e9060daecbe3bd99d4c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:24 2012 +0100 setuapi: Add stub for CM_Set_Class_Registry_PropertyW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 9593746..a34555f 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -157,7 +157,7 @@ @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyA -@ stub CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e7bcb19..6ef8f92 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -174,7 +174,7 @@ @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) -@ stub CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1f632c1..abe964f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -388,6 +388,16 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID } /*********************************************************************** + * CM_Set_Class_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, PVOID buf, ULONG len, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * SetupLogFileW (SETUPAPI.@) */ BOOL WINAPI SetupLogFileW(

1 0

André Hentschel : setuapi: Add stub for CM_Get_DevNode_Registry_Property_ExA.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 9ea3c46e7180cf8a08cf0fdb01850b7a7447b9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea3c46e7180cf8a08cf0fdb0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:43 2012 +0100 setuapi: Add stub for CM_Get_DevNode_Registry_Property_ExA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index a34555f..24c4cf3 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -56,7 +56,7 @@ @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW -@ stub CM_Get_DevNode_Registry_Property_ExA +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6ef8f92..eceef49 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,7 +67,7 @@ @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW -@ stub CM_Get_DevNode_Registry_Property_ExA +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index abe964f..1617f71 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -359,6 +359,16 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, } /*********************************************************************** + * CM_Get_DevNode_Registry_Property_ExA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_DevNode_Registry_Property_ExW (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype,

1 0

Nikolay Sivov : shell32: Unix folder COM cleanup.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: e8a6ca7d37fc8139c1503005af0b25fe8fb9125b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a6ca7d37fc8139c1503005a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 14:52:39 2012 +0300 shell32: Unix folder COM cleanup. --- dlls/shell32/shfldr_unixfs.c | 614 ++++++++++++++++++++++-------------------- 1 files changed, 315 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8a6ca7d37fc8139c1503…

1 0

Vincent Povirk : gdiplus: Test GdipCreateBitmapFromHBITMAP with 16-bit dib' s.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 52150d21942f34b9afe98107bdab8e7f74209747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52150d21942f34b9afe98107b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 13:34:27 2012 -0600 gdiplus: Test GdipCreateBitmapFromHBITMAP with 16-bit dib's. --- dlls/gdiplus/tests/image.c | 120 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 110 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6e4aca5..78a73c9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -831,6 +831,18 @@ static void test_LockBits_UserBuf(void) expect(Ok, stat); } +struct BITMAPINFOWITHBITFIELDS +{ + BITMAPINFOHEADER bmiHeader; + DWORD masks[3]; +}; + +union BITMAPINFOUNION +{ + BITMAPINFO bi; + struct BITMAPINFOWITHBITFIELDS bf; +}; + static void test_GdipCreateBitmapFromHBITMAP(void) { GpBitmap* gpbm = NULL; @@ -845,8 +857,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) const REAL WIDTH2 = 10; const REAL HEIGHT2 = 20; HDC hdc; - BITMAPINFO bmi; + union BITMAPINFOUNION bmi; BYTE *bits; + PixelFormat format; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -880,15 +893,15 @@ static void test_GdipCreateBitmapFromHBITMAP(void) hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); - bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = HEIGHT1; - bmi.bmiHeader.biWidth = WIDTH1; - bmi.bmiHeader.biBitCount = 24; - bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biCompression = BI_RGB; - bmi.bmiHeader.biClrUsed = 0; - - hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmi.bi.bmiHeader.biSize = sizeof(bmi.bi.bmiHeader); + bmi.bi.bmiHeader.biHeight = HEIGHT1; + bmi.bi.bmiHeader.biWidth = WIDTH1; + bmi.bi.bmiHeader.biBitCount = 24; + bmi.bi.bmiHeader.biPlanes = 1; + bmi.bi.bmiHeader.biCompression = BI_RGB; + bmi.bi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hbm != NULL, "CreateDIBSection failed\n"); bits[0] = 0; @@ -925,6 +938,93 @@ static void test_GdipCreateBitmapFromHBITMAP(void) DeleteObject(hpal); DeleteObject(hbm); + + /* 16-bit 555 dib, rgb */ + bmi.bi.bmiHeader.biBitCount = 16; + bmi.bi.bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB555, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + /* 16-bit 555 dib, with bitfields */ + bmi.bi.bmiHeader.biSize = sizeof(bmi); + bmi.bi.bmiHeader.biCompression = BI_BITFIELDS; + bmi.bf.masks[0] = 0x7c00; + bmi.bf.masks[1] = 0x3e0; + bmi.bf.masks[2] = 0x1f; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB555, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + /* 16-bit 565 dib, with bitfields */ + bmi.bf.masks[0] = 0xf800; + bmi.bf.masks[1] = 0x7e0; + bmi.bf.masks[2] = 0x1f; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB565, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + DeleteDC(hdc); } static void test_GdipGetImageFlags(void)

1 0

Vincent Povirk : gdiplus: Implement GdipCreateBitmapFromHBITMAP for 16-bit dibs.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 2540049777311b95d6857faf058f04aac1174758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2540049777311b95d6857faf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 13:41:19 2012 -0600 gdiplus: Implement GdipCreateBitmapFromHBITMAP for 16-bit dibs. --- dlls/gdiplus/image.c | 31 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0e3848f..aba8366 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3526,6 +3526,7 @@ GpStatus WINGDIPAPI GdipGetEncoderParameterListSize(GpImage *image, GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBitmap** bitmap) { BITMAP bm; + DIBSECTION dib; GpStatus retval; PixelFormat format; BitmapData lockeddata; @@ -3550,6 +3551,36 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi case 8: format = PixelFormat8bppIndexed; break; + case 16: + { + if (GetObjectA(hbm, sizeof(dib), &dib) == sizeof(dib)) + { + if (dib.dsBitfields[0] == 0x7c00 && + dib.dsBitfields[1] == 0x3e0 && + dib.dsBitfields[2] == 0x1f) + { + format = PixelFormat16bppRGB555; + } + else if (dib.dsBitfields[0] == 0xf800 && + dib.dsBitfields[1] == 0x7e0 && + dib.dsBitfields[2] == 0x1f) + { + format = PixelFormat16bppRGB565; + } + else + { + FIXME("unrecognized bitfields %x,%x,%x\n", dib.dsBitfields[0], + dib.dsBitfields[1], dib.dsBitfields[2]); + return InvalidParameter; + } + } + else + { + FIXME("unimplemented for 16-bit ddb\n"); + return InvalidParameter; + } + break; + } case 24: format = PixelFormat24bppRGB; break; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 78a73c9..b6262d1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -949,7 +949,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -979,7 +979,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1007,7 +1007,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) {

1 0

Daniel Lehman : msvcp90: Forward uncaught_exception to msvcrt.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: f63bbcf69250697b92a9e0055a6b0de7df28b4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63bbcf69250697b92a9e0055… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 26 20:18:57 2010 -0700 msvcp90: Forward uncaught_exception to msvcrt. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index b3f0857..d6cd97f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5640,7 +5640,7 @@ @ stub -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ @ stub -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ stub -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ stub ?uncaught_exception(a)std@@YA_NXZ +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception @ stub -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ stub -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ

1 0

Vincent Povirk : include/wincodecsdk.idl: Fix typo.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 8a68deec7a43f0d717f81afc396ff333988e4a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a68deec7a43f0d717f81afc3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 16:03:00 2012 -0600 include/wincodecsdk.idl: Fix typo. --- include/wincodecsdk.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index dec9488..a3af55a 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -101,7 +101,7 @@ interface IWICMetadataReader : IUnknown HRESULT GetValue( [in] const PROPVARIANT *pvarSchema, [in] const PROPVARIANT *pvarId, - [in, out, unique] const PROPVARIANT *pvarValue); + [in, out, unique] PROPVARIANT *pvarValue); HRESULT GetEnumerator( [out] IWICEnumMetadataItem **ppIEnumMetadata);

1 0

Vincent Povirk : windowscodecs: Add a stub IWICMetadataReader/ Writer implementation.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 6b2d1ce1300a1392f602fbf2d3c7f50a86c9efcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2d1ce1300a1392f602fbf2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 16:03:24 2012 -0600 windowscodecs: Add a stub IWICMetadataReader/Writer implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 2 + dlls/windowscodecs/metadatahandler.c | 317 +++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 6 +- dlls/windowscodecs/wincodecs_private.h | 23 ++ dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 6 files changed, 353 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2d1ce1300a1392f602f…

1 0