Re: user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead.

[James Hawkins]

2008/7/8 Huw Davies :
> Fixes a todo_wine and a Valgrind warning.

@@ -699,10 +699,7 @@ static HDDEDATA CALLBACK
server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon

ptr = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke
data\r\n', got %s\n", ptr);
-        todo_wine
-        {
-            ok(size == 14, "Expected 14, got %d\n", size);
-        }
+        ok(size == 12, "Expected 12, got %d\n", size);
         DdeUnaccessData(hdata);

size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI);

You changed the value of the test.  Did you mean to do that?

user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead.

[Huw Davies]

James Hawkins wrote:
> 2008/7/8 Huw Davies :
> > Fixes a todo_wine and a Valgrind warning.
>
> @@ -699,10 +699,7 @@ static HDDEDATA CALLBACK
> server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon
>      ptr = (LPSTR)DdeAccessData(hdata, &size);
>      ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke
>
> data\r\n', got %s\n", ptr);
> -
>    todo_wine
> -
>    {
> -
>        ok(size == 14, "Expected 14, got %d\n", size);
> -
>    }
> -
>    ok(size == 12, "Expected 12, got %d\n", size);
>    DdeUnaccessData(hdata);
>
>    size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI);
>
> You changed the value of the test.  Did you mean to do that?

Yes.  See 'size' in create_poke().

Huw.

user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead.

[James Hawkins]

On Tue, Jul 8, 2008 at 1:18 PM, Huw Davies  wrote:
> James Hawkins wrote:
> > 2008/7/8 Huw Davies :
> > > Fixes a todo_wine and a Valgrind warning.
> >
> > @@ -699,10 +699,7 @@ static HDDEDATA CALLBACK
> > server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon
> >     ptr = (LPSTR)DdeAccessData(hdata, &size);
> >     ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke
> >
> > data\r\n', got %s\n", ptr);
> > -
> >    todo_wine
> > -
> >    {
> > -
> >        ok(size == 14, "Expected 14, got %d\n", size);
> > -
> >    }
> > -
> >    ok(size == 12, "Expected 12, got %d\n", size);
> >   DdeUnaccessData(hdata);
> >
> >   size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH,
> >
> > CP_WINANSI);
> >
> > You changed the value of the test.  Did you mean to do that?
>
> Yes.  See 'size' in create_poke().

Ah yes, I'm sorry.  I couldn't put 2 and 2 together :)