November 2005 - Wine-Commits

wine/dlls/winsock tests/sock.c socket.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21121 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:43:27 Modified files: dlls/winsock/tests: sock.c dlls/winsock : socket.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> - Stricten cases for NT in a two tests. - WSAAddressToString[AW] don't fail on Win9x for those. - Modify it to pass new tests. Patch: http://cvs.winehq.org/patch.py?id=21121 Old revision New revision Changes Path 1.26 1.27 +10 -4 wine/dlls/winsock/tests/sock.c 1.192 1.193 +2 -1 wine/dlls/winsock/socket.c Index: wine/dlls/winsock/tests/sock.c diff -u -p wine/dlls/winsock/tests/sock.c:1.26 wine/dlls/winsock/tests/sock.c:1.27 --- wine/dlls/winsock/tests/sock.c:1.26 5 Nov 2005 10:43:27 -0000 +++ wine/dlls/winsock/tests/sock.c 5 Nov 2005 10:43:27 -0000 @@ -1044,6 +1044,7 @@ static void test_WSAAddressToStringA(voi { INT ret; DWORD len; + int GLE; SOCKADDR_IN sockaddr; CHAR address[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ @@ -1059,8 +1060,10 @@ static void test_WSAAddressToStringA(voi sockaddr.sin_addr.s_addr = 0; ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( ret == SOCKET_ERROR, "WSAAddressToStringA() succeeded! WSAGetLastError()=%x, ret=%d\n", - WSAGetLastError(), ret ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), + "WSAAddressToStringA() failed unexpectedly: WSAGetLastError()=%d, ret=%d\n", + GLE, ret ); len = sizeof(address); @@ -1111,6 +1114,7 @@ static void test_WSAAddressToStringW(voi { INT ret; DWORD len; + int GLE; SOCKADDR_IN sockaddr; WCHAR address[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ @@ -1127,8 +1131,10 @@ static void test_WSAAddressToStringW(voi sockaddr.sin_addr.s_addr = 0; ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( ret == SOCKET_ERROR, "WSAAddressToStringW() succeeded! WSAGetLastError()=%x, ret=%d\n", - WSAGetLastError(), ret ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), + "WSAAddressToStringW() failed unexpectedly: WSAGetLastError()=%d, ret=%d\n", + GLE, ret ); len = sizeof(address); Index: wine/dlls/winsock/socket.c diff -u -p wine/dlls/winsock/socket.c:1.192 wine/dlls/winsock/socket.c:1.193 --- wine/dlls/winsock/socket.c:1.192 5 Nov 2005 10:43:27 -0000 +++ wine/dlls/winsock/socket.c 5 Nov 2005 10:43:27 -0000 @@ -3966,7 +3966,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKAD CHAR buffer[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ CHAR *p; - TRACE( "(%p, %lx, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); + TRACE( "(%p, %ld, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; if (!string || !lenstr) return SOCKET_ERROR; @@ -3989,6 +3989,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKAD if (*lenstr < size) { *lenstr = size; + WSASetLastError(WSAEFAULT); return SOCKET_ERROR; }

1 0

wine/dlls/msi/tests db.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21120 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:42:57 Modified files: dlls/msi/tests : db.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Win9x returns MSIDBERROR_NOERROR. Patch: http://cvs.winehq.org/patch.py?id=21120 Old revision New revision Changes Path 1.16 1.17 +2 -1 wine/dlls/msi/tests/db.c Index: wine/dlls/msi/tests/db.c diff -u -p wine/dlls/msi/tests/db.c:1.16 wine/dlls/msi/tests/db.c:1.17 --- wine/dlls/msi/tests/db.c:1.16 5 Nov 2005 10:42:57 -0000 +++ wine/dlls/msi/tests/db.c 5 Nov 2005 10:42:57 -0000 @@ -400,7 +400,8 @@ static void test_viewmodify(void) /* see what happens with a good hview and bad args */ r = MsiViewGetError( hview, NULL, NULL ); - ok(r == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n"); + ok(r == MSIDBERROR_INVALIDARG || r == MSIDBERROR_NOERROR, + "MsiViewGetError returns %u (expected -3)\n", r); r = MsiViewGetError( hview, buffer, NULL ); ok(r == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n");

1 0

wine/dlls/msxml3 tests/domdoc.c nodelist.c node.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21119 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:42:45 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : nodelist.c node.c Log message: Huw Davies <huw(a)codeweavers.com> Filter out CTEXT nodes when building element child lists. get_item and get_length should honour the filter. Add some '\n's to the tests so that libxml2 lists CTEXT nodes. Patch: http://cvs.winehq.org/patch.py?id=21119 Old revision New revision Changes Path 1.5 1.6 +13 -9 wine/dlls/msxml3/tests/domdoc.c 1.4 1.5 +17 -12 wine/dlls/msxml3/nodelist.c 1.11 1.12 +16 -1 wine/dlls/msxml3/node.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.5 wine/dlls/msxml3/tests/domdoc.c:1.6 --- wine/dlls/msxml3/tests/domdoc.c:1.5 5 Nov 2005 10:42:45 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 5 Nov 2005 10:42:45 -0000 @@ -50,15 +50,15 @@ static const WCHAR szComplete3[] = { '<','a','>','<','/','a','>','\n',0 }; static const WCHAR szComplete4[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>', - '<','l','c',' ','d','l','=','\'','s','t','r','1','\'','>', - '<','b','s',' ','v','r','=','\'','s','t','r','2','\'',' ', - 's','z','=','\'','1','2','3','4','\'','>','f','n','1','.','t','x','t','<','/','b','s','>', - '<','p','r',' ','i','d','=','\'','s','t','r','3','\'',' ', - 'v','r','=','\'','1','.','2','.','3','\'',' ', - 'p','n','=','\'','w','i','n','e',' ','2','0','0','5','0','8','0','4','\'','>', - 'f','n','2','.','t','x','t','<','/','p','r','>', + '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', + '<','l','c',' ','d','l','=','\'','s','t','r','1','\'','>','\n', + '<','b','s',' ','v','r','=','\'','s','t','r','2','\'',' ','s','z','=','\'','1','2','3','4','\'','>', + 'f','n','1','.','t','x','t','\n', + '<','/','b','s','>','\n', + '<','p','r',' ','i','d','=','\'','s','t','r','3','\'',' ','v','r','=','\'','1','.','2','.','3','\'',' ', + 'p','n','=','\'','w','i','n','e',' ','2','0','0','5','0','8','0','4','\'','>','\n', + 'f','n','2','.','t','x','t','\n', + '<','/','p','r','>','\n', '<','/','l','c','>','\n',0 }; static const WCHAR szNonExistentFile[] = { @@ -439,6 +439,10 @@ void test_domnode( void ) if (list) { + r = IXMLDOMNodeList_get_length( list, &count ); + ok( r == S_OK, "get_length returns %08lx\n", r ); + ok( count == 2, "get_length got %ld\n", count ); + r = IXMLDOMNodeList_nextNode( list, &node ); ok( r == S_OK, "nextNode returned wrong code\n"); } Index: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.4 wine/dlls/msxml3/nodelist.c:1.5 --- wine/dlls/msxml3/nodelist.c:1.4 5 Nov 2005 10:42:45 -0000 +++ wine/dlls/msxml3/nodelist.c 5 Nov 2005 10:42:45 -0000 @@ -254,6 +254,7 @@ static HRESULT WINAPI xmlnodelist_get_it xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlNodePtr curr; long nodeIndex = 0; + HRESULT r; TRACE("%p %ld\n", This, index); @@ -263,14 +264,16 @@ static HRESULT WINAPI xmlnodelist_get_it return S_FALSE; curr = This->node; - - for (nodeIndex = 0; nodeIndex < index; nodeIndex++) { - if (curr->next == NULL) - return S_FALSE; - else - curr = curr->next; + + while(curr) + { + r = xslt_next_match( &This->xinfo, &curr ); + if(FAILED(r) || !curr) return S_FALSE; + if(nodeIndex++ == index) break; + curr = curr->next; } - + if(!curr) return S_FALSE; + *listItem = create_node( curr ); return S_OK; @@ -283,6 +286,7 @@ static HRESULT WINAPI xmlnodelist_get_le xmlNodePtr curr; long nodeCount = 0; + HRESULT r; xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); @@ -293,13 +297,14 @@ static HRESULT WINAPI xmlnodelist_get_le return S_OK; } - curr = This->node; - nodeCount = 1; - while (curr->next != NULL) { + for(curr = This->node; curr; curr = curr->next) + { + r = xslt_next_match( &This->xinfo, &curr ); + if(FAILED(r) || !curr) break; nodeCount++; - curr = curr->next; } - *listLength = nodeCount; + + *listLength = nodeCount; return S_OK; } Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.11 wine/dlls/msxml3/node.c:1.12 --- wine/dlls/msxml3/node.c:1.11 5 Nov 2005 10:42:45 -0000 +++ wine/dlls/msxml3/node.c 5 Nov 2005 10:42:45 -0000 @@ -319,7 +319,22 @@ static HRESULT WINAPI xmlnode_get_childN if ( !childList ) return E_INVALIDARG; - *childList = create_nodelist( This->node->children ); + + switch(This->node->type) + { + case XML_ELEMENT_NODE: + *childList = create_filtered_nodelist( This->node->children, (const xmlChar *)"*" ); + break; + + case XML_ATTRIBUTE_NODE: + *childList = create_filtered_nodelist( This->node->children, (const xmlChar *)"node()" ); + break; + + default: + FIXME("unhandled node type %d\n", This->node->type); + break; + } + if (!*childList) return S_FALSE; return S_OK;

1 0

wine/dlls/comctl32 listview.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21118 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:42:36 Modified files: dlls/comctl32 : listview.c Log message: Dimi Paun <dimi(a)lattica.com> Validate the column index passed in by the caller. Patch: http://cvs.winehq.org/patch.py?id=21118 Old revision New revision Changes Path 1.434 1.435 +4 -1 wine/dlls/comctl32/listview.c Index: wine/dlls/comctl32/listview.c diff -u -p wine/dlls/comctl32/listview.c:1.434 wine/dlls/comctl32/listview.c:1.435 --- wine/dlls/comctl32/listview.c:1.434 5 Nov 2005 10:42:36 -0000 +++ wine/dlls/comctl32/listview.c 5 Nov 2005 10:42:36 -0000 @@ -5613,6 +5613,7 @@ static BOOL LISTVIEW_GetSubItemRect(LIST { POINT Position; LVITEMW lvItem; + INT nColumn = lprc->top; if (!lprc) return FALSE; @@ -5625,9 +5626,11 @@ static BOOL LISTVIEW_GetSubItemRect(LIST if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; + if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; + lvItem.mask = 0; lvItem.iItem = nItem; - lvItem.iSubItem = lprc->top; + lvItem.iSubItem = nColumn; if (lvItem.mask && !LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; switch(lprc->left)

1 0

wine/dlls/oleaut32 varformat.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21117 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:42:09 Modified files: dlls/oleaut32 : varformat.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Fixed FMT_DATE_GENERAL and FMT_DATE_TIME_SYS cases in VARIANT_FormatDate. Patch: http://cvs.winehq.org/patch.py?id=21117 Old revision New revision Changes Path 1.14 1.15 +6 -4 wine/dlls/oleaut32/varformat.c Index: wine/dlls/oleaut32/varformat.c diff -u -p wine/dlls/oleaut32/varformat.c:1.14 wine/dlls/oleaut32/varformat.c:1.15 --- wine/dlls/oleaut32/varformat.c:1.14 5 Nov 2005 10:42: 9 -0000 +++ wine/dlls/oleaut32/varformat.c 5 Nov 2005 10:42: 9 -0000 @@ -1598,10 +1598,11 @@ static HRESULT VARIANT_FormatDate(LPVARI case FMT_DATE_GENERAL: { BSTR date = NULL; - WCHAR *pDate = date; - hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, pbstrOut); + WCHAR *pDate; + hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, &date); if (FAILED(hRes)) goto VARIANT_FormatDate_Exit; + pDate = date; while (*pDate) *pBuff++ = *pDate++; SysFreeString(date); @@ -1623,10 +1624,11 @@ static HRESULT VARIANT_FormatDate(LPVARI { /* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */ BSTR date = NULL; - WCHAR *pDate = date; - hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, pbstrOut); + WCHAR *pDate; + hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, &date); if (FAILED(hRes)) goto VARIANT_FormatDate_Exit; + pDate = date; while (*pDate) *pBuff++ = *pDate++; SysFreeString(date);

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21116 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 06:39:17 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Tidy up UpdateTexture and add support for updating cube textures. Patch: http://cvs.winehq.org/patch.py?id=21116 Old revision New revision Changes Path 1.92 1.93 +110 -31 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.92 wine/dlls/wined3d/device.c:1.93 --- wine/dlls/wined3d/device.c:1.92 4 Nov 2005 12:39:17 -0000 +++ wine/dlls/wined3d/device.c 4 Nov 2005 12:39:17 -0000 @@ -4803,50 +4803,129 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawIn /* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, IWineD3DBaseTexture *pSourceTexture, IWineD3DBaseTexture *pDestinationTexture){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + HRESULT hr = D3D_OK; D3DRESOURCETYPE sourceType; D3DRESOURCETYPE destinationType; - IWineD3DTextureImpl *pDestTexture = (IWineD3DTextureImpl *)pDestinationTexture; - IWineD3DTextureImpl *pSrcTexture = (IWineD3DTextureImpl *)pSourceTexture; - int i; + int i ,levels; - sourceType = IWineD3DBaseTexture_GetType(pSourceTexture); - destinationType = IWineD3DBaseTexture_GetType(pDestinationTexture); - if(sourceType != D3DRTYPE_TEXTURE && destinationType != D3DRTYPE_TEXTURE){ - FIXME("(%p) Only D3DRTYPE_TEXTURE to D3DRTYPE_TEXTURE supported\n", This); - return D3DERR_INVALIDCALL; - } - TRACE("(%p) Source %p Destination %p\n", This, pSourceTexture, pDestinationTexture); + /* TODO: think about moving the code into IWineD3DBaseTexture */ - /** TODO: Get rid of the casts to IWineD3DBaseTextureImpl - repalce surfaces[x] with GetSurfaceLevel, or GetCubeMapSurface etc.. - think about moving the code into texture, and adding a member to base texture to occomplish this **/ + TRACE("(%p) Source %p Destination %p\n", This, pSourceTexture, pDestinationTexture); - /* Make sure that the destination texture is loaded */ - IWineD3DBaseTexture_PreLoad(pDestinationTexture); - TRACE("Loading source texture\n"); + /* verify that the source and destination textures arebn't NULL */ + if (NULL == pSourceTexture || NULL == pDestinationTexture) { + WARN("(%p) : source (%p) and destination (%p) textures must not be NULL, returning D3DERR_INVALIDCALL\n", + This, pSourceTexture, pDestinationTexture); + hr = D3DERR_INVALIDCALL; + } - if(pSrcTexture->surfaces[0] == NULL || pDestTexture->surfaces[0] == NULL){ - FIXME("(%p) Texture src %p or dest %p has not surface %p %p\n", This, pSrcTexture, pDestTexture, - pSrcTexture->surfaces[0], pDestTexture->surfaces[0]); + if (pSourceTexture == pDestinationTexture) { + WARN("(%p) : source (%p) and destination (%p) textures must be different, returning D3DERR_INVALIDCALL\n", + This, pSourceTexture, pDestinationTexture); + hr = D3DERR_INVALIDCALL; } + /* Verify that the source and destination textures are the same type */ + sourceType = IWineD3DBaseTexture_GetType(pSourceTexture); + destinationType = IWineD3DBaseTexture_GetType(pDestinationTexture); - if(((IWineD3DSurfaceImpl *)pSrcTexture->surfaces[0])->resource.pool != D3DPOOL_SYSTEMMEM || - ((IWineD3DSurfaceImpl *)pDestTexture->surfaces[0])->resource.pool != D3DPOOL_DEFAULT){ + if (sourceType != destinationType) { + WARN("(%p) Sorce and destination types must match, returning D3DERR_INVALIDCALL\n", + This); + hr = D3DERR_INVALIDCALL; + } - FIXME("(%p) source %p must be SYSTEMMEM and dest %p must be DEFAULT\n",This, pSrcTexture, pDestTexture); - return D3DERR_INVALIDCALL; + /* check that both textures have the identical numbers of levels */ + if (IWineD3DBaseTexture_GetLevelCount(pDestinationTexture) != IWineD3DBaseTexture_GetLevelCount(pSourceTexture)) { + WARN("(%p) : source (%p) and destination (%p) textures must have identicle numbers of levels, returning D3DERR_INVALIDCALL\n", This, pSourceTexture, pDestinationTexture); + hr = D3DERR_INVALIDCALL; } - /** TODO: check that both textures have the same number of levels **/ -#if 0 - if(IWineD3DBaseTexture_GetLevelCount(pDestinationTexture) !=IWineD3DBaseTexture_GetLevelCount(pSourceTexture)) - return D3DERR_INVALIDCALL; + + if (D3D_OK == hr) { + + /* Make sure that the destination texture is loaded */ + IWineD3DBaseTexture_PreLoad(pDestinationTexture); + + /* Update every surface level of the texture */ + levels = IWineD3DBaseTexture_GetLevelCount(pDestinationTexture); + + switch (sourceType) { + case D3DRTYPE_TEXTURE: + { + IWineD3DSurface *srcSurface; + IWineD3DSurface *destSurface; + + for (i = 0 ; i < levels ; ++i) { + IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)pSourceTexture, i, &srcSurface); + IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)pDestinationTexture, i, &destSurface); + hr = IWineD3DDevice_UpdateSurface(iface, srcSurface, NULL, destSurface, NULL); + IWineD3DSurface_Release(srcSurface); + IWineD3DSurface_Release(destSurface); + if (D3D_OK != hr) { + WARN("(%p) : Call to update surface failed\n", This); + return hr; + } + } + } + break; + case D3DRTYPE_CUBETEXTURE: + { + IWineD3DSurface *srcSurface; + IWineD3DSurface *destSurface; + D3DCUBEMAP_FACES faceType; + + for (i = 0 ; i < levels ; ++i) { + /* Update each cube face */ + for (faceType = D3DCUBEMAP_FACE_POSITIVE_X; faceType <= D3DCUBEMAP_FACE_NEGATIVE_Z; ++faceType){ + hr = IWineD3DCubeTexture_GetCubeMapSurface((IWineD3DCubeTexture *)pSourceTexture, faceType, i, &srcSurface); + if (D3D_OK != hr) { + FIXME("(%p) : Failed to get src cube surface facetype %d, level %d\n", This, faceType, i); + } else { + TRACE("Got srcSurface %p\n", srcSurface); + } + hr = IWineD3DCubeTexture_GetCubeMapSurface((IWineD3DCubeTexture *)pDestinationTexture, faceType, i, &destSurface); + if (D3D_OK != hr) { + FIXME("(%p) : Failed to get src cube surface facetype %d, level %d\n", This, faceType, i); + } else { + TRACE("Got desrSurface %p\n", destSurface); + } + hr = IWineD3DDevice_UpdateSurface(iface, srcSurface, NULL, destSurface, NULL); + IWineD3DSurface_Release(srcSurface); + IWineD3DSurface_Release(destSurface); + if (D3D_OK != hr) { + WARN("(%p) : Call to update surface failed\n", This); + return hr; + } + } + } + } + break; +#if 0 /* TODO: Add support for volume textures */ + case D3DRTYPE_VOLUMETEXTURE: + { + IWineD3DVolume srcVolume = NULL; + IWineD3DSurface destVolume = NULL; + + for (i = 0 ; i < levels ; ++i) { + IWineD3DVolumeTexture_GetVolume((IWineD3DVolumeTexture *)pSourceTexture, i, &srcVolume); + IWineD3DVolumeTexture_GetVolume((IWineD3DVolumeTexture *)pDestinationTexture, i, &destVolume); + hr = IWineD3DFoo_UpdateVolume(iface, srcVolume, NULL, destVolume, NULL); + IWineD3DVolume_Release(srcSurface); + IWineD3DVolume_Release(destSurface); + if (D3D_OK != hr) { + WARN("(%p) : Call to update volume failed\n", This); + return hr; + } + } + } + break; #endif - /** TODO: move this code into baseTexture? device should never touch impl*'s **/ - for(i = 0 ; i < IWineD3DBaseTexture_GetLevelCount(pDestinationTexture) ; i++){ - IWineD3DDevice_UpdateSurface(iface, pSrcTexture->surfaces[i], NULL, pDestTexture->surfaces[i], NULL); + default: + FIXME("(%p) : Unsupported source and destination type\n", This); + hr = D3DERR_INVALIDCALL; + } } - return D3D_OK; + return hr; } HRESULT WINAPI IWineD3DDeviceImpl_StretchRect(IWineD3DDevice *iface, IWineD3DSurface *pSourceSurface,

1 0

wine/tools/winapi win32.api win16.api
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21115 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:44:01 Modified files: tools/winapi : win32.api win16.api Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Update win16.api and win32.api. Patch: http://cvs.winehq.org/patch.py?id=21115 Old revision New revision Changes Path 1.53 1.54 +21 -1 wine/tools/winapi/win32.api 1.20 1.21 +1 -1 wine/tools/winapi/win16.api Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.53 wine/tools/winapi/win32.api:1.54 --- wine/tools/winapi/win32.api:1.53 4 Nov 2005 11:44: 1 -0000 +++ wine/tools/winapi/win32.api 4 Nov 2005 11:44: 1 -0000 @@ -80,6 +80,7 @@ LPDWORD LPENUM_SERVICE_STATUSA LPENUM_SERVICE_STATUSW LPHANDLER_FUNCTION +LPHANDLER_FUNCTION_EX LPHW_PROFILE_INFOA LPHW_PROFILE_INFOW LPINT @@ -228,6 +229,10 @@ DWORD HINSTANCE HRESULT +%long --pointer + +DWORD_PTR + %ptr _ATL_INTMAP_ENTRY * @@ -605,6 +610,7 @@ HANDLE HCERTSTORE HCRYPTPROV LONG +ULONG %ptr @@ -618,6 +624,7 @@ GUID * HCRYPTKEY * HCRYPTOIDFUNCSET LPFILETIME +LPVOID LPWSTR * PCCERT_CONTEXT PCCERT_CONTEXT * @@ -630,6 +637,7 @@ PCERT_INFO PCERT_NAME_INFO PCERT_PUBLIC_KEY_INFO PCERT_RDN_ATTR +PCRYPT_ALGORITHM_IDENTIFIER PCRYPT_ATTRIBUTE PCRYPT_DECODE_PARA PCRYPT_ENCODE_PARA @@ -646,6 +654,7 @@ LPSTR %void +VOID void %wstr @@ -761,6 +770,7 @@ PMINIDUMP_EXCEPTION_INFORMATION PMINIDUMP_USER_STREAM_INFORMATION PREAD_PROCESS_MEMORY_ROUTINE PSYM_ENUMERATESYMBOLS_CALLBACK +PSYM_ENUMLINES_CALLBACK PSYM_ENUMMODULES_CALLBACK PSYM_ENUMSOURCEFILES_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK @@ -2149,6 +2159,8 @@ LPVOID LPVOID * MSIHANDLE * PCCERT_CONTEXT * +PHKEY +PMSIFILEHASHINFO REFCLSID REFIID UINT * @@ -2227,6 +2239,11 @@ unsigned int unsigned long unsigned short int +%long --pointer + +MSVCRT_intptr_t +MSVCRT_uintptr_t + %longlong __int64 @@ -2616,6 +2633,7 @@ PCANSI_STRING PCRTL_BITMAP PCSZ PDEBUG_BUFFER +PDIRECTORY_BASIC_INFORMATION PDWORD PEB * PEXCEPTION_RECORD @@ -2634,7 +2652,6 @@ PLPC_SECTION_WRITE PLUID PLUID_AND_ATTRIBUTES PNTAPCFUNC -POBJDIR_INFORMATION POBJECT_ATTRIBUTES PPRIVILEGE_SET PRTL_BITMAP @@ -3400,6 +3417,9 @@ LONG_PTR CLSID * CStdPSFactoryBuffer * +DWORD * +IRpcChannelBuffer * +IRpcStubBuffer * LPPSFACTORYBUFFER LPRPCCHANNELBUFFER LPRPCPROXYBUFFER * Index: wine/tools/winapi/win16.api diff -u -p wine/tools/winapi/win16.api:1.20 wine/tools/winapi/win16.api:1.21 --- wine/tools/winapi/win16.api:1.20 4 Nov 2005 11:44: 1 -0000 +++ wine/tools/winapi/win16.api 4 Nov 2005 11:44: 1 -0000 @@ -1009,7 +1009,7 @@ UINT16 WORD WPARAM16 -%%sound.dll +%%sound.drv %long

1 0

wine/dlls/advapi32 service.c security.c regist ...
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21114 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:43:27 Modified files: dlls/advapi32 : service.c security.c registry.c eventlog.c crypt.c advapi.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Patch: http://cvs.winehq.org/patch.py?id=21114 Old revision New revision Changes Path 1.95 1.96 +5 -5 wine/dlls/advapi32/service.c 1.114 1.115 +9 -3 wine/dlls/advapi32/security.c 1.84 1.85 +27 -18 wine/dlls/advapi32/registry.c 1.25 1.26 +7 -7 wine/dlls/advapi32/eventlog.c 1.72 1.73 +29 -15 wine/dlls/advapi32/crypt.c 1.34 1.35 +4 -1 wine/dlls/advapi32/advapi.c

1 0

wine/dlls/kernel except.c
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21113 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:42:48 Modified files: dlls/kernel : except.c Log message: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> More verbose output when unhandled exception occurs. Patch: http://cvs.winehq.org/patch.py?id=21113 Old revision New revision Changes Path 1.15 1.16 +9 -6 wine/dlls/kernel/except.c Index: wine/dlls/kernel/except.c diff -u -p wine/dlls/kernel/except.c:1.15 wine/dlls/kernel/except.c:1.16 --- wine/dlls/kernel/except.c:1.15 4 Nov 2005 11:42:48 -0000 +++ wine/dlls/kernel/except.c 4 Nov 2005 11:42:48 -0000 @@ -161,14 +161,12 @@ static int format_exception_msg( const E return -1; #ifdef __i386__ if (ptr->ContextRecord->SegCs != wine_get_cs()) - len2 = snprintf(buffer+len, size-len, - " at address 0x%04lx:0x%08lx.\nDo you wish to debug it ?", + len2 = snprintf(buffer+len, size-len, " at address 0x%04lx:0x%08lx", ptr->ContextRecord->SegCs, (DWORD)ptr->ExceptionRecord->ExceptionAddress); else #endif - len2 = snprintf(buffer+len, size-len, - " at address %p.\nDo you wish to debug it ?", + len2 = snprintf(buffer+len, size-len, " at address %p", ptr->ExceptionRecord->ExceptionAddress); if ((len2<0) || (len>=size-len)) return -1; @@ -224,6 +222,7 @@ static BOOL start_debugger(PEXCEPTION_PO STARTUPINFOA startup; char* format = NULL; BOOL ret = FALSE; + char buffer[256]; static const WCHAR AeDebugW[] = {'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', @@ -234,7 +233,8 @@ static BOOL start_debugger(PEXCEPTION_PO static const WCHAR DebuggerW[] = {'D','e','b','u','g','g','e','r',0}; static const WCHAR AutoW[] = {'A','u','t','o',0}; - MESSAGE("wine: Unhandled exception (thread %04lx), starting debugger...\n", GetCurrentThreadId()); + format_exception_msg( epointers, buffer, sizeof(buffer) ); + MESSAGE("wine: %s (thread %04lx), starting debugger...\n", buffer, GetCurrentThreadId()); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -317,8 +317,11 @@ static BOOL start_debugger(PEXCEPTION_PO if (mod) pMessageBoxA = (MessageBoxA_funcptr)GetProcAddress( mod, "MessageBoxA" ); if (pMessageBoxA) { + static const char msg[] = ".\nDo you wish to debug it?"; char buffer[256]; - format_exception_msg( epointers, buffer, sizeof(buffer) ); + + format_exception_msg( epointers, buffer, sizeof(buffer)-sizeof(msg) ); + strcat( buffer, msg ); if (pMessageBoxA( 0, buffer, "Exception raised", MB_YESNO | MB_ICONHAND ) == IDNO) { TRACE("Killing process\n");

1 0

wine/dlls/shell32 tests/shelllink.c shelllink.c
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21112 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:40:58 Modified files: dlls/shell32/tests: shelllink.c dlls/shell32 : shelllink.c Log message: Mike McCormack <mike(a)codeweavers.com> Partially implement and test the shelllink object's IShellLinkDataList::CopyDataBlock and GetFlags methods. Patch: http://cvs.winehq.org/patch.py?id=21112 Old revision New revision Changes Path 1.8 1.9 +73 -0 wine/dlls/shell32/tests/shelllink.c 1.111 1.112 +62 -11 wine/dlls/shell32/shelllink.c Index: wine/dlls/shell32/tests/shelllink.c diff -u -p wine/dlls/shell32/tests/shelllink.c:1.8 wine/dlls/shell32/tests/shelllink.c:1.9 --- wine/dlls/shell32/tests/shelllink.c:1.8 4 Nov 2005 11:40:58 -0000 +++ wine/dlls/shell32/tests/shelllink.c 4 Nov 2005 11:40:58 -0000 @@ -511,6 +511,78 @@ static void test_load_save(void) ok(r, "failed to delete link (%ld)\n", GetLastError()); } +static void test_datalink(void) +{ + static const WCHAR lnk[] = { + ':',':','{','9','d','b','1','1','8','6','f','-','4','0','d','f','-','1', + '1','d','1','-','a','a','8','c','-','0','0','c','0','4','f','b','6','7', + '8','6','3','}',':','{','0','0','0','1','0','4','0','9','-','7','8','E', + '1','-','1','1','D','2','-','B','6','0','F','-','0','0','6','0','9','7', + 'C','9','9','8','E','7','}',':',':','{','9','d','b','1','1','8','6','e', + '-','4','0','d','f','-','1','1','d','1','-','a','a','8','c','-','0','0', + 'c','0','4','f','b','6','7','8','6','3','}',':','2','6',',','!','!','g', + 'x','s','f','(','N','g',']','q','F','`','H','{','L','s','A','C','C','E', + 'S','S','F','i','l','e','s','>','p','l','T',']','j','I','{','j','f','(', + '=','1','&','L','[','-','8','1','-',']',':',':',0 }; + static const WCHAR comp[] = { + '2','6',',','!','!','g','x','s','f','(','N','g',']','q','F','`','H','{', + 'L','s','A','C','C','E','S','S','F','i','l','e','s','>','p','l','T',']', + 'j','I','{','j','f','(','=','1','&','L','[','-','8','1','-',']',0 }; + IShellLinkDataList *dl = NULL; + IShellLinkW *sl = NULL; + HRESULT r; + DWORD flags = 0; + EXP_DARWIN_LINK *dar; + + r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&sl ); + ok( r == S_OK, "no shelllink\n"); + if (!sl) + return; + + r = IShellLinkW_QueryInterface( sl, &IID_IShellLinkDataList, (LPVOID*) &dl ); + ok(r == S_OK, "no datalink interface\n"); + + if (!dl) + return; + + flags = 0; + r = dl->lpVtbl->GetFlags( dl, &flags ); + ok( r == S_OK, "GetFlags failed\n"); + ok( flags == 0, "GetFlags returned wrong flags\n"); + + dar = (void*)-1; + r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); + ok( r == E_FAIL, "CopyDataBlock failed\n"); + ok( dar == NULL, "should be null\n"); + + r = IShellLinkW_SetPath(sl, lnk); + ok(r == S_OK, "set path failed\n"); + + /* + * The following crashes: + * r = dl->lpVtbl->GetFlags( dl, NULL ); + */ + + flags = 0; + r = dl->lpVtbl->GetFlags( dl, &flags ); + ok( r == S_OK, "GetFlags failed\n"); + ok( flags == (SLDF_HAS_DARWINID|SLDF_HAS_LOGO3ID), + "GetFlags returned wrong flags\n"); + + dar = NULL; + r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); + ok( r == S_OK, "CopyDataBlock failed\n"); + + ok( dar && dar->dbh.dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n"); + ok( dar && 0==lstrcmpW(dar->szwDarwinID, comp ), "signature wrong\n"); + + LocalFree( dar ); + + IUnknown_Release( dl ); + IShellLinkW_Release( sl ); +} + START_TEST(shelllink) { HRESULT r; @@ -522,6 +594,7 @@ START_TEST(shelllink) test_get_set(); test_load_save(); + test_datalink(); CoUninitialize(); } Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.111 wine/dlls/shell32/shelllink.c:1.112 --- wine/dlls/shell32/shelllink.c:1.111 4 Nov 2005 11:40:58 -0000 +++ wine/dlls/shell32/shelllink.c 4 Nov 2005 11:40:58 -0000 @@ -1014,20 +1014,29 @@ static HRESULT Stream_WriteLocationInfo( return IStream_Write( stm, loc, total_size, &count ); } +static EXP_DARWIN_LINK* shelllink_build_darwinid( LPCWSTR string, DWORD magic ) +{ + EXP_DARWIN_LINK *buffer; + + buffer = LocalAlloc( LMEM_ZEROINIT, sizeof *buffer ); + buffer->dbh.cbSize = sizeof buffer; + buffer->dbh.dwSignature = magic; + lstrcpynW( buffer->szwDarwinID, string, MAX_PATH ); + WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL ); + + return buffer; +} + static HRESULT Stream_WriteAdvertiseInfo( IStream* stm, LPCWSTR string, DWORD magic ) { + EXP_DARWIN_LINK *buffer; ULONG count; - EXP_DARWIN_LINK buffer; TRACE("%p\n",stm); - memset( &buffer, 0, sizeof buffer ); - buffer.dbh.cbSize = sizeof buffer; - buffer.dbh.dwSignature = magic; - lstrcpynW( buffer.szwDarwinID, string, MAX_PATH ); - WideCharToMultiByte(CP_ACP, 0, string, -1, buffer.szDarwinID, MAX_PATH, NULL, NULL ); + buffer = shelllink_build_darwinid( string, magic ); - return IStream_Write( stm, &buffer, buffer.dbh.cbSize, &count ); + return IStream_Write( stm, &buffer, buffer->dbh.cbSize, &count ); } /************************************************************************ @@ -2246,8 +2255,32 @@ ShellLink_AddDataBlock( IShellLinkDataLi static HRESULT WINAPI ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBlock ) { - FIXME("\n"); - return E_NOTIMPL; + IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); + LPVOID block = NULL; + HRESULT r = E_FAIL; + + TRACE("%p %08lx %p\n", iface, dwSig, ppDataBlock ); + + switch (dwSig) + { + case EXP_DARWIN_ID_SIG: + if (!This->sComponent) + break; + block = shelllink_build_darwinid( This->sComponent, dwSig ); + r = S_OK; + break; + case EXP_SZ_LINK_SIG: + case NT_CONSOLE_PROPS_SIG: + case NT_FE_CONSOLE_PROPS_SIG: + case EXP_SPECIAL_FOLDER_SIG: + case EXP_SZ_ICON_SIG: + FIXME("valid but unhandled datablock %08lx\n", dwSig); + break; + default: + ERR("unknown datablock %08lx\n", dwSig); + } + *ppDataBlock = block; + return r; } static HRESULT WINAPI @@ -2260,8 +2293,26 @@ ShellLink_RemoveDataBlock( IShellLinkDat static HRESULT WINAPI ShellLink_GetFlags( IShellLinkDataList* iface, DWORD* pdwFlags ) { - FIXME("\n"); - return E_NOTIMPL; + IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); + DWORD flags = 0; + + FIXME("%p %p\n", This, pdwFlags ); + + /* FIXME: add more */ + if (This->sArgs) + flags |= SLDF_HAS_ARGS; + if (This->sComponent) + flags |= SLDF_HAS_DARWINID; + if (This->sIcoPath) + flags |= SLDF_HAS_ICONLOCATION; + if (This->sProduct) + flags |= SLDF_HAS_LOGO3ID; + if (This->pPidl) + flags |= SLDF_HAS_ID_LIST; + + *pdwFlags = flags; + + return S_OK; } static HRESULT WINAPI

1 0