Re: ws2_32: Remove dead assignment (Clang)

2011-07-06 Thread Marcus Meissner 
On Wed, Jul 06, 2011 at 10:34:45AM +0200, Frédéric Delanoy wrote:
 ---
  dlls/ws2_32/socket.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
 index 4fc65ab..91aab01 100644
 --- a/dlls/ws2_32/socket.c
 +++ b/dlls/ws2_32/socket.c
 @@ -5874,7 +5874,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr 
 *addr, LPINT addrlen,
 {
 case CF_ACCEPT:
 if (addr  addrlen)
 -   addr = memcpy(addr, src_addr, (*addrlen  
 size) ?  size : *addrlen );
 +   memcpy(addr, src_addr, (*addrlen  size) ?  size 
 : *addrlen );

This is wrong. Keep the addrlen check.

Ciao, Marcus

Re: shell32: Remove dead assignments (Clang)

2011-07-06 Thread Nikolay Sivov 
2011/7/6 Frédéric Delanoy frederic.dela...@gmail.com:
 ---
  dlls/shell32/shelllink.c |   16 
  1 files changed, 8 insertions(+), 8 deletions(-)

 diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
 index 07fe7aa..fff0e79 100644
 --- a/dlls/shell32/shelllink.c
 +++ b/dlls/shell32/shelllink.c
 @@ -1189,29 +1189,29 @@ static HRESULT WINAPI IPersistStream_fnSave(
         Stream_WriteLocationInfo( stm, This-sPath, This-volume );

     if( This-sDescription )
 -        r = Stream_WriteString( stm, This-sDescription );
 +        Stream_WriteString( stm, This-sDescription );


This is questionable. If you write to a provided stream it's ok for it
to fail write operation, this needs a test. Method return value should
probably reflect write failure.

Re: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9

2011-07-06 Thread Michael Mc Donnell 
The D3DXWeldVertices function is stubbed in the spec file, so I needed
to add it as a real stub. Does this look correct(works here)?
From 58a513680ea0562cdb299f9e0b886188692e6f5e Mon Sep 17 00:00:00 2001
From: Michael Mc Donnell mich...@mcdonnell.dk
Date: Tue, 5 Jul 2011 23:06:37 +0200
Subject: d3dx9: Add stub for D3DXWeldVertices.

---
 dlls/d3dx9_36/d3dx9_36.spec |2 +-
 dlls/d3dx9_36/mesh.c|   37 +
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 5973d20..27cc6e6 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -333,4 +333,4 @@
 @ stdcall D3DXVec4Normalize(ptr ptr)
 @ stdcall D3DXVec4Transform(ptr ptr ptr)
 @ stdcall D3DXVec4TransformArray(ptr long ptr long ptr long)
-@ stub D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
+@ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 2807150..1f34af3 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -5210,3 +5210,40 @@ error:
 
 return hr;
 }
+
+/*
+ * D3DXWeldVertices(D3DX9_36.@)
+ *
+ * Welds together close vertices. The distance between vert-
+ * ices can be the position and/or other attributes, e.g.
+ * normal and color.
+ *
+ * PARAMS
+ *   mesh [I] Mesh which vertices will be welded together.
+ *   flags[I] D3DXWELDEPSILONSFLAGS specifying how to weld.
+ *   epsilons [I] How close each attribute needs to be for welding.
+ *   adjacency[I] Which faces are adjacent to other faces.
+ *   adjacency_out[O] Updated adjacency after welding.
+ *   face_remap_out   [O] Which faces the old faces have been mapped to.
+ *   vertex_remap_out [O] Which vertices the old vertices have been mapped to.
+ *
+ * RETURNS
+ *   Success: D3D_OK.
+ *   Failure: D3DERR_INVALIDCALL.
+ *
+ * BUGS
+ *   Unimplemented
+ */
+HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh,
+DWORD flags,
+CONST D3DXWELDEPSILONS *epsilons,
+CONST DWORD *adjacency,
+DWORD *adjacency_out,
+DWORD *face_remap_out,
+LPD3DXBUFFER *vertex_remap_out)
+{
+FIXME((%p, %x, %p, %p, %p, %p, %p): stub\n, mesh, flags, epsilons,
+   adjacency, adjacency_out, face_remap_out, vertex_remap_out);
+
+return E_NOTIMPL;
+}
-- 
1.7.5.4

Re: ws2_32: Remove dead assignment (Clang)

2011-07-06 Thread Marcus Meissner 
On Wed, Jul 06, 2011 at 10:57:12AM +0200, Marcus Meissner wrote:
 On Wed, Jul 06, 2011 at 10:34:45AM +0200, Frédéric Delanoy wrote:
  ---
   dlls/ws2_32/socket.c |2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)
  
  diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
  index 4fc65ab..91aab01 100644
  --- a/dlls/ws2_32/socket.c
  +++ b/dlls/ws2_32/socket.c
  @@ -5874,7 +5874,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr 
  *addr, LPINT addrlen,
  {
  case CF_ACCEPT:
  if (addr  addrlen)
  -   addr = memcpy(addr, src_addr, (*addrlen  
  size) ?  size : *addrlen );
  +   memcpy(addr, src_addr, (*addrlen  size) ?  
  size : *addrlen );
 
 This is wrong. Keep the addrlen check.

Sorry, was mistaken... I thought you removed the if().

Ciao, Marcus

Re: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9

2011-07-06 Thread Stefan Dösinger 
On Wednesday 06 July 2011 11:04:17 Michael Mc Donnell wrote:
 The D3DXWeldVertices function is stubbed in the spec file, so I needed
 to add it as a real stub. Does this look correct(works here)?
Looks good to me. Also check the other d3dx9 libs, they should forward their 
implementations to d3dx9_36 via the spec file if the function exists in the 
native version of that dll.


signature.asc
Description: This is a digitally signed message part.

Re: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9

2011-07-06 Thread Henri Verbeet 
On 6 July 2011 13:32, Stefan Dösinger stefandoesin...@gmx.at wrote:
 On Wednesday 06 July 2011 11:04:17 Michael Mc Donnell wrote:
 The D3DXWeldVertices function is stubbed in the spec file, so I needed
 to add it as a real stub. Does this look correct(works here)?
 Looks good to me. Also check the other d3dx9 libs, they should forward their
 implementations to d3dx9_36 via the spec file if the function exists in the
 native version of that dll.

tools/make_specfiles should probably take care of that.

Re: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9

2011-07-06 Thread Michael Mc Donnell 
On Wed, Jul 6, 2011 at 1:32 PM, Stefan Dösinger stefandoesin...@gmx.at wrote:
 On Wednesday 06 July 2011 11:04:17 Michael Mc Donnell wrote:
 The D3DXWeldVertices function is stubbed in the spec file, so I needed
 to add it as a real stub. Does this look correct(works here)?
 Looks good to me. Also check the other d3dx9 libs, they should forward their
 implementations to d3dx9_36 via the spec file if the function exists in the
 native version of that dll.

I think they're already forwarded. In all the other spec files I find:

@ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
d3dx9_36.D3DXWeldVertices

That means they're all forwarded to d3dx9_36?

Re: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9

2011-07-06 Thread Michael Mc Donnell 
On Wed, Jul 6, 2011 at 1:54 PM, Michael Mc Donnell mich...@mcdonnell.dk wrote:
 On Wed, Jul 6, 2011 at 1:32 PM, Stefan Dösinger stefandoesin...@gmx.at 
 wrote:
 On Wednesday 06 July 2011 11:04:17 Michael Mc Donnell wrote:
 The D3DXWeldVertices function is stubbed in the spec file, so I needed
 to add it as a real stub. Does this look correct(works here)?
 Looks good to me. Also check the other d3dx9 libs, they should forward their
 implementations to d3dx9_36 via the spec file if the function exists in the
 native version of that dll.

 I think they're already forwarded. In all the other spec files I find:

 @ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
 d3dx9_36.D3DXWeldVertices

 That means they're all forwarded to d3dx9_36?


Btw. I just found a bug in the documentation, so here's the updated version.
From db34038a78d6a355a8337844f89397f5c8b1fbce Mon Sep 17 00:00:00 2001
From: Michael Mc Donnell mich...@mcdonnell.dk
Date: Tue, 5 Jul 2011 23:06:37 +0200
Subject: d3dx9: Add stub for D3DXWeldVertices.

Fixed bug in documentation
---
 dlls/d3dx9_36/d3dx9_36.spec |2 +-
 dlls/d3dx9_36/mesh.c|   37 +
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 5973d20..27cc6e6 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -333,4 +333,4 @@
 @ stdcall D3DXVec4Normalize(ptr ptr)
 @ stdcall D3DXVec4Transform(ptr ptr ptr)
 @ stdcall D3DXVec4TransformArray(ptr long ptr long ptr long)
-@ stub D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
+@ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 2807150..311a35c 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -5210,3 +5210,40 @@ error:
 
 return hr;
 }
+
+/*
+ * D3DXWeldVertices(D3DX9_36.@)
+ *
+ * Welds together close vertices. The distance between vert-
+ * ices can be the position and/or other components, e.g.
+ * normal and texture coordinates.
+ *
+ * PARAMS
+ *   mesh [I] Mesh which vertices will be welded together.
+ *   flags[I] D3DXWELDEPSILONSFLAGS specifying how to weld.
+ *   epsilons [I] How close each attribute needs to be for welding.
+ *   adjacency[I] Which faces are adjacent to other faces.
+ *   adjacency_out[O] Updated adjacency after welding.
+ *   face_remap_out   [O] Which faces the old faces have been mapped to.
+ *   vertex_remap_out [O] Which vertices the old vertices have been mapped to.
+ *
+ * RETURNS
+ *   Success: D3D_OK.
+ *   Failure: D3DERR_INVALIDCALL.
+ *
+ * BUGS
+ *   Unimplemented
+ */
+HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh,
+DWORD flags,
+CONST D3DXWELDEPSILONS *epsilons,
+CONST DWORD *adjacency,
+DWORD *adjacency_out,
+DWORD *face_remap_out,
+LPD3DXBUFFER *vertex_remap_out)
+{
+FIXME((%p, %x, %p, %p, %p, %p, %p): stub\n, mesh, flags, epsilons,
+   adjacency, adjacency_out, face_remap_out, vertex_remap_out);
+
+return E_NOTIMPL;
+}
-- 
1.7.5.4

Re: kernel32: Fixes various 'profile' functions.

2011-07-06 Thread André Hentschel 

spotted with a quick look on it:

Am 06.07.2011 18:54, schrieb Christian Inci:
 kernel32: Fixes various 'profile' functions.
 
 diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c
 index a2bd5b5..da7661c 100644
 --- a/dlls/kernel32/profile.c
 +++ b/dlls/kernel32/profile.c
 @@ -316,6 +316,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, 
 ENCODING * pEncoding)
  PROFILESECTION **next_section;
  PROFILEKEY *key, *prev_key, **next_key;
  DWORD dwFileSize;
 +BOOL no_section = TRUE;
  
  TRACE(%p\n, hFile);
  
 @@ -440,6 +441,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, 
 ENCODING * pEncoding)
  next_section  = section-next;
  next_key  = section-key;
  prev_key  = NULL;
 +no_section = FALSE;

formatting!

 @@ -1179,6 +1183,7 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, 
 LPCSTR entry,
  ret = len - 1;
  }
  buffer[ret] = 0;
 +buffer[ret+1] = 0;
  }

really?

-- 

Best Regards, André Hentschel

Re: msxml3: Don't format xml output if we should be preserving whitespace.

2011-07-06 Thread Marvin 
Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?
Full results can be found at
http://testbot.winehq.org/JobDetails.pl?Key=12283

Your paranoid android.


=== W2KPROSP4 (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root

=== WXPPROSP3 (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root

=== W2K3R2SESP2 (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root

=== WVISTAADM (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root

=== W2K8SE (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root

=== W7PRO (32 bit domdoc) ===
domdoc.c:9104: Test failed: got Lrootfoobar//foo/root, expected 
root