January 2011 - Wine-commits

Alexander Scott-Johns : user32/tests: Test getting the data from synthesized clipboard formats.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 198a55bd6e7969f611b1f6ff1a077c1e56bb146a URL: http://source.winehq.org/git/wine.git/?a=commit;h=198a55bd6e7969f611b1f6ff1… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 13:05:29 2011 +0000 user32/tests: Test getting the data from synthesized clipboard formats. --- dlls/user32/tests/clipboard.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5b0f17e..781334e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -216,6 +216,7 @@ static void test_synthesized(void) HENHMETAFILE emf; BOOL r; UINT cf; + HANDLE data; htext = create_text(); emf = create_emf(); @@ -235,15 +236,21 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); cf = EnumClipboardFormats(0); ok(cf == CF_TEXT, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == CF_ENHMETAFILE, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); todo_wine ok(cf == CF_LOCALE, "cf %08x\n", cf); if(cf == CF_LOCALE) cf = EnumClipboardFormats(cf); ok(cf == CF_OEMTEXT, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == CF_UNICODETEXT || @@ -253,6 +260,8 @@ static void test_synthesized(void) if(cf == CF_UNICODETEXT) cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + data = GetClipboardData(cf); + todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf);

1 0

Alexander Scott-Johns : winex11.drv: Implement synthesizing the CF_ENHMETAFILE clipboard format from CF_METAFILEPICT .
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 42fc3b64302699ed5a4a27d7fee5b55c0eb54e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fc3b64302699ed5a4a27d7f… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 17:54:21 2011 +0000 winex11.drv: Implement synthesizing the CF_ENHMETAFILE clipboard format from CF_METAFILEPICT. --- dlls/winex11.drv/clipboard.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index fcec86b..c3f1b55 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -179,6 +179,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedFormat(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display); +static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); /* Clipboard formats @@ -887,12 +888,15 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedFormat(Display *display, LPWINE_CL break; case CF_ENHMETAFILE: + bret = X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile( display ); + break; + case CF_METAFILEPICT: - FIXME("Synthesizing wFormatID(0x%08x) not implemented\n", wFormatID); + FIXME("Synthesizing CF_METAFILEPICT not implemented\n"); break; default: - FIXME("Called to synthesize unknown format\n"); + FIXME("Called to synthesize unknown format 0x%08x\n", wFormatID); break; } } @@ -1088,6 +1092,53 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) /************************************************************************** + * X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile + */ +static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display) +{ + LPWINE_CLIPDATA lpSource = NULL; + + TRACE("\n"); + + if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_ENHMETAFILE)) && lpSource->hData) + return TRUE; + /* If we have a MF pict and it's not synthesized or it has been rendered */ + else if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_METAFILEPICT)) && + (!(lpSource->wFlags & CF_FLAG_SYNTHESIZED) || lpSource->hData)) + { + /* Render source if required */ + if (lpSource->hData || X11DRV_CLIPBOARD_RenderFormat(display, lpSource)) + { + METAFILEPICT *pmfp; + HENHMETAFILE hData = NULL; + + pmfp = GlobalLock(lpSource->hData); + if (pmfp) + { + UINT size_mf_bits = GetMetaFileBitsEx(pmfp->hMF, 0, NULL); + void *mf_bits = HeapAlloc(GetProcessHeap(), 0, size_mf_bits); + if (mf_bits) + { + GetMetaFileBitsEx(pmfp->hMF, size_mf_bits, mf_bits); + hData = SetWinMetaFileBits(size_mf_bits, mf_bits, NULL, pmfp); + HeapFree(GetProcessHeap(), 0, mf_bits); + } + GlobalUnlock(lpSource->hData); + } + + if (hData) + { + X11DRV_CLIPBOARD_InsertClipboardData(CF_ENHMETAFILE, hData, 0, NULL, TRUE); + return TRUE; + } + } + } + + return FALSE; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_ImportXAString * * Import XA_STRING, converting the string to CF_TEXT.

1 0

Detlef Riekenberg : msvcrt: Add private define and header tests for _set_error_mode options.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 58786dc8ea237cf646e62edb865dc260684eb784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58786dc8ea237cf646e62edb8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 28 15:49:27 2011 +0100 msvcrt: Add private define and header tests for _set_error_mode options. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/tests/headers.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5176802..5544722 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -568,6 +568,8 @@ struct MSVCRT__stat64 { #define MSVCRT__USEDENTRY 1 #define MSVCRT__OUT_TO_DEFAULT 0 +#define MSVCRT__OUT_TO_STDERR 1 +#define MSVCRT__OUT_TO_MSGBOX 2 #define MSVCRT__REPORT_ERRMODE 3 /* ASCII char classification table - binary compatible */ diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index f02b61f..25e2277 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -340,6 +340,8 @@ static void test_defines(void) CHECK_DEF(_FREEENTRY); CHECK_DEF(_USEDENTRY); CHECK_DEF(_OUT_TO_DEFAULT); + CHECK_DEF(_OUT_TO_STDERR); + CHECK_DEF(_OUT_TO_MSGBOX); CHECK_DEF(_REPORT_ERRMODE); CHECK_DEF(_UPPER); CHECK_DEF(_LOWER);

1 0

Alexander Scott-Johns : ole32: Add support for rendering METAFILEPICT clipboard objects.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 0f4fbd30f6bf3d2ef471d3d75307c7fa8a7df137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4fbd30f6bf3d2ef471d3d75… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 15:09:21 2011 +0000 ole32: Add support for rendering METAFILEPICT clipboard objects. --- dlls/ole32/clipboard.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 67b4350..9110f27 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -478,6 +478,62 @@ static HRESULT dup_global_mem( HGLOBAL src, DWORD flags, HGLOBAL *dst ) return S_OK; } +/*********************************************************************** + * dup_metafilepict + * + * Helper function to duplicate a handle to a METAFILEPICT, and the + * contained HMETAFILE. + */ +static HRESULT dup_metafilepict(HGLOBAL src, HGLOBAL *pdest) +{ + HRESULT hr; + HGLOBAL dest; + METAFILEPICT *dest_ptr; + + *pdest = NULL; + + /* Copy the METAFILEPICT structure. */ + hr = dup_global_mem(src, GMEM_DDESHARE|GMEM_MOVEABLE, &dest); + if (FAILED(hr)) return hr; + + dest_ptr = GlobalLock(dest); + if (!dest_ptr) return E_FAIL; + + /* Give the new METAFILEPICT a separate HMETAFILE. */ + dest_ptr->hMF = CopyMetaFileW(dest_ptr->hMF, NULL); + if (dest_ptr->hMF) + { + GlobalUnlock(dest); + *pdest = dest; + return S_OK; + } + else + { + GlobalUnlock(dest); + GlobalFree(dest); + return E_FAIL; + } +} + +/*********************************************************************** + * free_metafilepict + * + * Helper function to GlobalFree a handle to a METAFILEPICT, and also + * free the contained HMETAFILE. + */ +static void free_metafilepict(HGLOBAL src) +{ + METAFILEPICT *src_ptr; + + src_ptr = GlobalLock(src); + if (src_ptr) + { + DeleteMetaFile(src_ptr->hMF); + GlobalUnlock(src); + } + GlobalFree(src); +} + /************************************************************ * render_embed_source_hack * @@ -744,6 +800,9 @@ static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL * return hr; } +/*************************************************************************** + * get_data_from_enhmetafile + */ static HRESULT get_data_from_enhmetafile(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) { HENHMETAFILE copy; @@ -768,6 +827,34 @@ static HRESULT get_data_from_enhmetafile(IDataObject *data, FORMATETC *fmt, HGLO return hr; } +/*************************************************************************** + * get_data_from_metafilepict + */ +static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) +{ + HGLOBAL copy; + HRESULT hr; + FORMATETC mem_fmt; + STGMEDIUM med; + + *mem = NULL; + + mem_fmt = *fmt; + mem_fmt.tymed = TYMED_MFPICT; + + hr = IDataObject_GetData(data, &mem_fmt, &med); + if(FAILED(hr)) return hr; + + hr = dup_metafilepict(med.u.hMetaFilePict, &copy); + if(FAILED(hr)) return hr; + + *mem = copy; + + ReleaseStgMedium(&med); + + return hr; +} + /*********************************************************************** * render_format * @@ -801,6 +888,11 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { hr = get_data_from_enhmetafile(data, fmt, &clip_data); } + else if(fmt->tymed & TYMED_MFPICT) + { + /* Returns global handle to METAFILEPICT, containing a copied HMETAFILE */ + hr = get_data_from_metafilepict(data, fmt, &clip_data); + } else { FIXME("Unhandled tymed %x\n", fmt->tymed); @@ -812,7 +904,10 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) if ( !SetClipboardData(fmt->cfFormat, clip_data) ) { WARN("() : Failed to set rendered clipboard data into clipboard!\n"); - GlobalFree(clip_data); + if(fmt->tymed & TYMED_MFPICT) + free_metafilepict(clip_data); + else + GlobalFree(clip_data); hr = CLIPBRD_E_CANT_SET; } }

1 0

Alexander Scott-Johns : ole32: Add support for rendering HBITMAP clipboard objects.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: d73db9710438211fa26e0db807105a74e9bb7042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73db9710438211fa26e0db80… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 03:12:20 2011 +0000 ole32: Add support for rendering HBITMAP clipboard objects. --- dlls/ole32/clipboard.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9110f27..b59b554 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -534,6 +534,36 @@ static void free_metafilepict(HGLOBAL src) GlobalFree(src); } +/*********************************************************************** + * dup_bitmap + * + * Helper function to duplicate an HBITMAP. + */ +static HRESULT dup_bitmap(HBITMAP src, HBITMAP *pdest) +{ + HDC src_dc; + HGDIOBJ orig_src_bitmap; + BITMAP bm; + HBITMAP dest; + + src_dc = CreateCompatibleDC(NULL); + orig_src_bitmap = SelectObject(src_dc, src); + GetObjectW(src, sizeof bm, &bm); + dest = CreateCompatibleBitmap(src_dc, bm.bmWidth, bm.bmHeight); + if (dest) + { + HDC dest_dc = CreateCompatibleDC(NULL); + HGDIOBJ orig_dest_bitmap = SelectObject(dest_dc, dest); + BitBlt(dest_dc, 0, 0, bm.bmWidth, bm.bmHeight, src_dc, 0, 0, SRCCOPY); + SelectObject(dest_dc, orig_dest_bitmap); + DeleteDC(dest_dc); + } + SelectObject(src_dc, orig_src_bitmap); + DeleteDC(src_dc); + *pdest = dest; + return dest ? S_OK : E_FAIL; +} + /************************************************************ * render_embed_source_hack * @@ -855,6 +885,37 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL return hr; } +/*************************************************************************** + * get_data_from_bitmap + * + * Returns bitmap in an HBITMAP. + */ +static HRESULT get_data_from_bitmap(IDataObject *data, FORMATETC *fmt, HBITMAP *hbm) +{ + HBITMAP copy; + HRESULT hr; + FORMATETC mem_fmt; + STGMEDIUM med; + + *hbm = NULL; + + mem_fmt = *fmt; + mem_fmt.tymed = TYMED_GDI; + + hr = IDataObject_GetData(data, &mem_fmt, &med); + if(FAILED(hr)) return hr; + + hr = dup_bitmap(med.u.hBitmap, &copy); + if(FAILED(hr)) return hr; + + if(hbm) *hbm = copy; + else hr = E_FAIL; + + ReleaseStgMedium(&med); + + return hr; +} + /*********************************************************************** * render_format * @@ -863,7 +924,7 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL */ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { - HGLOBAL clip_data = NULL; + HANDLE clip_data = NULL; /* HGLOBAL unless otherwise specified */ HRESULT hr; /* Embed source hack */ @@ -893,6 +954,11 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) /* Returns global handle to METAFILEPICT, containing a copied HMETAFILE */ hr = get_data_from_metafilepict(data, fmt, &clip_data); } + else if(fmt->tymed & TYMED_GDI) + { + /* Returns HBITMAP not HGLOBAL */ + hr = get_data_from_bitmap(data, fmt, (HBITMAP *)&clip_data); + } else { FIXME("Unhandled tymed %x\n", fmt->tymed); @@ -906,6 +972,8 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) WARN("() : Failed to set rendered clipboard data into clipboard!\n"); if(fmt->tymed & TYMED_MFPICT) free_metafilepict(clip_data); + else if(fmt->tymed & TYMED_GDI) + DeleteObject(clip_data); else GlobalFree(clip_data); hr = CLIPBRD_E_CANT_SET;

1 0

Stefan Reimer : wined3d: Adding AMD HD5670, HD5570, HD5550, HD5450 detection.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 1c2557787323e4ab8afd5cfd5975bdf0b10e5ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2557787323e4ab8afd5cfd5… Author: Stefan Reimer <it(a)stefanreimer.de> Date: Thu Jan 27 13:05:13 2011 -0800 wined3d: Adding AMD HD5670, HD5570, HD5550, HD5450 detection. --- dlls/wined3d/directx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 85d50ec..5b80da0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1600,6 +1600,10 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in {"HD 5770", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER XT */ {"HD 5750", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER LE */ {"HD 5700", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER HD57xx generic renderer string */ + {"HD 5670", CARD_ATI_RADEON_HD5600}, /* Radeon EG REDWOOD XT */ + {"HD 5570", CARD_ATI_RADEON_HD5600}, /* Radeon EG REDWOOD PRO mapped to HD5600 series */ + {"HD 5550", CARD_ATI_RADEON_HD5600}, /* Radeon EG REDWOOD LE mapped to HD5600 series */ + {"HD 5450", CARD_ATI_RADEON_HD5400}, /* Radeon EG CEDAR PRO */ /* R700 */ {"HD 4890", CARD_ATI_RADEON_HD4800}, /* Radeon RV790 */ {"HD 4870", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */

1 0

Alexandre Julliard : user32: Propagate the LoadImage flags into the low-level loader functions.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: ab4a5a327d5ddc6c97c79733fd1060c7e023856c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4a5a327d5ddc6c97c79733f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 12:42:56 2011 +0100 user32: Propagate the LoadImage flags into the low-level loader functions. --- dlls/user32/cursoricon.c | 51 +++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fcb5d75..dd5d1bb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -413,7 +413,7 @@ typedef BOOL (*fnGetCIEntry)( LPCVOID dir, int n, * Find the icon closest to the requested size and bit depth. */ static int CURSORICON_FindBestIcon( LPCVOID dir, fnGetCIEntry get_entry, - int width, int height, int depth ) + int width, int height, int depth, UINT loadflags ) { int i, cx, cy, bits, bestEntry = -1; UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; @@ -475,7 +475,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, int n, * FIXME: parameter 'color' ignored. */ static int CURSORICON_FindBestCursor( LPCVOID dir, fnGetCIEntry get_entry, - int width, int height, int depth ) + int width, int height, int depth, UINT loadflags ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -530,22 +530,24 @@ static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, int n, } static const CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( const CURSORICONDIR * dir, - int width, int height, int depth ) + int width, int height, int depth, + UINT loadflags ) { int n; n = CURSORICON_FindBestIcon( dir, CURSORICON_GetResIconEntry, - width, height, depth ); + width, height, depth, loadflags ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static const CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( const CURSORICONDIR *dir, - int width, int height, int depth ) + int width, int height, int depth, + UINT loadflags ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, - width, height, depth ); + width, height, depth, loadflags ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -570,20 +572,22 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, int n, } static const CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( const CURSORICONFILEDIR *dir, - int width, int height, int depth ) + int width, int height, int depth, + UINT loadflags ) { - int n = CURSORICON_FindBestCursor( (LPCVOID) dir, CURSORICON_GetFileEntry, - width, height, depth ); + int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, + width, height, depth, loadflags ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static const CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( const CURSORICONFILEDIR *dir, - int width, int height, int depth ) + int width, int height, int depth, + UINT loadflags ) { - int n = CURSORICON_FindBestIcon((LPCVOID) dir, CURSORICON_GetFileEntry, - width, height, depth ); + int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, + width, height, depth, loadflags ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -945,7 +949,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * \- CHUNK:icon */ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, - INT width, INT height, INT depth ) + INT width, INT height, INT depth, UINT loadflags ) { struct cursoricon_object *info; ani_header header = {0}; @@ -1003,7 +1007,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, const BITMAPINFO *bmi; entry = CURSORICON_FindBestIconFile((const CURSORICONFILEDIR *) icon_data, - width, height, depth ); + width, height, depth, loadflags ); bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); info->hotspot.x = entry->xHotspot; @@ -1131,8 +1135,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, /* Check for .ani. */ if (memcmp( bits, "RIFF", 4 ) == 0) { - hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, - depth ); + hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, depth, loadflags ); goto end; } @@ -1144,9 +1147,9 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorFile( dir, width, height, depth, loadflags ); else - entry = CURSORICON_FindBestIconFile( dir, width, height, depth ); + entry = CURSORICON_FindBestIconFile( dir, width, height, depth, loadflags ); if ( !entry ) goto end; @@ -1207,9 +1210,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth, loadflags ); else - dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth, loadflags ); if (!dirEntry) return 0; wResId = dirEntry->wResId; FreeResource( handle ); @@ -1548,9 +1551,9 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, ReleaseDC(0, hdc); if( bIcon ) - entry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + entry = CURSORICON_FindBestIconRes( dir, width, height, depth, LR_DEFAULTSIZE ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorRes( dir, width, height, depth, LR_DEFAULTSIZE ); if( entry ) retVal = entry->wResId; } @@ -1563,9 +1566,7 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, */ INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon ) { - return LookupIconIdFromDirectoryEx( dir, bIcon, - bIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR), - bIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), bIcon ? 0 : LR_MONOCHROME ); + return LookupIconIdFromDirectoryEx( dir, bIcon, 0, 0, bIcon ? 0 : LR_MONOCHROME ); } /***********************************************************************

1 0

Alexandre Julliard : user32: Fix LoadImage behavior with zero size and no LR_DEFAULTSIZE.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 76fb69bf3da2b179bbd54b4eeeb3726788be4559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fb69bf3da2b179bbd54b4ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 12:44:21 2011 +0100 user32: Fix LoadImage behavior with zero size and no LR_DEFAULTSIZE. Based on a patch by Marcus Meissner. --- dlls/user32/cursoricon.c | 48 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index dd5d1bb..d014711 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -422,7 +422,20 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, fnGetCIEntry get_entry, /* Find Best Fit */ iTotalDiff = 0xFFFFFFFF; iColorDiff = 0xFFFFFFFF; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + + if (loadflags & LR_DEFAULTSIZE) + { + if (!width) width = GetSystemMetrics( SM_CXICON ); + if (!height) height = GetSystemMetrics( SM_CYICON ); + } + else if (!width && !height) + { + /* use the size of the first entry */ + if (!get_entry( dir, 0, &width, &height, &bits )) return -1; + iTotalDiff = 0; + } + + for ( i = 0; iTotalDiff && get_entry( dir, i, &cx, &cy, &bits ); i++ ) { iTempXDiff = abs(width - cx); iTempYDiff = abs(height - cy); @@ -479,6 +492,18 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, fnGetCIEntry get_entry, { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; + if (loadflags & LR_DEFAULTSIZE) + { + if (!width) width = GetSystemMetrics( SM_CXCURSOR ); + if (!height) height = GetSystemMetrics( SM_CYCURSOR ); + } + else if (!width && !height) + { + /* use the first entry */ + if (!get_entry( dir, 0, &width, &height, &bits )) return -1; + return 0; + } + /* Double height to account for AND and XOR masks */ height *= 2; @@ -782,8 +807,16 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCW return 0; } - if (!width) width = bmi->bmiHeader.biWidth; - if (!height) height = bmi->bmiHeader.biHeight/2; + if (cFlag & LR_DEFAULTSIZE) + { + if (!width) width = GetSystemMetrics( bIcon ? SM_CXICON : SM_CXCURSOR ); + if (!height) height = GetSystemMetrics( bIcon ? SM_CYICON : SM_CYCURSOR ); + } + else + { + if (!width) width = bmi->bmiHeader.biWidth; + if (!height) height = bmi->bmiHeader.biHeight/2; + } do_stretch = (bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width); @@ -2274,15 +2307,6 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_DEFAULTSIZE) { - if (type == IMAGE_ICON) { - if (!desiredx) desiredx = GetSystemMetrics(SM_CXICON); - if (!desiredy) desiredy = GetSystemMetrics(SM_CYICON); - } else if (type == IMAGE_CURSOR) { - if (!desiredx) desiredx = GetSystemMetrics(SM_CXCURSOR); - if (!desiredy) desiredy = GetSystemMetrics(SM_CYCURSOR); - } - } if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; switch (type) { case IMAGE_BITMAP:

1 0

Kusanagi Kouichi : gdi32/tests: Add some more tests for GetCharABCWidthsA.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: c706ecea82d7a4d664dae298ac6d4491d8fe0f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c706ecea82d7a4d664dae298a… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 27 01:08:57 2011 +0900 gdi32/tests: Add some more tests for GetCharABCWidthsA. --- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fa9df33..564a420 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -925,13 +925,15 @@ static void test_GetCharABCWidths(void) UINT cs; UINT a; UINT w; + BOOL r[10]; } c[] = { - {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, - {HANGEUL_CHARSET, 0x8141, 0xac02}, - {JOHAB_CHARSET, 0x8446, 0x3135}, - {GB2312_CHARSET, 0x8141, 0x4e04}, - {CHINESEBIG5_CHARSET, 0xa142, 0x3001} + {ANSI_CHARSET, 0x30, 0x30, {TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {SHIFTJIS_CHARSET, 0x82a0, 0x3042, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {HANGEUL_CHARSET, 0x8141, 0xac02, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {JOHAB_CHARSET, 0x8446, 0x3135, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {GB2312_CHARSET, 0x8141, 0x4e04, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}} }; UINT i; @@ -1005,6 +1007,45 @@ static void test_GetCharABCWidths(void) ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); + ret = pGetCharABCWidthsA(hdc, 0xff, 0xff, abc); + ok(ret == c[i].r[0], "GetCharABCWidthsA should have %s\n", c[i].r[0] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0x100, 0x100, abc); + todo_wine + ok(ret == c[i].r[1], "GetCharABCWidthsA should have %s\n", c[i].r[1] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xff, 0x100, a); + todo_wine + ok(ret == c[i].r[2], "GetCharABCWidthsA should have %s\n", c[i].r[2] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xffff, 0xffff, abc); + todo_wine + ok(ret == c[i].r[3], "GetCharABCWidthsA should have %s\n", c[i].r[3] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0x10000, 0x10000, abc); + todo_wine + ok(ret == c[i].r[4], "GetCharABCWidthsA should have %s\n", c[i].r[4] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xffff, 0x10000, a); + todo_wine + ok(ret == c[i].r[5], "GetCharABCWidthsA should have %s\n", c[i].r[5] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xffffff, 0xffffff, abc); + todo_wine + ok(ret == c[i].r[6], "GetCharABCWidthsA should have %s\n", c[i].r[6] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0x1000000, 0x1000000, abc); + todo_wine + ok(ret == c[i].r[7], "GetCharABCWidthsA should have %s\n", c[i].r[7] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xffffff, 0x1000000, a); + todo_wine + ok(ret == c[i].r[8], "GetCharABCWidthsA should have %s\n", c[i].r[8] ? "succeeded" : "failed"); + + ret = pGetCharABCWidthsA(hdc, 0xffffffff, 0xffffffff, abc); + todo_wine + ok(ret == c[i].r[9], "GetCharABCWidthsA should have %s\n", c[i].r[9] ? "succeeded" : "failed"); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont); }

1 0

Kusanagi Kouichi : gdi32: Reject invalid character range in GetCharABCWidthsA.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: c117d45cb3390d8c12c640ff4191044fd9c8f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c117d45cb3390d8c12c640ff4… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 27 01:09:03 2011 +0900 gdi32: Reject invalid character range in GetCharABCWidthsA. --- dlls/gdi32/font.c | 24 ++++++++++++++++++++---- dlls/gdi32/tests/font.c | 9 --------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5dc2132..b4aa9bc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1553,7 +1553,7 @@ UINT WINAPI GetOutlineTextMetricsW( return ret; } -static LPSTR FONT_GetCharsByRangeA(UINT firstChar, UINT lastChar, PINT pByteLen) +static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT pByteLen) { INT i, count = lastChar - firstChar + 1; UINT c; @@ -1562,6 +1562,22 @@ static LPSTR FONT_GetCharsByRangeA(UINT firstChar, UINT lastChar, PINT pByteLen) if (count <= 0) return NULL; + switch (GdiGetCodePage(hdc)) + { + case 932: + case 936: + case 949: + case 950: + case 1361: + if (lastChar > 0xffff) + return NULL; + break; + default: + if (lastChar > 0xff) + return NULL; + break; + } + str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); if (str == NULL) return NULL; @@ -1620,7 +1636,7 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, LPWSTR wstr; BOOL ret = TRUE; - str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); + str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i); if(str == NULL) return FALSE; @@ -2324,7 +2340,7 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPWSTR wstr; BOOL ret = TRUE; - str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); + str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i); if (str == NULL) return FALSE; @@ -3010,7 +3026,7 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a LPWSTR wstr; BOOL ret = TRUE; - str = FONT_GetCharsByRangeA(first, last, &i); + str = FONT_GetCharsByRangeA(hdc, first, last, &i); if (str == NULL) return FALSE; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 564a420..538e983 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1011,39 +1011,30 @@ static void test_GetCharABCWidths(void) ok(ret == c[i].r[0], "GetCharABCWidthsA should have %s\n", c[i].r[0] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0x100, 0x100, abc); - todo_wine ok(ret == c[i].r[1], "GetCharABCWidthsA should have %s\n", c[i].r[1] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xff, 0x100, a); - todo_wine ok(ret == c[i].r[2], "GetCharABCWidthsA should have %s\n", c[i].r[2] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xffff, 0xffff, abc); - todo_wine ok(ret == c[i].r[3], "GetCharABCWidthsA should have %s\n", c[i].r[3] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0x10000, 0x10000, abc); - todo_wine ok(ret == c[i].r[4], "GetCharABCWidthsA should have %s\n", c[i].r[4] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xffff, 0x10000, a); - todo_wine ok(ret == c[i].r[5], "GetCharABCWidthsA should have %s\n", c[i].r[5] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xffffff, 0xffffff, abc); - todo_wine ok(ret == c[i].r[6], "GetCharABCWidthsA should have %s\n", c[i].r[6] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0x1000000, 0x1000000, abc); - todo_wine ok(ret == c[i].r[7], "GetCharABCWidthsA should have %s\n", c[i].r[7] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xffffff, 0x1000000, a); - todo_wine ok(ret == c[i].r[8], "GetCharABCWidthsA should have %s\n", c[i].r[8] ? "succeeded" : "failed"); ret = pGetCharABCWidthsA(hdc, 0xffffffff, 0xffffffff, abc); - todo_wine ok(ret == c[i].r[9], "GetCharABCWidthsA should have %s\n", c[i].r[9] ? "succeeded" : "failed"); hfont = SelectObject(hdc, hfont);

1 0