November 2009 - Wine-commits

Eric Pouech : gdi.exe: No longer use 16bit abort procs inside the DC structure.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8e248c063f040bf6d9a1b124c3ab443ca3e5a64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e248c063f040bf6d9a1b124c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 15 22:09:59 2009 +0100 gdi.exe: No longer use 16bit abort procs inside the DC structure. --- dlls/gdi32/gdi16.c | 130 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/printdrv16.c | 41 -------------- 3 files changed, 129 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index ee829e1..6579f86 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -34,6 +34,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define HGDIOBJ_32(handle16) ((HGDIOBJ)(ULONG_PTR)(handle16)) #define HGDIOBJ_16(handle32) ((HGDIOBJ16)(ULONG_PTR)(handle32)) +/* + * ############################################################################ + */ + +#include <pshpack1.h> +#define GDI_MAX_THUNKS 32 + +static struct gdi_thunk +{ + BYTE popl_eax; /* popl %eax (return address) */ + BYTE pushl_pfn16; /* pushl pfn16 */ + DWORD pfn16; /* pfn16 */ + BYTE pushl_eax; /* pushl %eax */ + BYTE jmp; /* ljmp GDI_Callback3216 */ + DWORD callback; + HDC16 hdc; +} *GDI_Thunks; + +#include <poppack.h> + +/********************************************************************** + * GDI_Callback3216 + */ +static BOOL CALLBACK GDI_Callback3216( DWORD pfn16, HDC hdc, INT code ) +{ + if (pfn16) + { + WORD args[2]; + DWORD ret; + + args[1] = HDC_16(hdc); + args[0] = code; + WOWCallback16Ex( pfn16, WCB16_PASCAL, sizeof(args), args, &ret ); + return LOWORD(ret); + } + return TRUE; +} + + +/****************************************************************** + * GDI_AddThunk + * + */ +static struct gdi_thunk* GDI_AddThunk(HDC16 dc16, ABORTPROC16 pfn16) +{ + struct gdi_thunk* thunk; + + if (!GDI_Thunks) + { + GDI_Thunks = VirtualAlloc(NULL, GDI_MAX_THUNKS * sizeof(*GDI_Thunks), + MEM_COMMIT, PAGE_EXECUTE_READWRITE); + if (!GDI_Thunks) + { + return NULL; + } + for (thunk = GDI_Thunks; thunk < &GDI_Thunks[GDI_MAX_THUNKS]; thunk++) + { + thunk->popl_eax = 0x58; /* popl %eax */ + thunk->pushl_pfn16 = 0x68; /* pushl pfn16 */ + thunk->pfn16 = 0; + thunk->pushl_eax = 0x50; /* pushl %eax */ + thunk->jmp = 0xe9; /* jmp GDI_Callback3216 */ + thunk->callback = (char *)GDI_Callback3216 - (char *)(&thunk->callback + 1); + } + } + for (thunk = GDI_Thunks; thunk < &GDI_Thunks[GDI_MAX_THUNKS]; thunk++) + { + if (thunk->pfn16 == 0) + { + thunk->pfn16 = (DWORD)pfn16; + thunk->hdc = dc16; + return thunk; + } + } + FIXME("Out of mmdrv-thunks. Bump GDI_MAX_THUNKS\n"); + return NULL; +} + +/****************************************************************** + * GDI_DeleteThunk + */ +static void GDI_DeleteThunk(struct gdi_thunk* thunk) +{ + thunk->pfn16 = 0; +} + +/****************************************************************** + * GDI_FindThunk + */ +static struct gdi_thunk* GDI_FindThunk(HDC16 hdc) +{ + struct gdi_thunk* thunk; + + for (thunk = GDI_Thunks; thunk < &GDI_Thunks[GDI_MAX_THUNKS]; thunk++) + { + if (thunk->hdc == hdc) return thunk; + } + return NULL; +} + +/********************************************************************** + * SetAbortProc (GDI.381) + */ +INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) +{ + struct gdi_thunk* thunk; + + thunk = GDI_AddThunk(hdc16, abrtprc); + if (!thunk) return FALSE; + if (!SetAbortProc(HDC_32( hdc16 ), (ABORTPROC)thunk)) + { + GDI_DeleteThunk(thunk); + return FALSE; + } + return TRUE; +} + +/* + * ############################################################################ + */ + struct callback16_info { FARPROC16 proc; @@ -1167,7 +1288,14 @@ HBRUSH16 WINAPI CreateSolidBrush16( COLORREF color ) */ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) { - return DeleteDC( HDC_32(hdc) ); + if (DeleteDC( HDC_32(hdc) )) + { + struct gdi_thunk* thunk; + if ((thunk = GDI_FindThunk(hdc))) + GDI_DeleteThunk(thunk); + return TRUE; + } + return FALSE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f0248c9..ad57b1b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -302,7 +302,6 @@ typedef struct tagDC INT MapMode; INT GraphicsMode; /* Graphics mode */ ABORTPROC pAbortProc; /* AbortProc for Printing */ - ABORTPROC16 pAbortProc16; INT CursPosX; /* Current position */ INT CursPosY; INT ArcDirection; diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index e7954ee..d71a752 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -82,47 +82,6 @@ BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) } -/********************************************************************** - * call_abort_proc16 - */ -static BOOL CALLBACK call_abort_proc16( HDC hdc, INT code ) -{ - ABORTPROC16 proc16; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - proc16 = dc->pAbortProc16; - release_dc_ptr( dc ); - if (proc16) - { - WORD args[2]; - DWORD ret; - - args[1] = HDC_16(hdc); - args[0] = code; - WOWCallback16Ex( (DWORD)proc16, WCB16_PASCAL, sizeof(args), args, &ret ); - return LOWORD(ret); - } - return TRUE; -} - - -/********************************************************************** - * SetAbortProc (GDI.381) - */ -INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) -{ - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - dc->pAbortProc16 = abrtprc; - dc->pAbortProc = call_abort_proc16; - release_dc_ptr( dc ); - return TRUE; -} - - /****************** misc. printer related functions */ /*

1 0

Eric Pouech : gdi.exe: Rewrite QueryAbort16 to be independant of gdi32. dll internals.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 40eea7acd7834771d1f12cbf7b3fddf5694b3e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40eea7acd7834771d1f12cbf7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 15 22:10:05 2009 +0100 gdi.exe: Rewrite QueryAbort16 to be independant of gdi32.dll internals. --- dlls/gdi32/gdi16.c | 21 +++++++++++++++++++++ dlls/gdi32/printdrv16.c | 25 ------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 6579f86..37a15e9 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -135,6 +135,27 @@ static struct gdi_thunk* GDI_FindThunk(HDC16 hdc) } /********************************************************************** + * QueryAbort (GDI.155) + * + * Calls the app's AbortProc function if avail. + * + * RETURNS + * TRUE if no AbortProc avail or AbortProc wants to continue printing. + * FALSE if AbortProc wants to abort printing. + */ +BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) +{ + struct gdi_thunk* thunk = GDI_FindThunk(hdc16); + + if (!thunk) { + ERR("Invalid hdc 0x%x\n", hdc16); + return FALSE; + } + return GDI_Callback3216( thunk->pfn16, HDC_32(hdc16), 0 ); +} + + +/********************************************************************** * SetAbortProc (GDI.381) */ INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index d71a752..f0b8cf0 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -57,31 +57,6 @@ static const char DefaultDevMode[] = "Default DevMode"; static const char PrinterDriverData[] = "PrinterDriverData"; static const char Printers[] = "System\\CurrentControlSet\\Control\\Print\\Printers\\"; -/********************************************************************** - * QueryAbort (GDI.155) - * - * Calls the app's AbortProc function if avail. - * - * RETURNS - * TRUE if no AbortProc avail or AbortProc wants to continue printing. - * FALSE if AbortProc wants to abort printing. - */ -BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) -{ - BOOL ret = TRUE; - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - - if(!dc) { - ERR("Invalid hdc %p\n", hdc); - return FALSE; - } - if (dc->pAbortProc) ret = dc->pAbortProc(hdc, 0); - release_dc_ptr( dc ); - return ret; -} - - /****************** misc. printer related functions */ /*

1 0

Anders Jonsson : wined3d: Fix typo.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 58b203e79873f79d055d107ae7d3fc979c709546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b203e79873f79d055d107ae… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Nov 15 23:12:50 2009 +0100 wined3d: Fix typo. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 94fe19e..6df6e54 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1636,7 +1636,7 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w stateblock->renderState[WINED3DRS_WRAP13] || stateblock->renderState[WINED3DRS_WRAP14] || stateblock->renderState[WINED3DRS_WRAP15] ) { - FIXME("(WINED3DRS_WRAP0) Texture wraping not yet supported\n"); + FIXME("(WINED3DRS_WRAP0) Texture wrapping not yet supported\n"); } }

1 0

Anders Jonsson : comctl32: Fix typos.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c00b75941544aeafb3071433713a89dfe0f304d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00b75941544aeafb30714337… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Nov 15 23:10:53 2009 +0100 comctl32: Fix typos. --- dlls/comctl32/updown.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a212073..773d359 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -550,7 +550,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) * * Sets bud as a new Buddy. * Then, it should subclass the buddy - * If window has the UDS_ARROWKEYS, it subcalsses the buddy window to + * If window has the UDS_ARROWKEYS, it subclasses the buddy window to * process the UP/DOWN arrow keys. * If window has the UDS_ALIGNLEFT or UDS_ALIGNRIGHT style * the size/pos of the buddy and the control are adjusted accordingly. @@ -659,7 +659,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) * 'delta' amount according to the 'action' flag which can be a * combination of FLAG_INCR and FLAG_DECR * It notifies the parent as required. - * It handles wraping and non-wraping correctly. + * It handles wrapping and non-wrapping correctly. * It is assumed that delta>0 */ static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action)

1 0

Detlef Riekenberg : wineps: Don' t depend on 16-bit PrinterData functions from gdi.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 495267e5f1cf110f041520f1ae8093b47ce9a5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495267e5f1cf110f041520f1a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 15 23:51:47 2009 +0100 wineps: Don't depend on 16-bit PrinterData functions from gdi. --- dlls/gdi32/gdi32.spec | 2 -- dlls/wineps.drv/init.c | 42 +++++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6a67f44..ebd9525 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -514,8 +514,6 @@ # Wine extensions: Win16 functions that are needed by other dlls # @ stdcall CloseJob16(long) -@ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) -@ stdcall DrvSetPrinterData16(str str long ptr long) @ stdcall GetDCHook(long ptr) @ stdcall OpenJob16(str str long) @ stdcall SelectVisRgn(long long) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 78aa0cb..b923529 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -111,6 +111,8 @@ static const LOGFONTA DefaultLogFont = { DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }; +static const CHAR default_devmodeA[] = "Default DevMode"; + /********************************************************************* * DllMain * @@ -532,7 +534,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) PRINTERINFO *pi = PSDRV_PrinterList, **last = &PSDRV_PrinterList; FONTNAME *font; const AFM *afm; - HANDLE hPrinter; + HANDLE hPrinter = 0; const char *ppd = NULL; DWORD ppdType; char* ppdFileName = NULL; @@ -556,32 +558,33 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) if (!(pi->FriendlyName = HeapAlloc( PSDRV_Heap, 0, strlen(name)+1 ))) goto fail; strcpy( pi->FriendlyName, name ); - /* Use Get|SetPrinterDataExA instead? */ + if (OpenPrinterA (pi->FriendlyName, &hPrinter, NULL) == 0) { + ERR ("OpenPrinterA failed with code %i\n", GetLastError ()); + goto cleanup; + } - res = DrvGetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type, - NULL, 0, &needed ); + needed = 0; + res = GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, NULL, 0, &needed); - if(res == ERROR_INVALID_PRINTER_NAME || needed != sizeof(DefaultDevmode)) { + if (needed < sizeof(DefaultDevmode)) { pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); - if (pi->Devmode == NULL) - goto cleanup; - *pi->Devmode = DefaultDevmode; - lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName,name,CCHDEVICENAME); - using_default_devmode = TRUE; + if (pi->Devmode == NULL) + goto closeprinter; - /* need to do something here AddPrinter?? */ + *pi->Devmode = DefaultDevmode; + lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName,name,CCHDEVICENAME); + using_default_devmode = TRUE; } else { pi->Devmode = HeapAlloc( PSDRV_Heap, 0, needed ); - DrvGetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type, - (LPBYTE)pi->Devmode, needed, &needed); - } + if (pi->Devmode == NULL) + goto closeprinter; - if (OpenPrinterA (pi->FriendlyName, &hPrinter, NULL) == 0) { - ERR ("OpenPrinterA failed with code %i\n", GetLastError ()); - goto cleanup; + GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, (LPBYTE)pi->Devmode, needed, &needed); } + + #ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) { typeof(cupsGetPPD) * pcupsGetPPD = NULL; @@ -687,8 +690,9 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) dm.dmPublic.u1.s1.dmPaperSize = papersize; PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - DrvSetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, - REG_BINARY, (LPBYTE)pi->Devmode, sizeof(DefaultDevmode) ); + + SetPrinterDataExA(hPrinter, NULL, default_devmodeA, REG_BINARY, + (LPBYTE)pi->Devmode, sizeof(DefaultDevmode)); } if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */

1 0

Owen Rudge : comctl32/tests: Add tests for IImageList based on standard imagelist tests.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: a07c922fa3859e3a000b7d44e016a062f50cb29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07c922fa3859e3a000b7d44e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Nov 13 11:14:27 2009 -0600 comctl32/tests: Add tests for IImageList based on standard imagelist tests. --- dlls/comctl32/tests/imagelist.c | 67 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d67252a..be1c079 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1278,6 +1278,72 @@ static void test_iimagelist(void) ImageList_Destroy(himl); } +static void DoTest1_v6(void) +{ + IImageList *imgl; + HIMAGELIST himl; + HRESULT hr; + + HICON hicon1; + HICON hicon2; + HICON hicon3; + + int ret = 0; + + /* create an imagelist to play with */ + himl = ImageList_Create(84,84,0x10,0,3); + ok(himl != 0,"failed to create imagelist\n"); + + imgl = (IImageList *) himl; + + /* load the icons to add to the image list */ + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != 0, "no hicon1\n"); + hicon2 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon2 != 0, "no hicon2\n"); + hicon3 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon3 != 0, "no hicon3\n"); + + /* remove when nothing exists */ + hr = IImageList_Remove(imgl, 0); + ok(!(SUCCEEDED(hr)), "removed nonexistent icon\n"); + + /* removing everything from an empty imagelist should succeed */ + hr = IImageList_Remove(imgl, -1); + ok(SUCCEEDED(hr), "removed nonexistent icon\n"); + + /* add three */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl, -1, hicon1, &ret)) && (ret == 0),"failed to add icon1\n"); + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl, -1, hicon2, &ret)) && (ret == 1),"failed to add icon2\n"); + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl, -1, hicon3, &ret)) && (ret == 2),"failed to add icon3\n"); + + /* remove an index out of range */ + ok(!SUCCEEDED(IImageList_Remove(imgl,4711)),"removed nonexistent icon\n"); + + /* remove three */ + ok(SUCCEEDED(IImageList_Remove(imgl,0)),"can't remove 0\n"); + ok(SUCCEEDED(IImageList_Remove(imgl,0)),"can't remove 0\n"); + ok(SUCCEEDED(IImageList_Remove(imgl,0)),"can't remove 0\n"); + + /* remove one extra */ + ok(!SUCCEEDED(IImageList_Remove(imgl,0)),"removed nonexistent icon\n"); + + /* check SetImageCount/GetImageCount */ + ok(SUCCEEDED(IImageList_SetImageCount(imgl, 3)), "couldn't increase image count\n"); + ok(SUCCEEDED(IImageList_GetImageCount(imgl, &ret)) && (ret == 3), "invalid image count after increase\n"); + ok(SUCCEEDED(IImageList_SetImageCount(imgl, 1)), "couldn't decrease image count\n"); + ok(SUCCEEDED(IImageList_GetImageCount(imgl, &ret)) && (ret == 1), "invalid image count after decrease to 1\n"); + ok(SUCCEEDED(IImageList_SetImageCount(imgl, 0)), "couldn't decrease image count\n"); + ok(SUCCEEDED(IImageList_GetImageCount(imgl, &ret)) && (ret == 0), "invalid image count after decrease to 0\n"); + + /* destroy it */ + ok(SUCCEEDED(IImageList_Release(imgl)),"release imagelist failed\n"); + + ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n"); + ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n"); + ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1322,6 +1388,7 @@ START_TEST(imagelist) test_ImageList_DrawIndirect(); test_shell_imagelist(); test_iimagelist(); + DoTest1_v6(); CoUninitialize();

1 0

Owen Rudge : comctl32: Implement SetOverlayImage, Replace, AddMasked, Draw, Remove, GetImageInfo.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8a4a761683599b9c581a9df75dea3f00070f2500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4a761683599b9c581a9df75… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Nov 13 11:14:31 2009 -0600 comctl32: Implement SetOverlayImage, Replace, AddMasked, Draw, Remove, GetImageInfo. --- dlls/comctl32/imagelist.c | 58 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8853e22..0f2d042 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3021,29 +3021,54 @@ static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList *iface, int i, static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList *iface, int iImage, int iOverlay) { - FIXME("STUB: %p %d %d\n", iface, iImage, iOverlay); - return E_NOTIMPL; + return ImageList_SetOverlayImage((HIMAGELIST) iface, iImage, iOverlay) + ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_Replace(IImageList *iface, int i, HBITMAP hbmImage, HBITMAP hbmMask) { - FIXME("STUB: %p %d %p %p\n", iface, i, hbmImage, hbmMask); - return E_NOTIMPL; + return ImageList_Replace((HIMAGELIST) iface, i, hbmImage, hbmMask) ? S_OK : + E_FAIL; } static HRESULT WINAPI ImageListImpl_AddMasked(IImageList *iface, HBITMAP hbmImage, COLORREF crMask, int *pi) { - FIXME("STUB: %p %p %x %p\n", iface, hbmImage, crMask, pi); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + int ret; + + if (!pi) + return E_FAIL; + + ret = ImageList_AddMasked(This, hbmImage, crMask); + + if (ret == -1) + return E_FAIL; + + *pi = ret; + return S_OK; } static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, IMAGELISTDRAWPARAMS *pimldp) { - FIXME("STUB: %p %p\n", iface, pimldp); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST old_himl = 0; + int ret = 0; + + if (!pimldp) + return E_FAIL; + + /* As far as I can tell, Windows simply ignores the contents of pimldp->himl + so we shall simulate the same */ + old_himl = pimldp->himl; + pimldp->himl = This; + + ret = ImageList_DrawIndirect(pimldp); + + pimldp->himl = old_himl; + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) @@ -3054,15 +3079,24 @@ static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags, HICON *picon) { - FIXME("STUB: %p %d %x %p\n", iface, i, flags, picon); - return E_NOTIMPL; + HICON hIcon; + + if (!picon) + return E_FAIL; + + hIcon = ImageList_GetIcon((HIMAGELIST) iface, i, flags); + + if (hIcon == NULL) + return E_FAIL; + + *picon = hIcon; + return S_OK; } static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList *iface, int i, IMAGEINFO *pImageInfo) { - FIXME("STUB: %p %d %p\n", iface, i, pImageInfo); - return E_NOTIMPL; + return ImageList_GetImageInfo((HIMAGELIST) iface, i, pImageInfo) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst,

1 0

Owen Rudge : comctl32/tests: Add further tests for IImageList.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: b37009ee80ae167c91ae0c3d5c5a0c768210c7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37009ee80ae167c91ae0c3d5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Nov 13 11:14:34 2009 -0600 comctl32/tests: Add further tests for IImageList. --- dlls/comctl32/tests/imagelist.c | 80 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index be1c079..942590e 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1344,6 +1344,85 @@ static void DoTest1_v6(void) ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); } +static void DoTest3_v6(void) +{ + IImageList *imgl; + HIMAGELIST himl; + + HBITMAP hbm1; + HBITMAP hbm2; + HBITMAP hbm3; + + IMAGELISTDRAWPARAMS imldp; + HWND hwndfortest; + HDC hdc; + int ret; + + hwndfortest = create_a_window(); + hdc = GetDC(hwndfortest); + ok(hdc!=NULL, "couldn't get DC\n"); + + /* create an imagelist to play with */ + himl = ImageList_Create(48,48,0x10,0,3); + ok(himl!=0,"failed to create imagelist\n"); + + imgl = (IImageList *) himl; + + /* load the icons to add to the image list */ + hbm1 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm1 != 0, "no bitmap 1\n"); + hbm2 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm2 != 0, "no bitmap 2\n"); + hbm3 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm3 != 0, "no bitmap 3\n"); + + /* add three */ + ok(SUCCEEDED(IImageList_Add(imgl, hbm1, 0, &ret)) && (ret == 0), "failed to add bitmap 1\n"); + ok(SUCCEEDED(IImageList_Add(imgl, hbm2, 0, &ret)) && (ret == 1), "failed to add bitmap 2\n"); + + ok(SUCCEEDED(IImageList_SetImageCount(imgl, 3)), "Setimage count failed\n"); + ok(SUCCEEDED(IImageList_Replace(imgl, 2, hbm3, 0)), "failed to replace bitmap 3\n"); + + memset(&imldp, 0, sizeof (imldp)); + ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero data succeeded!\n"); + imldp.cbSize = sizeof (imldp); + ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero hdc succeeded!\n"); + imldp.hdcDst = hdc; + ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero himl succeeded!\n"); + + REDRAW(hwndfortest); + WAIT; + + imldp.fStyle = SRCCOPY; + imldp.rgbBk = CLR_DEFAULT; + imldp.rgbFg = CLR_DEFAULT; + imldp.y = 100; + imldp.x = 100; + ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); + imldp.i ++; + ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); + imldp.i ++; + ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); + imldp.i ++; + ok(!SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should fail\n"); + + /* remove three */ + ok(SUCCEEDED(IImageList_Remove(imgl, 0)), "removing 1st bitmap\n"); + ok(SUCCEEDED(IImageList_Remove(imgl, 0)), "removing 2nd bitmap\n"); + ok(SUCCEEDED(IImageList_Remove(imgl, 0)), "removing 3rd bitmap\n"); + + /* destroy it */ + ok(SUCCEEDED(IImageList_Release(imgl)), "release imagelist failed\n"); + + /* bitmaps should not be deleted by the imagelist */ + ok(DeleteObject(hbm1),"bitmap 1 can't be deleted\n"); + ok(DeleteObject(hbm2),"bitmap 2 can't be deleted\n"); + ok(DeleteObject(hbm3),"bitmap 3 can't be deleted\n"); + + ReleaseDC(hwndfortest, hdc); + DestroyWindow(hwndfortest); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1389,6 +1468,7 @@ START_TEST(imagelist) test_shell_imagelist(); test_iimagelist(); DoTest1_v6(); + DoTest3_v6(); CoUninitialize();

1 0

Owen Rudge : comctl32: Implement Copy, Merge and Clone methods in IImageList.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 76c7f280505fe6dc06068e320f3570eb87d03324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c7f280505fe6dc06068e320… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Nov 13 11:14:38 2009 -0600 comctl32: Implement Copy, Merge and Clone methods in IImageList. --- dlls/comctl32/imagelist.c | 61 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 0f2d042..71f77b0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3102,23 +3102,70 @@ static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList *iface, int i, static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, IUnknown *punkSrc, int iSrc, UINT uFlags) { - FIXME("STUB: %p %d %p %d %x\n", iface, iDst, punkSrc, iSrc, uFlags); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + IImageList *src = NULL; + HRESULT ret; + + if (!punkSrc) + return E_FAIL; + + /* TODO: Add test for IID_ImageList2 too */ + if (!SUCCEEDED(IImageList_QueryInterface(punkSrc, &IID_IImageList, + (void **) &src))) + return E_FAIL; + + if (ImageList_Copy(This, iDst, (HIMAGELIST) src, iSrc, uFlags)) + ret = S_OK; + else + ret = E_FAIL; + + IImageList_Release(src); + return ret; } static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, IUnknown *punk2, int i2, int dx, int dy, REFIID riid, PVOID *ppv) { - FIXME("STUB: %p %d %p %d %d %d %s %p\n", iface, i1, punk2, i2, dx, dy, - debugstr_guid(riid), ppv); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + IImageList *iml2 = NULL; + HIMAGELIST hNew; + HRESULT ret = E_FAIL; + + if (!punk2 || !ppv) + return E_FAIL; + + /* TODO: Add test for IID_ImageList2 too */ + if (!SUCCEEDED(IImageList_QueryInterface(punk2, &IID_IImageList, + (void **) &iml2))) + return E_FAIL; + + hNew = ImageList_Merge(This, i1, (HIMAGELIST) iml2, i2, dx, dy); + + /* Get the interface for the new image list */ + if (hNew) + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + IImageList_Release(iml2); + return ret; } static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, PVOID *ppv) { - FIXME("STUB: %p %s %p\n", iface, debugstr_guid(riid), ppv); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST hNew; + HRESULT ret = E_FAIL; + + if (!ppv) + return E_FAIL; + + hNew = ImageList_Duplicate(This); + + /* Get the interface for the new image list */ + if (hNew) + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + return ret; } static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i,

1 0

Eric Pouech : msvcrt: In undname helpers, allow str_array_push to return errors (instead of asserting).
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c65106e1d57882e94cb0816f19c69c6eeecebdcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65106e1d57882e94cb0816f1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 15 22:07:38 2009 +0100 msvcrt: In undname helpers, allow str_array_push to return errors (instead of asserting). --- dlls/msvcrt/undname.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d825cfc..119b44d 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -181,12 +181,13 @@ static void str_array_init(struct array* a) * str_array_push * Adding a new string to an array */ -static void str_array_push(struct parsed_symbol* sym, const char* ptr, int len, +static BOOL str_array_push(struct parsed_symbol* sym, const char* ptr, int len, struct array* a) { assert(ptr); assert(a); - assert(a->num < MAX_ARRAY_ELTS); + if (a->num >= MAX_ARRAY_ELTS) return FALSE; + if (len == -1) len = strlen(ptr); a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); @@ -205,6 +206,8 @@ static void str_array_push(struct parsed_symbol* sym, const char* ptr, int len, TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } } + + return TRUE; } /****************************************************************** @@ -365,8 +368,9 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t return NULL; /* 'void' terminates an argument list in a function */ if (z_term && !strcmp(ct.left, "void")) break; - str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, - &arg_collect); + if (!str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, + &arg_collect)) + return NULL; if (!strcmp(ct.left, "...")) break; } /* Functions are always terminated by 'Z'. If we made it this far and @@ -496,7 +500,8 @@ static char* get_literal_string(struct parsed_symbol* sym) } } while (*++sym->current != '@'); sym->current++; - str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names); + if (!str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names)) + return NULL; return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); } @@ -564,17 +569,17 @@ static BOOL get_class(struct parsed_symbol* sym) if (*++sym->current == '$') { sym->current++; - if ((name = get_template_name(sym))) - str_array_push(sym, name, -1, &sym->names); + if ((name = get_template_name(sym)) && + !str_array_push(sym, name, -1, &sym->names)) + return FALSE; } break; default: name = get_literal_string(sym); break; } - if (!name) + if (!name || !str_array_push(sym, name, -1, &sym->stack)) return FALSE; - str_array_push(sym, name, -1, &sym->stack); } sym->current++; return TRUE; @@ -918,8 +923,9 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (add_pmt && pmt_ref && in_args) { /* left and right are pushed as two separate strings */ - str_array_push(sym, ct->left ? ct->left : "", -1, pmt_ref); - str_array_push(sym, ct->right ? ct->right : "", -1, pmt_ref); + if (!str_array_push(sym, ct->left ? ct->left : "", -1, pmt_ref) || + !str_array_push(sym, ct->right ? ct->right : "", -1, pmt_ref)) + return FALSE; } done: @@ -1334,7 +1340,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) ret = TRUE; goto done; default: - str_array_push(sym, function_name, -1, &sym->stack); + if (!str_array_push(sym, function_name, -1, &sym->stack)) + return FALSE; break; } }

1 0