August 2007 - Wine-commits - list.winehq.org

Misha Koshelev : wininet: InternetQueryDataAvailable does not return ERROR_NO_MORE_FILES when no more HTTP data is available .
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 6ea2441ff935c509a9c6548b1c2dd178d2669574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea2441ff935c509a9c6548b1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Aug 12 15:40:46 2007 -0500 wininet: InternetQueryDataAvailable does not return ERROR_NO_MORE_FILES when no more HTTP data is available. --- dlls/wininet/internet.c | 58 +++++++++++++++++------------------------ dlls/wininet/netconnection.c | 2 +- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 14cfd04..bfad36c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3314,49 +3314,39 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, switch (lpwhr->hdr.htype) { case WH_HHTTPREQ: + retval = TRUE; if (NETCON_query_data_available(&lpwhr->netConnection, - lpdwNumberOfBytesAvailble)) + lpdwNumberOfBytesAvailble) && + !*lpdwNumberOfBytesAvailble) { - retval = TRUE; - if (!*lpdwNumberOfBytesAvailble) + /* Even if we are in async mode, we need to determine whether + * there is actually more data available. We do this by trying + * to peek only a single byte in async mode. */ + BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); + if (NETCON_recv(&lpwhr->netConnection, buffer, + min(async ? 1 : sizeof(buffer), + lpwhr->dwContentLength - lpwhr->dwContentRead), + MSG_PEEK, (int *)lpdwNumberOfBytesAvailble) && + async && *lpdwNumberOfBytesAvailble) { - /* Even if we are in async mode, we need to determine whether - * there is actually more data available. We do this by trying - * to peek only a single byte in async mode. */ - BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); - if (!NETCON_recv(&lpwhr->netConnection, buffer, - min(async ? 1 : sizeof(buffer), - lpwhr->dwContentLength - lpwhr->dwContentRead), - MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + WORKREQUEST workRequest; + + *lpdwNumberOfBytesAvailble = 0; + workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; + workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); + + retval = INTERNET_AsyncCall(&workRequest); + if (!retval) { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - retval = FALSE; + WININET_Release( &lpwhr->hdr ); } - else if (async && *lpdwNumberOfBytesAvailble) + else { - WORKREQUEST workRequest; - - *lpdwNumberOfBytesAvailble = 0; - workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; - workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); - - retval = INTERNET_AsyncCall(&workRequest); - if (!retval) - { - WININET_Release( &lpwhr->hdr ); - } - else - { - INTERNET_SetLastError(ERROR_IO_PENDING); - retval = FALSE; - } + INTERNET_SetLastError(ERROR_IO_PENDING); + retval = FALSE; } } } - else - { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - } break; default: diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 40f3a22..4500a9f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -572,10 +572,10 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f */ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) { + *available = 0; if (!NETCON_connected(connection)) return FALSE; - *available = 0; #ifdef SONAME_LIBSSL if (connection->peek_msg) *available = connection->peek_len; #endif

1 0

Jason Edmeades : user32: Fix regression in alt, then right processing with eg wines notepad.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 902a384b3865399db0443bea3ec4e0b8653d26e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902a384b3865399db0443bea3… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Aug 12 22:29:02 2007 +0100 user32: Fix regression in alt, then right processing with eg wines notepad. --- dlls/user32/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2a2d3ab..3a75005 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2682,13 +2682,13 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk ) else if ((vk == VK_RIGHT) && !IS_SYSTEM_MENU(menu)) { int i = menu->FocusedItem + 1; - while (i < (menu->nItems - 1)) { + while (i < menu->nItems) { if ((menu->items[i].wID >= SC_SIZE && menu->items[i].wID <= SC_RESTORE)) { i++; } else break; } - if (i == (menu->nItems - 1)) { + if (i == menu->nItems) { atEnd = TRUE; } }

1 0

Jason Edmeades : user32: Allow alt+space to highlight system menu.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 76943c2a4125040ccec910bb5dfa12cb1764f056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76943c2a4125040ccec910bb5… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Aug 12 22:29:01 2007 +0100 user32: Allow alt+space to highlight system menu. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2f57779..2a2d3ab 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3387,7 +3387,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) MENU_SelectItem( hwnd, hTrackMenu, uItem, TRUE, 0 ); - if (wParam & HTSYSMENU) + if (wParam & HTSYSMENU && wChar != ' ') { /* prevent sysmenu activation for managed windows on Alt down/up */ if (GetPropA( hwnd, "__wine_x11_managed" ))

1 0

Jason Edmeades : cmd.exe: Redirection for external programs was broken by the conversion to unicode.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 7fce92ea54a60e11c22f1864fadb620e75fc92ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fce92ea54a60e11c22f1864f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Aug 12 22:29:03 2007 +0100 cmd.exe: Redirection for external programs was broken by the conversion to unicode. --- programs/cmd/wcmdmain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 775a553..8318590 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -839,13 +839,13 @@ static void init_msvcrt_io_block(STARTUPINFO* st) * to change those std handles (this depends on the way wcmd sets * it's new input & output handles) */ - size_t sz = max(sizeof(unsigned) + (sizeof(WCHAR) + sizeof(HANDLE)) * 3, st_p.cbReserved2); + size_t sz = max(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * 3, st_p.cbReserved2); BYTE* ptr = HeapAlloc(GetProcessHeap(), 0, sz); if (ptr) { unsigned num = *(unsigned*)st_p.lpReserved2; - WCHAR* flags = (WCHAR*)(ptr + sizeof(unsigned)); - HANDLE* handles = (HANDLE*)(flags + num * sizeof(WCHAR)); + char* flags = (char*)(ptr + sizeof(unsigned)); + HANDLE* handles = (HANDLE*)(flags + num * sizeof(char)); memcpy(ptr, st_p.lpReserved2, st_p.cbReserved2); st->cbReserved2 = sz;

1 0

Damjan Jovanovic : winex11.drv: Correctly handle overlapping source and destination regions on the same DIB when copying DIBs client-side .
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 28ddfe802e5d45db32df047174e9f3a03f8aee18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ddfe802e5d45db32df04717… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Aug 11 10:46:08 2007 +0200 winex11.drv: Correctly handle overlapping source and destination regions on the same DIB when copying DIBs client-side. --- dlls/winex11.drv/bitblt.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 06c6ba1..996319e 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1623,9 +1623,18 @@ static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT dstRowOffset = -dstDib.dsBm.bmWidthBytes; } + /* Handle overlapping regions on the same DIB */ + if (physDevSrc == physDevDst && ySrc < yDst) + { + srcPtr += srcRowOffset * (height - 1); + srcRowOffset = -srcRowOffset; + dstPtr += dstRowOffset * (height - 1); + dstRowOffset = -dstRowOffset; + } + for (y = yDst; y < yDst + height; ++y) { - memcpy(dstPtr, srcPtr, bytesToCopy); + memmove(dstPtr, srcPtr, bytesToCopy); srcPtr += srcRowOffset; dstPtr += dstRowOffset; }

1 0

Marcus Meissner : cmd.exe: WCMD_for is only for files.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 28ca9a86589d001d738d332b495736aae58cb8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ca9a86589d001d738d332b4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 12 21:22:41 2007 +0200 cmd.exe: WCMD_for is only for files. --- programs/cmd/builtins.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d887c4f..1228206 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -654,7 +654,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR variable[4]; WCHAR *firstCmd; int thisDepth; - BOOL isDirs = FALSE; /* Check: the first line includes the % variable name as first parm @@ -730,8 +729,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (hff != INVALID_HANDLE_VALUE) { do { BOOL isDirectory = (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - if ((isDirs && isDirectory) || - (!isDirs && !isDirectory)) + if (!isDirectory) { thisCmdStart = cmdStart; WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName));

1 0

Marcus Meissner : user32: Initialize MONITORINFO.cbSize.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: f76de3d002ff1b5090daa54a74569349c9997f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76de3d002ff1b5090daa54a7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 12 18:08:48 2007 +0200 user32: Initialize MONITORINFO.cbSize. --- dlls/user32/msgbox.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 1353d6b..95d98a9 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -248,6 +248,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Message boxes are always desktop centered, so query desktop size and center window */ monitor = MonitorFromWindow(lpmb->hwndOwner ? lpmb->hwndOwner : GetActiveWindow(), MONITOR_DEFAULTTOPRIMARY); + mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW(monitor, &mon_info); wleft = (mon_info.rcWork.left + mon_info.rcWork.right - wwidth) / 2; wtop = (mon_info.rcWork.top + mon_info.rcWork.bottom - wheight) / 2;

1 0

Jacek Caban : mshtml: Added ICustomDoc stub implementation.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 03585070657c665a07af59bc0f24aa190cc31db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03585070657c665a07af59bc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 01:18:49 2007 +0200 mshtml: Added ICustomDoc stub implementation. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/oleobj.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 746c67a..f75d591 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -113,6 +113,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); *ppvObject = PERSTRINIT(This); + }else if(IsEqualGUID(&IID_ICustomDoc, riid)) { + TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppvObject); + *ppvObject = CUSTOMDOC(This); }else if(IsEqualGUID(&DIID_DispHTMLDocument, riid)) { TRACE("(%p)->(DIID_DispHTMLDocument %p)\n", This, ppvObject); *ppvObject = HTMLDOC(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bd36a7..bf57b7e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -112,6 +112,7 @@ struct HTMLDocument { const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; + const ICustomDocVtbl *lpCustomDocVtbl; LONG ref; @@ -305,6 +306,7 @@ typedef struct { #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) +#define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 2689e4c..116cbde 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -676,6 +676,46 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +/********************************************************** + * ICustomDoc implementation + */ + +#define CUSTOMDOC_THIS(iface) DEFINE_THIS(HTMLDocument, CustomDoc, iface) + +static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) +{ + HTMLDocument *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) +{ + HTMLDocument *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) +{ + HTMLDocument *This = CUSTOMDOC_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUIHandler); + return E_NOTIMPL; +} + +#undef CUSTOMDOC_THIS + +static const ICustomDocVtbl CustomDocVtbl = { + CustomDoc_QueryInterface, + CustomDoc_AddRef, + CustomDoc_Release, + CustomDoc_SetUIHandler +}; + void HTMLDocument_LockContainer(HTMLDocument *This, BOOL fLock) { IOleContainer *container; @@ -697,6 +737,7 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; + This->lpCustomDocVtbl = &CustomDocVtbl; This->usermode = UNKNOWN_USERMODE;

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::collapse implementation.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: b4bbffc64a94527a5c598dfaa029e66d6f9ee9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bbffc64a94527a5c598dfaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:44:19 2007 +0200 mshtml: Added IHTMLTxtRange::collapse implementation. --- dlls/mshtml/txtrange.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 0e90771..ae90e81 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -261,8 +261,11 @@ static HRESULT WINAPI HTMLTxtRange_scrollIntoView(IHTMLTxtRange *iface, VARIANT_ static HRESULT WINAPI HTMLTxtRange_collapse(IHTMLTxtRange *iface, VARIANT_BOOL Start) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%x)\n", This, Start); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, Start); + + nsIDOMRange_Collapse(This->nsrange, Start != VARIANT_FALSE); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIANT_BOOL *Success)

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::duplicate implementation.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 8068a72d3c95586ae45f38640bfc095d1ff2aba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8068a72d3c95586ae45f38640… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:43:30 2007 +0200 mshtml: Added IHTMLTxtRange::duplicate implementation. --- dlls/mshtml/txtrange.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 5b54451..0e90771 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -224,8 +224,15 @@ static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElem static HRESULT WINAPI HTMLTxtRange_duplicate(IHTMLTxtRange *iface, IHTMLTxtRange **Duplicate) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p)\n", This, Duplicate); - return E_NOTIMPL; + nsIDOMRange *nsrange = NULL; + + TRACE("(%p)->(%p)\n", This, Duplicate); + + nsIDOMRange_CloneRange(This->nsrange, &nsrange); + *Duplicate = HTMLTxtRange_Create(nsrange); + nsIDOMRange_Release(nsrange); + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange *Range, @@ -240,7 +247,7 @@ static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange * VARIANT_BOOL *IsEqual) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%p %p)\n", This, Range, IsEqual); return E_NOTIMPL; }

1 0