September 2007 - Wine-Commits

Rob Shearman : widl: Initialise cval in make_expr.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: de7220e82d4d7caa38d15d5670d2f5215de9a15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7220e82d4d7caa38d15d567… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Sep 16 22:27:38 2007 +0100 widl: Initialise cval in make_expr. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5d99c5a..cc5aca5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1017,6 +1017,7 @@ static expr_t *make_expr(enum expr_type type) e->ref = NULL; e->u.lval = 0; e->is_const = FALSE; + e->cval = 0; return e; }

1 0

Rob Shearman : credui: The pszUserName parameter in CredUIPromptForCredentialsW is in/ out so dump the string on entry to the function.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: ff014a8f6a58760486fe7687295c0e955acadc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff014a8f6a58760486fe76872… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Sep 16 22:24:43 2007 +0100 credui: The pszUserName parameter in CredUIPromptForCredentialsW is in/out so dump the string on entry to the function. --- dlls/credui/credui_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 1d646f3..fc7bfe0 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -146,8 +146,8 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, INT_PTR ret; struct cred_dialog_params params; - TRACE("(%p, %s, %p, %d, %p, %d, %p, %d, %p, 0x%08x)\n", pUIInfo, - debugstr_w(pszTargetName), Reserved, dwAuthError, pszUsername, + TRACE("(%p, %s, %p, %d, %s, %d, %p, %d, %p, 0x%08x)\n", pUIInfo, + debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername), ulUsernameMaxChars, pszPassword, ulPasswordMaxChars, pfSave, dwFlags); params.pszTargetName = pszTargetName;

1 0

Roderick Colenbrander : wined3d: Update list of pci ids.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 0b0f353b7d477f679c7796994f689f30150566e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0f353b7d477f679c7796994… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 16 13:08:54 2007 +0200 wined3d: Update list of pci ids. --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++++++---------- include/wine/wined3d_gl.h | 3 +++ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3eaff3d..8560e98 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -836,14 +836,15 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { strstr(gl_info->gl_renderer, "Quadro FX 5")) gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT; else if(strstr(gl_info->gl_renderer, "6800") || - strstr(gl_info->gl_renderer, "7600")) + strstr(gl_info->gl_renderer, "7600") || + strstr(gl_info->gl_renderer, "7700")) gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800; else if(strstr(gl_info->gl_renderer, "6600") || strstr(gl_info->gl_renderer, "6610") || strstr(gl_info->gl_renderer, "6700")) gl_info->gl_card = CARD_NVIDIA_GEFORCE_6600GT; else - gl_info->gl_card = CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400 */ + gl_info->gl_card = CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400/7500 */ } else if(WINE_D3D9_CAPABLE(gl_info)) { if (strstr(gl_info->gl_renderer, "5800") || strstr(gl_info->gl_renderer, "5900") || @@ -880,18 +881,31 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { break; case VENDOR_ATI: if(WINE_D3D9_CAPABLE(gl_info)) { + /* Radeon R6xx HD2900 - highend */ + if (strstr(gl_info->gl_renderer, "HD 2900")) + gl_info->gl_card = CARD_ATI_RADEON_HD2900; + /* Radeon R6xx HD2600- midend */ + else if (strstr(gl_info->gl_renderer, "HD 2600")) + gl_info->gl_card = CARD_ATI_RADEON_HD2600; + /* Radeon R6xx HD2300/HD2400 - lowend */ + else if (strstr(gl_info->gl_renderer, "HD 2300") || + strstr(gl_info->gl_renderer, "HD 2400")) + gl_info->gl_card = CARD_ATI_RADEON_HD2300; /* Radeon R5xx */ - if (strstr(gl_info->gl_renderer, "X1600") || - strstr(gl_info->gl_renderer, "X1800") || - strstr(gl_info->gl_renderer, "X1900") || - strstr(gl_info->gl_renderer, "X1950")) - gl_info->gl_card = CARD_ATI_RADEON_X1600; - /* Radeon R4xx + X1300/X1400 (lowend R5xx) */ + else if (strstr(gl_info->gl_renderer, "X1600") || + strstr(gl_info->gl_renderer, "X1650") || + strstr(gl_info->gl_renderer, "X1800") || + strstr(gl_info->gl_renderer, "X1900") || + strstr(gl_info->gl_renderer, "X1950")) + gl_info->gl_card = CARD_ATI_RADEON_X1600; + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300 (lowend R5xx) */ else if(strstr(gl_info->gl_renderer, "X700") || strstr(gl_info->gl_renderer, "X800") || strstr(gl_info->gl_renderer, "X850") || strstr(gl_info->gl_renderer, "X1300") || - strstr(gl_info->gl_renderer, "X1400")) + strstr(gl_info->gl_renderer, "X1400") || + strstr(gl_info->gl_renderer, "X1450") || + strstr(gl_info->gl_renderer, "X1550")) gl_info->gl_card = CARD_ATI_RADEON_X700; /* Radeon R3xx */ else @@ -929,7 +943,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { if(WINE_D3D9_CAPABLE(gl_info)) gl_info->gl_card = CARD_NVIDIA_GEFORCEFX_5600; else if(WINE_D3D8_CAPABLE(gl_info)) - gl_info->gl_card = CARD_NVIDIA_GEFORCE3; + gl_info->gl_card = CARD_NVIDIA_GEFORCE3; else if(WINE_D3D7_CAPABLE(gl_info)) gl_info->gl_card = CARD_NVIDIA_GEFORCE; else if(WINE_D3D6_CAPABLE(gl_info)) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 18ddf6a..ab17169 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3069,6 +3069,9 @@ typedef enum _GL_Cards { CARD_ATI_RADEON_9500 = 0x4144, CARD_ATI_RADEON_X700 = 0x5e4c, CARD_ATI_RADEON_X1600 = 0x71c2, + CARD_ATI_RADEON_HD2300 = 0x7210, + CARD_ATI_RADEON_HD2600 = 0x9581, + CARD_ATI_RADEON_HD2900 = 0x9400, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Alexandre Julliard : wininet/ftp: There' s no need to query the file size before retrieving a file.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 23c58d3a21a6c1d057c925cbc49dba6a15654d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c58d3a21a6c1d057c925cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 12:56:48 2007 +0200 wininet/ftp: There's no need to query the file size before retrieving a file. --- dlls/wininet/ftp.c | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f54df2a..901f0a2 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -130,14 +130,13 @@ static BOOL FTP_SendStore(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DW static BOOL FTP_GetDataSocket(LPWININETFTPSESSIONW lpwfs, LPINT nDataSocket); static BOOL FTP_SendData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFile); static INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD_PTR dwContext); -static DWORD FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType); -static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DWORD nBytes, HANDLE hFile); +static BOOL FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType); +static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFile); static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_ConnectToHost(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_SendPassword(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_SendAccount(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_SendType(LPWININETFTPSESSIONW lpwfs, DWORD dwType); -static BOOL FTP_GetFileSize(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD *dwSize); static BOOL FTP_SendPort(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_DoPassive(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_SendPortOrPasv(LPWININETFTPSESSIONW lpwfs); @@ -1304,7 +1303,6 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD_PTR dwContext) { - DWORD nBytes; BOOL bSuccess = FALSE; HANDLE hFile; LPWININETAPPINFOW hIC = NULL; @@ -1321,9 +1319,7 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, return FALSE; /* Set up socket to retrieve data */ - nBytes = FTP_SendRetrieve(lpwfs, lpszRemoteFile, dwInternetFlags); - - if (nBytes > 0) + if (FTP_SendRetrieve(lpwfs, lpszRemoteFile, dwInternetFlags)) { INT nDataSocket; @@ -1333,7 +1329,7 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, INT nResCode; /* Receive data */ - FTP_RetrieveFileData(lpwfs, nDataSocket, nBytes, hFile); + FTP_RetrieveFileData(lpwfs, nDataSocket, hFile); nResCode = FTP_ReceiveResponse(lpwfs, dwContext); if (nResCode) { @@ -2430,6 +2426,8 @@ lend: return bSuccess; } + +#if 0 /* FIXME: should probably be used for FtpGetFileSize */ /*********************************************************************** * FTP_GetFileSize (internal) * @@ -2471,6 +2469,7 @@ static BOOL FTP_GetFileSize(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, lend: return bSuccess; } +#endif /*********************************************************************** @@ -2739,43 +2738,39 @@ static BOOL FTP_SendData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFi * 0 on failure * */ -static DWORD FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType) +static BOOL FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType) { INT nResCode; - DWORD nResult = 0; + BOOL ret; TRACE("\n"); - if (!FTP_InitListenSocket(lpwfs)) + if (!(ret = FTP_InitListenSocket(lpwfs))) goto lend; - if (!FTP_SendType(lpwfs, dwType)) + if (!(ret = FTP_SendType(lpwfs, dwType))) goto lend; - if (!FTP_SendPortOrPasv(lpwfs)) + if (!(ret = FTP_SendPortOrPasv(lpwfs))) goto lend; - if (!FTP_GetFileSize(lpwfs, lpszRemoteFile, &nResult)) - goto lend; - - TRACE("Waiting to receive %d bytes\n", nResult); - - if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_RETR, lpszRemoteFile, 0, 0, 0)) + if (!(ret = FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_RETR, lpszRemoteFile, 0, 0, 0))) goto lend; nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); if ((nResCode != 125) && (nResCode != 150)) { /* That means that we got an error getting the file. */ - nResult = 0; + FTP_SetResponseError(nResCode); + ret = FALSE; } lend: - if (0 == nResult && lpwfs->lstnSocket != -1) + if (!ret && lpwfs->lstnSocket != -1) { closesocket(lpwfs->lstnSocket); lpwfs->lstnSocket = -1; } - return nResult; + return ret; } @@ -2789,7 +2784,7 @@ lend: * FALSE on failure * */ -static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DWORD nBytes, HANDLE hFile) +static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFile) { DWORD nBytesWritten; DWORD nBytesReceived = 0; @@ -2805,7 +2800,7 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW return FALSE; } - while (nBytesReceived < nBytes && nRC != -1) + while (nRC != -1) { nRC = recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); if (nRC != -1) @@ -2816,9 +2811,6 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW WriteFile(hFile, lpszBuffer, nRC, &nBytesWritten, NULL); nBytesReceived += nRC; } - - TRACE("%d bytes of %d (%d%%)\r", nBytesReceived, nBytes, - nBytesReceived * 100 / nBytes); } TRACE("Data transfer complete\n");

1 0

Roderick Colenbrander : wined3d: Add pbo support for compressed textures.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 2374c456bcb0d7f0a86821ebda645f7332214e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2374c456bcb0d7f0a86821ebd… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 16 13:36:35 2007 +0200 wined3d: Add pbo support for compressed textures. --- dlls/wined3d/surface.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 948b9bd..fc0ba4a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -170,15 +170,29 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi This->Flags |= SFLAG_CLIENT; } - TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); - ENTER_GL(); /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this * function uses glCompressedTexImage2D instead of the SubImage call */ - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); + TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); + ENTER_GL(); + + if(This->Flags & SFLAG_PBO) { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, + width, height, 0 /* border */, This->resource.size, NULL)); + checkGLcall("glCompressedTexSubImage2D"); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); + } else { + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, + width, height, 0 /* border */, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2D"); + } LEAVE_GL(); } } else {

1 0

Roderick Colenbrander : wined3d: Don' t create a pbo for system memory surfaces.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: f9002c26287e6aedfbe8a930d20af9f23f87ca51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9002c26287e6aedfbe8a930d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 15 21:51:27 2007 +0200 wined3d: Don't create a pbo for system memory surfaces. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d9a4e29..948b9bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -758,10 +758,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */ } - /* Create a PBO for dynamicly locked surfaces but don't do it for converted or non-pow2 surfaces */ - if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2))) { + /* Create a PBO for dynamicly locked surfaces but don't do it for converted or non-pow2 surfaces. + * Also don't create a PBO for systemmem surfaces. */ + if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; - ENTER_GL(); GL_EXTCALL(glGenBuffersARB(1, &This->pbo));

1 0

Jacek Caban : mshtml: Make HTMLBodyElement child object of HTMLTextContainer.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: ea52235f8f3d4ba501ab9eb56921cbd25a62a893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea52235f8f3d4ba501ab9eb56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:07:52 2007 +0200 mshtml: Make HTMLBodyElement child object of HTMLTextContainer. --- dlls/mshtml/htmlbody.c | 24 ++++++++++++------------ dlls/mshtml/htmltextcont.c | 17 ++++++++--------- dlls/mshtml/mshtml_private.h | 7 +++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index bb616cd..35be04f 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - HTMLElement element; + HTMLTextContainer textcont; const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; @@ -83,7 +83,7 @@ static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, return S_OK; } - hres = HTMLElement_QI(&This->element, riid, ppv); + hres = HTMLElement_QI(&This->textcont.element, riid, ppv); if(FAILED(hres)) WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -96,7 +96,7 @@ static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDocument2_AddRef(HTMLDOC(This->textcont.element.node.doc)); } static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) @@ -105,7 +105,7 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDocument2_Release(HTMLDOC(This->textcont.element.node.doc)); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) @@ -407,18 +407,18 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I TRACE("(%p)->(%p)\n", This, range); - if(This->element.node.doc->nscontainer) { + if(This->textcont.element.node.doc->nscontainer) { nsIDOMDocument *nsdoc; nsIDOMDocumentRange *nsdocrange; nsresult nsres; - nsIWebNavigation_GetDocument(This->element.node.doc->nscontainer->navigation, &nsdoc); + nsIWebNavigation_GetDocument(This->textcont.element.node.doc->nscontainer->navigation, &nsdoc); nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); nsIDOMDocument_Release(nsdoc); nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); if(NS_SUCCEEDED(nsres)) { - nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element.node.nsnode); + nsres = nsIDOMRange_SelectNodeContents(nsrange, This->textcont.element.node.nsnode); if(NS_FAILED(nsres)) ERR("SelectNodeContents failed: %08x\n", nsres); }else { @@ -428,7 +428,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange_Release(nsdocrange); } - *range = HTMLTxtRange_Create(This->element.node.doc, nsrange); + *range = HTMLTxtRange_Create(This->textcont.element.node.doc, nsrange); return S_OK; } @@ -493,7 +493,7 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; - HTMLTextContainer_Init(&ret->text_container, &ret->element); + HTMLTextContainer_Init(&ret->text_container); ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), &IID_IPropertyNotifySink, NULL); @@ -506,8 +506,8 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) if(NS_FAILED(nsres)) ERR("Could not get nsDOMHTMLBodyElement: %08x\n", nsres); - ret->element.impl = (IUnknown*)HTMLBODY(ret); - ret->element.destructor = HTMLBodyElement_destructor; + ret->textcont.element.impl = (IUnknown*)HTMLBODY(ret); + ret->textcont.element.destructor = HTMLBodyElement_destructor; - return &ret->element; + return &ret->textcont.element; } diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index e67e668..20bdeab 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -40,19 +40,19 @@ static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface REFIID riid, void **ppv) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_QueryInterface(HTMLELEM(This->element), riid, ppv); + return IHTMLElement_QueryInterface(HTMLELEM(&This->element), riid, ppv); } static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_AddRef(HTMLELEM(This->element)); + return IHTMLElement_AddRef(HTMLELEM(&This->element)); } static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_Release(HTMLELEM(This->element)); + return IHTMLElement_Release(HTMLELEM(&This->element)); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) @@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_GetScrollHeight(nselem, &height); nsIDOMNSHTMLElement_Release(nselem); @@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_GetScrollWidth(nselem, &width); nsIDOMNSHTMLElement_Release(nselem); @@ -152,7 +152,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollTop(nselem, v); @@ -179,7 +179,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollLeft(nselem, v); @@ -233,8 +233,7 @@ static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { HTMLTextContainer_get_onscroll }; -void HTMLTextContainer_Init(HTMLTextContainer *This, HTMLElement *elem) +void HTMLTextContainer_Init(HTMLTextContainer *This) { This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; - This->element = elem; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e39b2e8..408dc52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,9 +284,9 @@ typedef struct { } HTMLElement; typedef struct { - const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + HTMLElement element; - HTMLElement *element; + const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; } HTMLTextContainer; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) @@ -423,8 +423,7 @@ HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); void HTMLElement2_Init(HTMLElement*); - -void HTMLTextContainer_Init(HTMLTextContainer*,HTMLElement*); +void HTMLTextContainer_Init(HTMLTextContainer*); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); HRESULT HTMLElement_QI(HTMLElement*,REFIID,void**);

1 0

Jacek Caban : mshtml: Store HTMLElement struct instead of pointer in HTMLTextAreaElement.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 99d061a0414e16a9b129fd40ac0b4f3656d3c2a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d061a0414e16a9b129fd40a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:07:26 2007 +0200 mshtml: Store HTMLElement struct instead of pointer in HTMLTextAreaElement. --- dlls/mshtml/htmlelem.c | 11 +++++------ dlls/mshtml/htmltextarea.c | 20 +++++++++++--------- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d70f77b..5f93aa7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1274,7 +1274,7 @@ HRESULT HTMLElement_QI(HTMLElement *This, REFIID riid, void **ppv) HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) { nsIDOMHTMLElement *nselem; - HTMLElement *ret; + HTMLElement *ret = NULL; nsAString class_name_str; const PRUnichar *class_name; nsresult nsres; @@ -1302,15 +1302,14 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret = HTMLInputElement_Create(nselem); if(!strcmpW(class_name, wszSELECT)) ret = HTMLSelectElement_Create(nselem); - else { + else if(!strcmpW(class_name, wszTEXTAREA)) + ret = HTMLTextAreaElement_Create(nselem); + + if(!ret) { ret = mshtml_alloc(sizeof(HTMLElement)); ret->impl = NULL; ret->destructor = NULL; - ret->nselem = nselem; - - if(!strcmpW(class_name, wszTEXTAREA)) - HTMLTextAreaElement_Create(ret); } nsAString_Finish(&class_name_str); diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 75c3f55..6266284 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -36,9 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + HTMLElement element; + const IHTMLTextAreaElementVtbl *lpHTMLTextAreaElementVtbl; - HTMLElement *element; nsIDOMHTMLTextAreaElement *nstextarea; } HTMLTextAreaElement; @@ -70,7 +71,7 @@ static HRESULT WINAPI HTMLTextAreaElement_QueryInterface(IHTMLTextAreaElement *i return S_OK; } - hres = HTMLElement_QI(This->element, riid, ppv); + hres = HTMLElement_QI(&This->element, riid, ppv); if(FAILED(hres)) WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -83,7 +84,7 @@ static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); } static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) @@ -92,7 +93,7 @@ static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); } static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo) @@ -395,19 +396,20 @@ static const IHTMLTextAreaElementVtbl HTMLTextAreaElementVtbl = { HTMLTextAreaElement_createTextRange }; -void HTMLTextAreaElement_Create(HTMLElement *element) +HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) { HTMLTextAreaElement *ret = mshtml_alloc(sizeof(HTMLTextAreaElement)); nsresult nsres; ret->lpHTMLTextAreaElementVtbl = &HTMLTextAreaElementVtbl; - ret->element = element; - nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLTextAreaElement, + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, (void**)&ret->nstextarea); if(NS_FAILED(nsres)) ERR("Could not get nsDOMHTMLInputElement: %08x\n", nsres); - element->impl = (IUnknown*)HTMLTXTAREA(ret); - element->destructor = HTMLTextAreaElement_destructor; + ret->element.impl = (IUnknown*)HTMLTXTAREA(ret); + ret->element.destructor = HTMLTextAreaElement_destructor; + + return &ret->element; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 644fe1b..e39b2e8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -420,7 +420,7 @@ HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); -void HTMLTextAreaElement_Create(HTMLElement*); +HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); void HTMLElement2_Init(HTMLElement*);

1 0

Jacek Caban : mshtml: Added get_body test.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: d17a1afe8b830a3932d551da1b1cccb80a69ad78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17a1afe8b830a3932d551da1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:06:10 2007 +0200 mshtml: Added get_body test. --- dlls/mshtml/tests/dom.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a264d72..3deac31 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -96,7 +96,10 @@ static void test_doc_elem(IHTMLDocument2 *doc) ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); test_node_name((IUnknown*)elem, "HTML"); + IHTMLElement_Release(elem); + hres = IHTMLDocument2_get_body(doc, &elem); + test_node_name((IUnknown*)elem, "BODY"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Store HTMLElement struct instead of pointer in HTMLBodyElement.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: fac2121e6d2cb07ad4c08f126ef7bfbcd9c492ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac2121e6d2cb07ad4c08f126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:05:34 2007 +0200 mshtml: Store HTMLElement struct instead of pointer in HTMLBodyElement. --- dlls/mshtml/htmlbody.c | 30 ++++++++++++++++-------------- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 966b693..bb616cd 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + HTMLElement element; + const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; HTMLTextContainer text_container; @@ -44,7 +46,6 @@ typedef struct { ConnectionPoint cp_propnotif; ConnectionPoint cp_txtcontevents; - HTMLElement *element; nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, return S_OK; } - hres = HTMLElement_QI(This->element, riid, ppv); + hres = HTMLElement_QI(&This->element, riid, ppv); if(FAILED(hres)) WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -95,7 +96,7 @@ static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); } static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) @@ -104,7 +105,7 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) @@ -406,18 +407,18 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I TRACE("(%p)->(%p)\n", This, range); - if(This->element->node.doc->nscontainer) { + if(This->element.node.doc->nscontainer) { nsIDOMDocument *nsdoc; nsIDOMDocumentRange *nsdocrange; nsresult nsres; - nsIWebNavigation_GetDocument(This->element->node.doc->nscontainer->navigation, &nsdoc); + nsIWebNavigation_GetDocument(This->element.node.doc->nscontainer->navigation, &nsdoc); nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); nsIDOMDocument_Release(nsdoc); nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); if(NS_SUCCEEDED(nsres)) { - nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element->node.nsnode); + nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element.node.nsnode); if(NS_FAILED(nsres)) ERR("SelectNodeContents failed: %08x\n", nsres); }else { @@ -427,7 +428,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange_Release(nsdocrange); } - *range = HTMLTxtRange_Create(This->element->node.doc, nsrange); + *range = HTMLTxtRange_Create(This->element.node.doc, nsrange); return S_OK; } @@ -485,15 +486,14 @@ static const IHTMLBodyElementVtbl HTMLBodyElementVtbl = { HTMLBodyElement_createTextRange }; -void HTMLBodyElement_Create(HTMLElement *element) +HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) { HTMLBodyElement *ret = mshtml_alloc(sizeof(HTMLBodyElement)); nsresult nsres; ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; - ret->element = element; - HTMLTextContainer_Init(&ret->text_container, element); + HTMLTextContainer_Init(&ret->text_container, &ret->element); ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), &IID_IPropertyNotifySink, NULL); @@ -501,11 +501,13 @@ void HTMLBodyElement_Create(HTMLElement *element) &DIID_HTMLTextContainerEvents, &ret->cp_propnotif); ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLBODY(ret)); - nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement, + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); if(NS_FAILED(nsres)) ERR("Could not get nsDOMHTMLBodyElement: %08x\n", nsres); - element->impl = (IUnknown*)HTMLBODY(ret); - element->destructor = HTMLBodyElement_destructor; + ret->element.impl = (IUnknown*)HTMLBODY(ret); + ret->element.destructor = HTMLBodyElement_destructor; + + return &ret->element; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9b4d47d..4c9743d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1296,6 +1296,8 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) if(!strcmpW(class_name, wszA)) ret = HTMLAnchorElement_Create(nselem); + else if(!strcmpW(class_name, wszBODY)) + ret = HTMLBodyElement_Create(nselem); else { ret = mshtml_alloc(sizeof(HTMLElement)); @@ -1303,9 +1305,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret->destructor = NULL; ret->nselem = nselem; - if(!strcmpW(class_name, wszBODY)) - HTMLBodyElement_Create(ret); - else if(!strcmpW(class_name, wszINPUT)) + if(!strcmpW(class_name, wszINPUT)) HTMLInputElement_Create(ret); else if(!strcmpW(class_name, wszSELECT)) HTMLSelectElement_Create(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ecfbbc9..250942c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -417,7 +417,7 @@ void detach_ranges(HTMLDocument*); HTMLElement *HTMLElement_Create(nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); -void HTMLBodyElement_Create(HTMLElement*); +HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*); void HTMLInputElement_Create(HTMLElement*); void HTMLSelectElement_Create(HTMLElement*); void HTMLTextAreaElement_Create(HTMLElement*);

1 0