March 2008 - Wine-commits - list.winehq.org

Rob Shearman : rpcrt4: Add a stub for RpcCancelThreadEx.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: f15287dea7754f457b701f18a27b1b54f839ccc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15287dea7754f457b701f18a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 17 13:10:14 2008 +0000 rpcrt4: Add a stub for RpcCancelThreadEx. --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 9 +++++++++ include/rpcdce.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index a235302..da54ddf 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -363,7 +363,7 @@ @ stdcall RpcBindingVectorFree(ptr) @ stdcall RpcCancelAsyncCall(ptr long) RpcAsyncCancelCall @ stdcall RpcCancelThread(ptr) -@ stub RpcCancelThreadEx +@ stdcall RpcCancelThreadEx(ptr long) @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW @ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 6ff93f2..4438f52 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -1081,3 +1081,12 @@ RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) return RPC_S_OK; } + +/****************************************************************************** + * RpcCancelThreadEx (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) +{ + FIXME("(%p, %d)\n", ThreadHandle, Timeout); + return RPC_S_OK; +} diff --git a/include/rpcdce.h b/include/rpcdce.h index 1b8b6e7..79716ae 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -469,6 +469,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void*,LONG); RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA( RPC_CSTR protseq );

1 0

Rob Shearman : wininet: The lpszLocalFileName parameter to CommitUrlCacheEntryA is optional, so check before converting it from Unicode to ANSI.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 99f651bd3707b869297da43c32c23606f89a3fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f651bd3707b869297da43c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 17 13:22:14 2008 +0000 wininet: The lpszLocalFileName parameter to CommitUrlCacheEntryA is optional, so check before converting it from Unicode to ANSI. --- dlls/wininet/urlcache.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c5e37d8..429867a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2494,11 +2494,14 @@ BOOL WINAPI CommitUrlCacheEntryA( goto cleanup; MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, url_name, len); - len = MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, NULL, 0); - local_file_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!local_file_name) - goto cleanup; - MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, local_file_name, len); + if (lpszLocalFileName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, NULL, 0); + local_file_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!local_file_name) + goto cleanup; + MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, local_file_name, len); + } if (lpszFileExtension) { len = MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, NULL, 0); @@ -2522,6 +2525,7 @@ BOOL WINAPI CommitUrlCacheEntryA( cleanup: HeapFree(GetProcessHeap(), 0, original_url); + HeapFree(GetProcessHeap(), 0, file_extension); HeapFree(GetProcessHeap(), 0, local_file_name); HeapFree(GetProcessHeap(), 0, url_name);

1 0

Nathan Beckmann : gdiplus: Fix test crash in GdipSaveImageToStream.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 2824aa2d337ff27a87550f8dac7677ad5c67ef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2824aa2d337ff27a87550f8da… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Sat Mar 15 15:05:43 2008 -0700 gdiplus: Fix test crash in GdipSaveImageToStream. Correctly initialized parameters to GetDIBits (based on GdipLockBitmapBits). --- dlls/gdiplus/image.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8307938..f0cc822 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -908,7 +908,9 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, HRESULT hr; short type; HBITMAP hbmp; + HBITMAP old_hbmp; HDC hdc; + int bm_is_selected; BITMAPINFO bmp_info; LPVOID bmp_bits; encode_image_func* encode_image; @@ -917,6 +919,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, unsigned int dummy; int i; + old_hbmp = 0; output = NULL; output_size = 0; @@ -943,18 +946,32 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, hr = IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbmp); if (FAILED(hr) || !hbmp) return GenericError; + hr = IPicture_get_CurDC(image->picture, &hdc); + if (FAILED(hr)) + return GenericError; + bm_is_selected = (hdc != 0); + if (!bm_is_selected) { + hdc = CreateCompatibleDC(0); + old_hbmp = SelectObject(hdc, hbmp); + } /* get bits from HBITMAP */ - hdc = GetDC(0); bmp_info.bmiHeader.biSize = sizeof(bmp_info.bmiHeader); + bmp_info.bmiHeader.biBitCount = 0; GetDIBits(hdc, hbmp, 0, 0, NULL, &bmp_info, DIB_RGB_COLORS); bmp_bits = GdipAlloc(bmp_info.bmiHeader.biSizeImage); - if (!bmp_bits) { - ReleaseDC(0, hdc); - return OutOfMemory; + + if (bmp_bits) + GetDIBits(hdc, hbmp, 0, abs(bmp_info.bmiHeader.biHeight), bmp_bits, &bmp_info, DIB_RGB_COLORS); + + if (!bm_is_selected) { + SelectObject(hdc, old_hbmp); + DeleteDC(hdc); } - GetDIBits(hdc, hbmp, 0, bmp_info.bmiHeader.biHeight, bmp_bits, &bmp_info, DIB_RGB_COLORS); + + if (!bmp_bits) + return OutOfMemory; stat = encode_image(bmp_bits, &bmp_info, &output, &output_size); if (stat == Ok) @@ -962,7 +979,6 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, GdipFree(output); GdipFree(bmp_bits); - ReleaseDC(0, hdc); return stat; }

1 0

Aric Stewart : regedit: Check for unicode file without using fseek.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 58801f0d73deca571b984b1d8d40863d8ea7adef URL: http://source.winehq.org/git/wine.git/?a=commit;h=58801f0d73deca571b984b1d8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 15 16:04:59 2008 +0900 regedit: Check for unicode file without using fseek. --- programs/regedit/regproc.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9ee6765..85ab36b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -484,21 +484,14 @@ void processRegLines(FILE *in) { LPSTR line = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; - BYTE uni[2]; + BOOL unicode_check = TRUE; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); - if (fread(uni, 2, 1, in) == 1) { - if (uni[0] == 0xff && uni[1] == 0xfe) { - printf("Trying to import from a unicode file: this isn't supported yet.\n" - "Please use export as Win 9x/NT4 files from native regedit\n"); - return; - } - fseek(in, -2, SEEK_CUR); - } while (!feof(in)) { LPSTR s; /* The pointer into line for where the current fgets should read */ + LPSTR check; s = line; for (;;) { size_t size_remaining; @@ -527,7 +520,34 @@ void processRegLines(FILE *in) * eof, error, eol or getting the maximum amount. Abort on error. */ size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - if (NULL == fgets (s, size_to_get, in)) { + + if (unicode_check) + { + if (fread( s, 2, 1, in) == 1) + { + if ((BYTE)s[0] == 0xff && (BYTE)s[1] == 0xfe) + { + printf("Trying to import from a unicode file: this isn't supported yet.\n" + "Please use export as Win 9x/NT4 files from native regedit\n"); + HeapFree(GetProcessHeap(), 0, line); + return; + } + else + { + unicode_check = FALSE; + check = fgets (&s[2], size_to_get-2, in); + } + } + else + { + unicode_check = FALSE; + check = NULL; + } + } + else + check = fgets (s, size_to_get, in); + + if (check == NULL) { if (ferror(in)) { perror ("While reading input"); exit (IO_ERROR);

1 0

Cihan Altinay : ddraw: Fix refcounting of palettes.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 49c682470c2425f5716a02b58e5bc5c4ab6c0510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c682470c2425f5716a02b58… Author: Cihan Altinay <bobbyg(a)gmx.net> Date: Sun Mar 16 17:40:29 2008 +0100 ddraw: Fix refcounting of palettes. --- dlls/ddraw/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 8835e4e..9a990d4 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -300,8 +300,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture2, iface); IDirectDrawSurfaceImpl *src_ptr = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture2, D3DTexture2); - IWineD3DPalette *wine_pal, *wine_pal_src; - IDirectDrawPalette *pal = NULL, *pal_src = NULL; HRESULT ret_value = D3D_OK; TRACE("(%p)->(%p)\n", This, src_ptr); @@ -315,6 +313,8 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, while(1) { + IWineD3DPalette *wine_pal, *wine_pal_src; + IDirectDrawPalette *pal = NULL, *pal_src = NULL; DDSURFACEDESC *src_d, *dst_d; TRACE(" copying surface %p to surface %p (mipmap level %d)\n", src_ptr, This, src_ptr->mipmap_level);

1 0

Reece H. Dunn : user32: HiliteMenuItem fails if an invalid window handle is passed to it.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: efd0b9ae7a8d19ee15c11eb6d5b4b3a2bd0bd6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd0b9ae7a8d19ee15c11eb6d… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Mon Mar 17 08:59:16 2008 +0000 user32: HiliteMenuItem fails if an invalid window handle is passed to it. --- dlls/user32/tests/menu.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 99974b0..5f900d0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1874,6 +1874,21 @@ static void test_menu_hilitemenuitem( void ) AppendMenu(hPopupMenu, MF_STRING, 102, "Item 2"); AppendMenu(hPopupMenu, MF_STRING, 103, "Item 3"); + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), + "HiliteMenuItem: Item 2 is hilited\n"); + + SetLastError(0xdeadbeef); + ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE), + "HiliteMenuItem: call should have failed.\n"); + todo_wine + { + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); + } + + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), + "HiliteMenuItem: Item 2 is hilited\n"); + HiliteMenuItem(NULL, hPopupMenu, 0, MF_HILITE); HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE); HiliteMenuItem(NULL, hPopupMenu, 2, MF_HILITE);

1 0

Eric Pouech : richedit: Allow reading an enhanced metafile from an RTF stream.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 4a01ddca2520578f71c10ca90ba5708a442808c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a01ddca2520578f71c10ca90… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:48:29 2008 +0100 richedit: Allow reading an enhanced metafile from an RTF stream. --- dlls/riched20/editor.c | 16 ++++++++++++---- dlls/riched20/reader.c | 1 + dlls/riched20/rtf.h | 35 ++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ec3954b..39980bd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -786,7 +786,7 @@ static void ME_RTFReadPictGroup(RTF_Info *info) METAFILEPICT mfp; HENHMETAFILE hemf; HBITMAP hbmp; - enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_dib} gfx = gfx_unknown; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; RTFGetToken (info); if (info->rtfClass == rtfEOF) @@ -796,13 +796,17 @@ static void ME_RTFReadPictGroup(RTF_Info *info) if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) { mfp.mm = info->rtfParam; - gfx = gfx_enhmetafile; + gfx = gfx_metafile; } else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) { if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); gfx = gfx_dib; } + else if (RTFCheckMM (info, rtfPictAttr, rtfEmfBlip)) + { + gfx = gfx_enhmetafile; + } else { FIXME("%d %d\n", info->rtfMajor, info->rtfMinor); @@ -825,11 +829,11 @@ static void ME_RTFReadPictGroup(RTF_Info *info) } else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) { - if (gfx == gfx_enhmetafile) mfp.xExt = info->rtfParam; + if (gfx == gfx_metafile) mfp.xExt = info->rtfParam; } else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) { - if (gfx == gfx_enhmetafile) mfp.yExt = info->rtfParam; + if (gfx == gfx_metafile) mfp.yExt = info->rtfParam; } else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) sz.cx = info->rtfParam; @@ -869,6 +873,10 @@ static void ME_RTFReadPictGroup(RTF_Info *info) switch (gfx) { case gfx_enhmetafile: + if ((hemf = SetEnhMetaFileBits(bufidx, buffer))) + ME_RTFInsertOleObject(info, hemf, NULL, &sz); + break; + case gfx_metafile: if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) ME_RTFInsertOleObject(info, hemf, NULL, &sz); break; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 4ed7258..1ecca08 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1788,6 +1788,7 @@ static RTFKey rtfKey[] = { rtfPictAttr, rtfWinMetafile, "wmetafile", 0 }, { rtfPictAttr, rtfDevIndBitmap, "dibitmap", 0 }, { rtfPictAttr, rtfWinBitmap, "wbitmap", 0 }, + { rtfPictAttr, rtfEmfBlip, "emfblip", 0 }, { rtfPictAttr, rtfPixelBits, "wbmbitspixel", 0 }, { rtfPictAttr, rtfBitmapPlanes, "wbmplanes", 0 }, { rtfPictAttr, rtfBitmapWid, "wbmwidthbytes", 0 }, diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 3a9c235..8b39f60 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -597,23 +597,24 @@ # define rtfWinMetafile 2 # define rtfDevIndBitmap 3 # define rtfWinBitmap 4 -# define rtfPixelBits 5 -# define rtfBitmapPlanes 6 -# define rtfBitmapWid 7 -# define rtfPicWid 8 -# define rtfPicHt 9 -# define rtfPicGoalWid 10 -# define rtfPicGoalHt 11 -# define rtfPicScaleX 12 -# define rtfPicScaleY 13 -# define rtfPicScaled 14 -# define rtfPicCropTop 15 -# define rtfPicCropBottom 16 -# define rtfPicCropLeft 17 -# define rtfPicCropRight 18 -# define rtfPicMFHasBitmap 19 /* new in 1.10 */ -# define rtfPicMFBitsPerPixel 20 /* new in 1.10 */ -# define rtfPicBinary 21 +# define rtfEmfBlip 5 +# define rtfPixelBits 6 +# define rtfBitmapPlanes 7 +# define rtfBitmapWid 8 +# define rtfPicWid 9 +# define rtfPicHt 10 +# define rtfPicGoalWid 11 +# define rtfPicGoalHt 12 +# define rtfPicScaleX 13 +# define rtfPicScaleY 14 +# define rtfPicScaled 15 +# define rtfPicCropTop 16 +# define rtfPicCropBottom 17 +# define rtfPicCropLeft 18 +# define rtfPicCropRight 19 +# define rtfPicMFHasBitmap 20 /* new in 1.10 */ +# define rtfPicMFBitsPerPixel 21 /* new in 1.10 */ +# define rtfPicBinary 22 # define rtfBookmarkAttr 14 # define rtfBookmarkFirstCol 0

1 0

Jacek Caban : mshtml: Break Wine Gecko 0.0.1 support.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 5f6ce2de632196894d14871fcde0efd255bfd597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ce2de632196894d14871fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 16 23:41:55 2008 +0100 mshtml: Break Wine Gecko 0.0.1 support. --- dlls/mshtml/nsembed.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 37afc6d..efdad04 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -265,9 +265,7 @@ static BOOL load_wine_gecko(PRUnichar *gre_path) if(res != ERROR_SUCCESS) return FALSE; - ret = load_wine_gecko_v(gre_path, hkey, GECKO_VERSION, GECKO_VERSION_STRING) - || load_wine_gecko_v(gre_path, hkey, "0.0.1", "Wine Gecko 0.0.1\n") - || load_wine_gecko_v(gre_path, hkey, NULL, "Wine Gecko 0.0.1\n"); + ret = load_wine_gecko_v(gre_path, hkey, GECKO_VERSION, GECKO_VERSION_STRING); RegCloseKey(hkey); return ret;

1 0

Maarten Lankhorst : dsound: Add an option to mix sound buffers in the mixer again.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 021019ff8fbc49a778abcf7800edacb4fa33068d URL: http://source.winehq.org/git/wine.git/?a=commit;h=021019ff8fbc49a778abcf780… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 3 20:18:04 2008 -0800 dsound: Add an option to mix sound buffers in the mixer again. --- dlls/dsound/buffer.c | 8 ++-- dlls/dsound/dsound_main.c | 61 +++++++++++++++------------------ dlls/dsound/dsound_private.h | 5 ++- dlls/dsound/mixer.c | 77 +++++++++++++++++++++++++++++------------ dlls/dsound/primary.c | 2 +- 5 files changed, 89 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=021019ff8fbc49a778abc…

1 0

Eric Pouech : richedit: Added support for EM_SETTARGETDEVICE with a NULL DC .
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 33d7cea120bd7d37175cd5c89aa2a66d5c909f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d7cea120bd7d37175cd5c89… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:48:05 2008 +0100 richedit: Added support for EM_SETTARGETDEVICE with a NULL DC. --- dlls/riched20/editor.c | 16 ++++++++++++++-- dlls/riched20/editstr.h | 3 ++- dlls/riched20/wrap.c | 12 +++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d472e0f..6c493c2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -114,7 +114,7 @@ + EM_SETSEL + EM_SETSCROLLPOS 3.0 - EM_SETTABSTOPS 3.0 - - EM_SETTARGETDEVICE + - EM_SETTARGETDEVICE (partial) + EM_SETTEXTEX 3.0 (no rich text insertion handling, proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 @@ -1590,6 +1590,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bRedraw = TRUE; + ed->bWordWrap = FALSE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -1901,7 +1902,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETTABSTOPS) - UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(WM_STYLECHANGING) @@ -3188,6 +3188,18 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); return 0; } + case EM_SETTARGETDEVICE: + if (wParam == 0) + { + switch (lParam) + { + case 0: editor->bWordWrap = TRUE; break; + case 1: editor->bWordWrap = FALSE; break; + default: FIXME("Unknown option to EM_SETTARGETDEVICE(NULL,%ld)\n", lParam); + } + } + else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); + break; default: do_default: return DefWindowProcW(hWnd, msg, wParam, lParam); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 7c1fe7f..964f356 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -312,6 +312,7 @@ typedef struct tagME_TextEditor int nZoomNumerator, nZoomDenominator; RECT rcFormat; BOOL bRedraw; + BOOL bWordWrap; int nInvalidOfs; int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; @@ -350,7 +351,7 @@ typedef struct tagME_WrapContext ME_Style *style; ME_Context *context; int nLeftMargin, nRightMargin, nFirstMargin; - int nTotalWidth, nAvailWidth; + int nAvailWidth; int nRow; POINT pt; BOOL bOverflown; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4c24dec..49c5366 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -47,7 +47,11 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; - wc->nAvailWidth = wc->nTotalWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + if (wc->context->editor->bWordWrap) + wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - + (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + else + wc->nAvailWidth = ~0u >> 1; wc->pt.x = 0; } @@ -393,8 +397,10 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.pt.y += border; } - wc.nTotalWidth = c->rcView.right - c->rcView.left; - wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; + if (c->editor->bWordWrap) + wc.nAvailWidth = c->rcView.right - c->rcView.left - wc.nFirstMargin - wc.nRightMargin; + else + wc.nAvailWidth = ~0u >> 1; wc.pRowStart = NULL; linespace = ME_GetParaLineSpace(c, &tp->member.para);

1 0