July 2010 - Wine-Commits - list.winehq.org

Andrey Turkin : oleaut32: Add support for const variables.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: fe7e384e07020a5e6c51b5ba1f928da857928a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7e384e07020a5e6c51b5ba1… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:40:10 2010 +0400 oleaut32: Add support for const variables. --- dlls/oleaut32/typelib2.c | 71 ++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index df060c0..10e26fb 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2026,6 +2026,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + HRESULT status = S_OK; CyclicList *insert; INT *typedata; int var_datawidth; @@ -2079,7 +2080,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* fill out the basic type information */ typedata[0] = 0x14 | (index << 16); typedata[2] = pVarDesc->wVarFlags; - typedata[3] = (sizeof(VARDESC) << 16) | 0; + typedata[3] = (sizeof(VARDESC) << 16) | pVarDesc->varkind; /* update the index data */ insert->indice = 0x40000000 + index; @@ -2091,44 +2092,52 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( &typedata[1], &var_datawidth, &var_alignment, &var_type_size); - /* pad out starting position to data width */ - This->datawidth += var_alignment - 1; - This->datawidth &= ~(var_alignment - 1); - typedata[4] = This->datawidth; - - /* add the new variable to the total data width */ - This->datawidth += var_datawidth; - if(This->dual) - This->dual->datawidth = This->datawidth; + if (pVarDesc->varkind != VAR_CONST) + { + /* pad out starting position to data width */ + This->datawidth += var_alignment - 1; + This->datawidth &= ~(var_alignment - 1); + typedata[4] = This->datawidth; + + /* add the new variable to the total data width */ + This->datawidth += var_datawidth; + if(This->dual) + This->dual->datawidth = This->datawidth; + + /* add type description size to total required allocation */ + typedata[3] += var_type_size << 16; + + /* fix type alignment */ + alignment = (This->typeinfo->typekind >> 11) & 0x1f; + if (alignment < var_alignment) { + alignment = var_alignment; + This->typeinfo->typekind &= ~0xf800; + This->typeinfo->typekind |= alignment << 11; + } - /* add type description size to total required allocation */ - typedata[3] += var_type_size << 16; + /* ??? */ + if (!This->typeinfo->res2) This->typeinfo->res2 = 0x1a; + if ((index == 0) || (index == 1) || (index == 2) || (index == 4) || (index == 9)) { + This->typeinfo->res2 <<= 1; + } - /* fix type alignment */ - alignment = (This->typeinfo->typekind >> 11) & 0x1f; - if (alignment < var_alignment) { - alignment = var_alignment; - This->typeinfo->typekind &= ~0xf800; - This->typeinfo->typekind |= alignment << 11; - } + /* ??? */ + if (This->typeinfo->res3 == -1) This->typeinfo->res3 = 0; + This->typeinfo->res3 += 0x2c; - /* ??? */ - if (!This->typeinfo->res2) This->typeinfo->res2 = 0x1a; - if ((index == 0) || (index == 1) || (index == 2) || (index == 4) || (index == 9)) { - This->typeinfo->res2 <<= 1; + /* pad data width to alignment */ + This->typeinfo->size = (This->datawidth + (alignment - 1)) & ~(alignment - 1); + } else { + VARIANT *value = pVarDesc->DUMMYUNIONNAME.lpvarValue; + status = ctl2_encode_variant(This->typelib, typedata+4, value, V_VT(value)); + /* ??? native sets size 0x34 */ + typedata[3] += 0x10 << 16; } - /* ??? */ - if (This->typeinfo->res3 == -1) This->typeinfo->res3 = 0; - This->typeinfo->res3 += 0x2c; - /* increment the number of variable elements */ This->typeinfo->cElement += 0x10000; - /* pad data width to alignment */ - This->typeinfo->size = (This->datawidth + (alignment - 1)) & ~(alignment - 1); - - return S_OK; + return status; } /******************************************************************************

1 0

David Hedberg : shell32/tests: Try harder to subclass the listview.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 1d658d4bb78d2476c467da420088a9ffc74767f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d658d4bb78d2476c467da420… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 18 14:51:48 2010 +0200 shell32/tests: Try harder to subclass the listview. --- dlls/shell32/tests/shlview.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index e3e0ef2..e86518d 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -78,6 +78,16 @@ static HWND subclass_listview(HWND hwnd) /* listview is a first child */ listview = FindWindowExA(hwnd, NULL, WC_LISTVIEWA, NULL); + if(!listview) + { + /* .. except for some versions of Windows XP, where things + are slightly more complicated. */ + HWND hwnd_tmp; + hwnd_tmp = FindWindowExA(hwnd, NULL, "DUIViewWndClassName", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "DirectUIHWND", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "CtrlNotifySink", NULL); + listview = FindWindowExA(hwnd_tmp, NULL, WC_LISTVIEWA, NULL); + } oldproc = (WNDPROC)SetWindowLongPtrA(listview, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc);

1 0

Mike Kaplinskiy : server: Forward the correct error to asyncs.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 8d9fbe59b303e8da9062f9de12a20f5dafc07a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9fbe59b303e8da9062f9de1… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:58 2010 -0400 server: Forward the correct error to asyncs. --- server/sock.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 568f818..e5681b0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -295,7 +295,7 @@ static inline int sock_error( struct fd *fd ) return optval; } -static void sock_dispatch_asyncs( struct sock *sock, int event ) +static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { @@ -311,10 +311,12 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) } if ( event & (POLLERR|POLLHUP) ) { + int status = sock_get_ntstatus( error ); + if ( !(sock->state & FD_READ) ) - async_wake_up( sock->read_q, STATUS_SUCCESS ); + async_wake_up( sock->read_q, status ); if ( !(sock->state & FD_WRITE) ) - async_wake_up( sock->write_q, STATUS_SUCCESS ); + async_wake_up( sock->write_q, status ); } } } @@ -449,7 +451,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } - sock_dispatch_asyncs( sock, event ); + sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself,

1 0

Mike Kaplinskiy : server: In case of hangup/error, wake up all asyncs that can no longer be completed.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: be230adbb7400d84fcc5312a0463eee7480709e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be230adbb7400d84fcc5312a0… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:55 2010 -0400 server: In case of hangup/error, wake up all asyncs that can no longer be completed. --- server/sock.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 87628da..568f818 100644 --- a/server/sock.c +++ b/server/sock.c @@ -299,16 +299,23 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { - if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) + if ( event & (POLLIN|POLLPRI) && async_waiting( sock->read_q ) ) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); } - if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) + if ( event & POLLOUT && async_waiting( sock->write_q ) ) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED ); } + if ( event & (POLLERR|POLLHUP) ) + { + if ( !(sock->state & FD_READ) ) + async_wake_up( sock->read_q, STATUS_SUCCESS ); + if ( !(sock->state & FD_WRITE) ) + async_wake_up( sock->write_q, STATUS_SUCCESS ); + } } }

1 0

Andrey Turkin : oleaut32: Better handle secondary type when generating type descriptors.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 9fd7f392dc9bf9765d11e80957a4befe60891172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd7f392dc9bf9765d11e8095… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:40:23 2010 +0400 oleaut32: Better handle secondary type when generating type descriptors. --- dlls/oleaut32/typelib2.c | 84 +++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 10e26fb..1096ea8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1080,65 +1080,49 @@ static int ctl2_encode_typedesc( break; case VT_PTR: - /* FIXME: Make with the error checking. */ - FIXME("PTR vartype, may not work correctly.\n"); - - ctl2_encode_typedesc(This, tdesc->u.lptdesc, &target_type, NULL, NULL, &child_size); - - for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if (((typedata[0] & 0xffff) == VT_PTR) && (typedata[1] == target_type)) break; - } - - if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { - int mix_field; - - if (target_type & 0x80000000) { - mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; - } else { - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][target_type]; - mix_field = ((typedata[0] >> 16) == 0x7fff)? 0x7fff: 0x7ffe; - } - - typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - - typedata[0] = (mix_field << 16) | VT_PTR; - typedata[1] = target_type; - } - - *encoded_tdesc = typeoffset; - - *width = 4; - *alignment = 4; - *decoded_size = sizeof(TYPEDESC) + child_size; - break; - case VT_SAFEARRAY: /* FIXME: Make with the error checking. */ - FIXME("SAFEARRAY vartype, may not work correctly.\n"); + FIXME("PTR or SAFEARRAY vartype, may not work correctly.\n"); ctl2_encode_typedesc(This, tdesc->u.lptdesc, &target_type, NULL, NULL, &child_size); for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if (((typedata[0] & 0xffff) == VT_SAFEARRAY) && (typedata[1] == target_type)) break; + if (((typedata[0] & 0xffff) == tdesc->vt) && (typedata[1] == target_type)) break; } if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; if (target_type & 0x80000000) { - mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; + mix_field = (target_type >> 16) & VT_TYPEMASK; } else { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][target_type]; - mix_field = ((typedata[0] >> 16) == 0x7fff)? 0x7fff: 0x7ffe; + switch((typedata[0]>>16) & ~VT_ARRAY) + { + case VT_UI1: + case VT_I1: + case VT_UI2: + case VT_I2: + case VT_I4: + case VT_UI4: + mix_field = typedata[0]>>16; + break; + default: + mix_field = 0x7fff; + break; + } } + if (tdesc->vt == VT_PTR) + mix_field |= VT_BYREF; + else if (tdesc->vt == VT_SAFEARRAY) + mix_field |= VT_ARRAY; + typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - typedata[0] = (mix_field << 16) | VT_SAFEARRAY; + typedata[0] = (mix_field << 16) | tdesc->vt; typedata[1] = target_type; } @@ -1182,17 +1166,34 @@ static int ctl2_encode_typedesc( break; } case VT_USERDEFINED: + { + const MSFT_TypeInfoBase *basetype; + INT basevt = 0x7fff; + TRACE("USERDEFINED.\n"); + if (tdesc->u.hreftype % sizeof(*basetype) == 0 && tdesc->u.hreftype < This->typelib_segdir[MSFT_SEG_TYPEINFO].length) + { + basetype = (MSFT_TypeInfoBase*)&(This->typelib_segment_data[MSFT_SEG_TYPEINFO][tdesc->u.hreftype]); + switch(basetype->typekind & 0xf) + { + case TKIND_ENUM: + basevt = VT_I4; + break; + default: + FIXME("USERDEFINED basetype %d not handled\n", basetype->typekind & 0xf); + break; + } + } for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if ((typedata[0] == ((0x7fff << 16) | VT_USERDEFINED)) && (typedata[1] == tdesc->u.hreftype)) break; + if ((typedata[0] == ((basevt << 16) | VT_USERDEFINED)) && (typedata[1] == tdesc->u.hreftype)) break; } if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - typedata[0] = (0x7fff << 16) | VT_USERDEFINED; + typedata[0] = (basevt << 16) | VT_USERDEFINED; typedata[1] = tdesc->u.hreftype; } @@ -1200,6 +1201,7 @@ static int ctl2_encode_typedesc( *width = 0; *alignment = 1; break; + } default: FIXME("Unrecognized type %d.\n", tdesc->vt);

1 0

Mike Kaplinskiy : server: Propagate error from recv.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 394a142237795d0823dd73677026be0b0ee502b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394a142237795d0823dd73677… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:53 2010 -0400 server: Propagate error from recv. --- server/sock.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 5d48c2d..87628da 100644 --- a/server/sock.c +++ b/server/sock.c @@ -419,16 +419,17 @@ static void sock_poll_event( struct fd *fd, int event ) call and the invocation of this routine */ if ( errno != EAGAIN ) { + error = errno; + event |= POLLERR; if ( debug_level ) fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); - event |= POLLERR; } } } if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) { - error = sock_error( fd ); + error = error ? error : sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; sock->state &= ~FD_READ;

1 0

Andrey Turkin : oleaut32: Reuse existing function to encode custom data.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: eb039179356719eeba92205db3087d68464a2697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb039179356719eeba92205db… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:39:56 2010 +0400 oleaut32: Reuse existing function to encode custom data. --- dlls/oleaut32/typelib2.c | 293 +++++++++++++++++++--------------------------- 1 files changed, 121 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb039179356719eeba922…

1 0

Dylan Smith : wordpad: Search finished message box should be modal.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: dd789d50f27bf221e33ef93f5a6c896606e18c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd789d50f27bf221e33ef93f5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:18:17 2010 -0400 wordpad: Search finished message box should be modal. --- programs/wordpad/wordpad.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index edee1f8..845b9ae 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1288,8 +1288,10 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if (ret == -1) { custom_data->endPos = -1; - MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), - wszAppTitle, MB_OK | MB_ICONASTERISK); + EnableWindow(hMainWnd, FALSE); + MessageBoxWithResStringW(hFindWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), + wszAppTitle, MB_OK | MB_ICONASTERISK | MB_TASKMODAL); + EnableWindow(hMainWnd, TRUE); } else { SendMessageW(hEditorWnd, EM_SETSEL, ft.chrgText.cpMin, ft.chrgText.cpMax); SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0);

1 0

Dylan Smith : wordpad: Remove sized print preview page buffer.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 0cd3ee3d91d817010f9010b59b478084a1bae909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd3ee3d91d817010f9010b59… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:20:59 2010 -0400 wordpad: Remove sized print preview page buffer. This extra buffer only saves the result of the StretchBlt operatation, which isn't worth doing since a BitBlt will still be needed from the buffer to the screen. This causes noticable delay on resizing since a new sized bitmap needs to be created, the old bitmap needs to be destroyed, and then both a StretchBlt and a Bitblt is needed to actually repaint the window. --- programs/wordpad/print.c | 140 ++++++++++++++++------------------------------ 1 files changed, 48 insertions(+), 92 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 475d833..e77a596 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -33,8 +33,6 @@ typedef struct _previewinfo int textlength; HDC hdc; HDC hdc2; - HDC hdcSized; - HDC hdcSized2; RECT window; RECT rcPage; SIZE bmSize; @@ -705,43 +703,44 @@ static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) update_preview_scrollbars(hwndPreview, &window); } -static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight, BOOL draw_margins) +static void draw_margin_lines(HDC hdc, int x, int y, float ratio) { - HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - HBITMAP oldbm; HPEN hPen, oldPen; - int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + SIZE dpi; + RECT page_margin = preview.rcPage; - if(*hdcSized) { - oldbm = SelectObject(*hdcSized, hBitmapScaled); - DeleteObject(oldbm); - } else { - *hdcSized = CreateCompatibleDC(hdc); - SelectObject(*hdcSized, hBitmapScaled); - } + dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); + dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); + + page_margin.left = preview.rcPage.left + margins.left; + page_margin.top = preview.rcPage.top + margins.top; + page_margin.bottom = preview.rcPage.bottom - margins.bottom; + page_margin.right = preview.rcPage.right - margins.right; - StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); + page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); + page_margin.bottom = (int)((float)twips_to_pixels(page_margin.bottom, dpi.cy) * ratio); + page_margin.right = (int)((float)twips_to_pixels(page_margin.right, dpi.cx) * ratio); - if (!draw_margins) return; + page_margin.left += x; + page_margin.top += y; + page_margin.bottom += y; + page_margin.right += x; - /* Draw margin lines */ hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - oldPen = SelectObject(*hdcSized, hPen); + oldPen = SelectObject(hdc, hPen); - MoveToEx(*hdcSized, 0, TopMargin, NULL); - LineTo(*hdcSized, bmNewWidth, TopMargin); - MoveToEx(*hdcSized, 0, BottomMargin, NULL); - LineTo(*hdcSized, bmNewWidth, BottomMargin); + MoveToEx(hdc, x, page_margin.top, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.top); + MoveToEx(hdc, x, page_margin.bottom, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.bottom); - MoveToEx(*hdcSized, LeftMargin, 0, NULL); - LineTo(*hdcSized, LeftMargin, bmNewHeight); - MoveToEx(*hdcSized, RightMargin, 0, NULL); - LineTo(*hdcSized, RightMargin, bmNewHeight); + MoveToEx(hdc, page_margin.left, y, NULL); + LineTo(hdc, page_margin.left, y + preview.bmScaledSize.cy); + MoveToEx(hdc, page_margin.right, y, NULL); + LineTo(hdc, page_margin.right, y + preview.bmScaledSize.cy); - SelectObject(*hdcSized, oldPen); + SelectObject(hdc, oldPen); DeleteObject(hPen); } @@ -750,41 +749,6 @@ static BOOL is_last_preview_page(int page) return preview.pageEnds[page - 1] >= preview.textlength; } -/* Update for zoom ratio changes with same page. */ -static void update_scaled_preview(HWND hMainWnd) -{ - FORMATRANGE fr; - HWND hwndPreview; - - /* This may occur on WM_CREATE before update_preview is called - * because a WM_SIZE message is generated from updating the - * scrollbars. */ - if (!preview.hdc) return; - - hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); - fr.hdcTarget = make_dc(); - fr.rc = fr.rcPage = preview.rcPage; - fr.rc.left += margins.left; - fr.rc.top += margins.top; - fr.rc.bottom -= margins.bottom; - fr.rc.right -= margins.right; - - draw_preview_page(preview.hdc, &preview.hdcSized, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy, TRUE); - - if(preview.pages_shown > 1) - { - draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy, - !is_last_preview_page(preview.page)); - } - - InvalidateRect(hwndPreview, NULL, FALSE); - DeleteDC(fr.hdcTarget); -} - void init_preview(HWND hMainWnd, LPWSTR wszFileName) { HINSTANCE hInstance = GetModuleHandleW(0); @@ -824,18 +788,6 @@ void close_preview(HWND hMainWnd) DeleteObject(oldbm); preview.hdc2 = NULL; } - if(preview.hdcSized) { - HBITMAP oldbm = GetCurrentObject(preview.hdcSized, OBJ_BITMAP); - DeleteDC(preview.hdcSized); - DeleteObject(oldbm); - preview.hdcSized = NULL; - } - if(preview.hdcSized2) { - HBITMAP oldbm = GetCurrentObject(preview.hdcSized2, OBJ_BITMAP); - DeleteDC(preview.hdcSized2); - DeleteObject(oldbm); - preview.hdcSized2 = NULL; - } preview_bar_show(hMainWnd, FALSE); DestroyWindow(hwndPreview); @@ -896,19 +848,19 @@ static LRESULT print_preview(HWND hwndPreview) HDC hdc; RECT window, background; PAINTSTRUCT ps; - POINT scrollpos; + int x, y; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - scrollpos.x = GetScrollPos(hwndPreview, SB_HORZ); - scrollpos.y = GetScrollPos(hwndPreview, SB_VERT); + x = preview.spacing.cx - GetScrollPos(hwndPreview, SB_HORZ); + y = preview.spacing.cy - GetScrollPos(hwndPreview, SB_VERT); - background.left = preview.spacing.cx - 2 - scrollpos.x; + background.left = x - 2; background.right = background.left + preview.bmScaledSize.cx + 4; - background.top = preview.spacing.cy - 2 - scrollpos.y; + background.top = y - 2; background.bottom = background.top + preview.bmScaledSize.cy + 4; FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); @@ -921,15 +873,19 @@ static LRESULT print_preview(HWND hwndPreview) FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); } - BitBlt(hdc, preview.spacing.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.hdcSized, 0, 0, SRCCOPY); + StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + draw_margin_lines(hdc, x, y, preview.zoomratio); if(preview.pages_shown > 1) { - BitBlt(hdc, preview.spacing.cx * 2 + preview.bmScaledSize.cx - scrollpos.x, - preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, - preview.bmScaledSize.cy, preview.hdcSized2, 0, 0, SRCCOPY); + x += preview.spacing.cx + preview.bmScaledSize.cx; + StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc2, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + if (!is_last_preview_page(preview.page)) + draw_margin_lines(hdc, x, y, preview.zoomratio); } preview.window = window; @@ -1011,7 +967,7 @@ static void update_preview(HWND hMainWnd) DeleteDC(fr.hdcTarget); ReleaseDC(hwndPreview, hdc); - update_scaled_preview(hMainWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hMainWnd); update_preview_statusbar(hMainWnd); } @@ -1103,7 +1059,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: { update_preview_sizes(hWnd, FALSE); - update_scaled_preview(hWnd); + InvalidateRect(hWnd, NULL, FALSE); break; } @@ -1216,7 +1172,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) toggle_num_pages(hMainWnd); } else { update_preview_sizes(hWnd, TRUE); - update_scaled_preview(hMainWnd); + InvalidateRect(hWnd, NULL, FALSE); update_preview_buttons(hMainWnd); } @@ -1285,7 +1241,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) } else { HWND hwndPreview = GetDlgItem(hWnd, IDC_PREVIEW); update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } } @@ -1301,7 +1257,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) toggle_num_pages(hWnd); } else { update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } }

1 0

Dylan Smith : wordpad: Save and load word wrap registry options.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: c37cdce905fc773ac1dc8469307d688bc80c06f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37cdce905fc773ac1dc84693… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:22:22 2010 -0400 wordpad: Save and load word wrap registry options. --- programs/wordpad/registry.c | 32 +++++++++++++++++++++++--------- programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 7311fb6..472ed4d 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -34,6 +34,7 @@ static const WCHAR key_text[] = {'T','e','x','t',0}; static const WCHAR var_file[] = {'F','i','l','e','%','d',0}; static const WCHAR var_framerect[] = {'F','r','a','m','e','R','e','c','t',0}; static const WCHAR var_barstate0[] = {'B','a','r','S','t','a','t','e','0',0}; +static const WCHAR var_wrap[] = {'W','r','a','p',0}; static const WCHAR var_maximized[] = {'M','a','x','i','m','i','z','e','d',0}; static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) @@ -377,10 +378,22 @@ static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], D if(!fetched) barState[index] = (1 << BANDID_TOOLBAR) | (1 << BANDID_FORMATBAR) | (1 << BANDID_RULER) | (1 << BANDID_STATUSBAR); - if(index == reg_formatindex(SF_RTF)) - wordWrap[index] = ID_WORDWRAP_WINDOW; - else if(index == reg_formatindex(SF_TEXT)) - wordWrap[index] = ID_WORDWRAP_NONE; + fetched = FALSE; + if(action == REG_OPENED_EXISTING_KEY) + { + DWORD size = sizeof(DWORD); + if(RegQueryValueExW(hKey, var_wrap, 0, NULL, (LPBYTE)&wordWrap[index], + &size) == ERROR_SUCCESS) + fetched = TRUE; + } + + if (!fetched) + { + if(index == reg_formatindex(SF_RTF)) + wordWrap[index] = ID_WORDWRAP_WINDOW; + else if(index == reg_formatindex(SF_TEXT)) + wordWrap[index] = ID_WORDWRAP_NONE; + } RegCloseKey(hKey); } @@ -391,7 +404,7 @@ void registry_read_formatopts_all(DWORD barState[], DWORD wordWrap[]) registry_read_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } -static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) +static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[]) { HKEY hKey; DWORD action = 0; @@ -400,13 +413,14 @@ static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) { RegSetValueExW(hKey, var_barstate0, 0, REG_DWORD, (LPBYTE)&barState[index], sizeof(DWORD)); - + RegSetValueExW(hKey, var_wrap, 0, REG_DWORD, (LPBYTE)&wordWrap[index], + sizeof(DWORD)); RegCloseKey(hKey); } } -void registry_set_formatopts_all(DWORD barState[]) +void registry_set_formatopts_all(DWORD barState[], DWORD wordWrap[]) { - registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState); - registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState); + registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState, wordWrap); + registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 80fe19d..abd7cd2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2639,7 +2639,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara } else if(prompt_save_changes()) { registry_set_options(hMainWnd); - registry_set_formatopts_all(barState); + registry_set_formatopts_all(barState, wordWrap); PostQuitMessage(0); } break; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index c3c5bc0..f50881a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -262,5 +262,5 @@ void registry_read_formatopts_all(DWORD[], DWORD[]); void registry_read_winrect(RECT*); void registry_read_maximized(DWORD*); void registry_set_filelist(LPCWSTR, HWND); -void registry_set_formatopts_all(DWORD[]); +void registry_set_formatopts_all(DWORD[], DWORD[]); void registry_set_options(HWND);

1 0