December 2007 - Wine-commits

Alexandre Julliard : server: Return correct object types in the get_directory_entry request.
by Alexandre Julliard 06 Dec '07

06 Dec '07

1 0

Gerald Pfeifer : icmp: Correctly handle underflow in IcmpSendEcho().
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 25301a76e61d745df8e1b2962901976a9f6972e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25301a76e61d745df8e1b2962… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Dec 5 12:14:55 2007 +0100 icmp: Correctly handle underflow in IcmpSendEcho(). --- dlls/icmp/icmp_main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c index 31bd0c1..8834282 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/icmp/icmp_main.c @@ -433,8 +433,9 @@ DWORD WINAPI IcmpSendEcho( * Decrease the timeout so that we don't enter an endless loop even * if we get flooded with ICMP packets that are not for us. */ - Timeout -= (recv_time - send_time); - if (Timeout < 0) Timeout = 0; + DWORD t = (recv_time - send_time); + if (Timeout > t) Timeout -= t; + else Timeout = 0; continue; } else { /* This is a reply to our packet */

1 0

Paul Vriens : kernel32/tests: Test for functions should be or-ed.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 5e30e5a0f292d46afde3263e0b721ae41801d8a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e30e5a0f292d46afde3263e0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Dec 5 14:22:05 2007 +0100 kernel32/tests: Test for functions should be or-ed. --- dlls/kernel32/tests/console.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d3605aa..6204fa5 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -851,7 +851,7 @@ START_TEST(console) testCtrlHandler(); /* still to be done: access rights & access on objects */ - if (!pGetConsoleInputExeNameA && !pSetConsoleInputExeNameA) + if (!pGetConsoleInputExeNameA || !pSetConsoleInputExeNameA) { skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n"); return;

1 0

Jeremy Newman : update the author field to include a contact link
by Jeremy Newman 05 Dec '07

05 Dec '07

Module: website Branch: master Commit: 3d1567a18632a885c30810ab57051ee8f92a194b URL: http://source.winehq.org/git/website.git/?a=commit;h=3d1567a18632a885c30810… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 5 13:08:19 2007 -0600 update the author field to include a contact link Original Patch By: Zachary Goldberg <zgs(a)seas.upenn.edu> --- include/wwn.php | 3 +++ templates/en/wwn.template | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index e81b1bb..0d9f8ec 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -11,6 +11,7 @@ class wwn var $who; var $author; var $email; + var $contact; var $body; var $summary; var $person; @@ -242,6 +243,7 @@ class wwn 'summary' => $summary_box, 'xml' => $wwn{$cur}, 'author' => $this->author, + 'contact' => $this->contact, 'body' => $this->body, ); $wwn_body = $html->template("base", "wwn", $wwn_vars); @@ -349,6 +351,7 @@ class wwn break; case "AUTHOR": $this->email = $attrs{'EMAIL'}; + $this->contact = $attrs{'CONTACT'}; break; case "INTRO": $this->body .= "<a name=\"Intro\"></a>\n"; diff --git a/templates/en/wwn.template b/templates/en/wwn.template index cc83529..f911335 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -8,7 +8,7 @@ <td align="right"> {$date} <img src="{$root}/images/grey_pixel.gif" width="100%" height="1" alt="-"> - by {$author} + by <a href="{$contact}">{$author}</a> </td> </tr> </table>

1 0

Rob Shearman : rpcrt4: Set the memory pointer in NdrBaseTypeUnmarshall to the buffer if we' re unmarshalling on a server without memory being passed in.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 13e47d762aec935687d9a0c1b08e10dc37889ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e47d762aec935687d9a0c1b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 11:56:32 2007 +0000 rpcrt4: Set the memory pointer in NdrBaseTypeUnmarshall to the buffer if we're unmarshalling on a server without memory being passed in. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++++++---- dlls/rpcrt4/tests/ndr_marshall.c | 4 ---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3e5021a..3f991ce 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5463,10 +5463,18 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( #define BASE_TYPE_UNMARSHALL(type) \ ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ - if (fMustAlloc || !*ppMemory) \ - *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ - TRACE("*ppMemory: %p\n", *ppMemory); \ - **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ + if (!fMustAlloc && !pStubMsg->IsClient && !*ppMemory) \ + { \ + *ppMemory = pStubMsg->Buffer; \ + TRACE("*ppMemory: %p\n", *ppMemory); \ + } \ + else \ + { \ + if (fMustAlloc) \ + *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ + TRACE("*ppMemory: %p\n", *ppMemory); \ + **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ + } \ pStubMsg->Buffer += sizeof(type); switch(*pFormat) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 25448e9..d2ea543 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -250,17 +250,13 @@ todo_wine { if (formattypes[2] == 0xd /* FC_ENUM16 */) ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); else -todo_wine { ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); - } ok(!cmp(mem, memsrc, size), "%s: incorrecly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); if (formattypes[2] != 0xd /* FC_ENUM16 */) { -todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; - } } } HeapFree(GetProcessHeap(), 0, mem_orig);

1 0

Rob Shearman : rpcrt4: Set fMustAlloc to TRUE when unmarshalling an object pointer.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 17132f7e1f8c05f3c20c8a85fb7385bccff86ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17132f7e1f8c05f3c20c8a85f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 11:56:14 2007 +0000 rpcrt4: Set fMustAlloc to TRUE when unmarshalling an object pointer. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 781143a..3e5021a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -988,7 +988,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!fMustAlloc && pSrcPointer) { FIXME("free object pointer %p\n", pSrcPointer); - pSrcPointer = NULL; + fMustAlloc = TRUE; } if (pointer_id) pointer_needs_unmarshaling = 1;

1 0

Luis C. Busquets Pérez : d3dx8: Implementation of D3DXAssembleShaderFromFileA.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 07cb7c6626292ca508dcd06541110ebb450e0a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cb7c6626292ca508dcd0654… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Wed Dec 5 08:44:22 2007 +0100 d3dx8: Implementation of D3DXAssembleShaderFromFileA. --- dlls/d3dx8/d3dx8_main.c | 19 ++++++++++++++----- include/d3dx8core.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index 9221221..16c3740 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -29,11 +29,10 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" - +#include "wine/unicode.h" #include "d3dx8core.h" #include "d3dx8core_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(d3d); HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { @@ -79,11 +78,21 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors) { - FIXME("(void): stub\n"); - return D3D_OK; + LPWSTR pSrcFileW = NULL; + DWORD len; + HRESULT ret; + + if (!pSrcFile) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, NULL, 0 ); + pSrcFileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, pSrcFileW, len ); + ret=D3DXAssembleShaderFromFileW(pSrcFileW, Flags, ppConstants, ppCompiledShader, ppCompilationErrors); + HeapFree( GetProcessHeap(), 0, pSrcFileW ); + return ret; } -HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors) { diff --git a/include/d3dx8core.h b/include/d3dx8core.h index 1398067..051deb7 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -120,7 +120,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors); -HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors);

1 0

Paul Vriens : kernel32: Make tests run on Win98 again.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 0ada917873a69f96aaa0e07817194b63e5d2896e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ada917873a69f96aaa0e0781… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Dec 5 11:40:05 2007 +0100 kernel32: Make tests run on Win98 again. --- dlls/kernel32/tests/console.c | 45 ++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 109b6bb..d3605aa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -23,10 +23,8 @@ #include <windows.h> #include <stdio.h> -BOOL WINAPI GetConsoleInputExeNameA(DWORD, LPSTR); -BOOL WINAPI GetConsoleInputExeNameW(DWORD, LPWSTR); -BOOL WINAPI SetConsoleInputExeNameA(LPCSTR); -BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR); +static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); +static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR); /* DEFAULT_ATTRIB is used for all initial filling of the console. * all modifications are made with TEST_ATTRIB so that we could check @@ -55,6 +53,21 @@ BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR); ok(expect, "At (%d,%d): expecting attr %04x got %04x\n", (c).X, (c).Y, (attr), __attr); \ } while (0) +static void init_function_pointers(void) +{ + HMODULE hKernel32; + +#define KERNEL32_GET_PROC(func) \ + p##func = (void *)GetProcAddress(hKernel32, #func); \ + if(!p##func) trace("GetProcAddress(hKernel32, '%s') failed\n", #func); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + KERNEL32_GET_PROC(GetConsoleInputExeNameA); + KERNEL32_GET_PROC(SetConsoleInputExeNameA); + +#undef KERNEL32_GET_PROC +} + /* FIXME: this could be optimized on a speed point of view */ static void resetContent(HANDLE hCon, COORD sbSize, BOOL content) { @@ -759,13 +772,13 @@ static void test_GetSetConsoleInputExeName(void) static char input_exe[MAX_PATH] = "winetest.exe"; SetLastError(0xdeadbeef); - ret = GetConsoleInputExeNameA(0, NULL); + ret = pGetConsoleInputExeNameA(0, NULL); error = GetLastError(); ok(ret, "GetConsoleInputExeNameA failed\n"); ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); SetLastError(0xdeadbeef); - ret = GetConsoleInputExeNameA(0, buffer); + ret = pGetConsoleInputExeNameA(0, buffer); error = GetLastError(); ok(ret, "GetConsoleInputExeNameA failed\n"); ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); @@ -773,26 +786,26 @@ static void test_GetSetConsoleInputExeName(void) GetModuleFileNameA(GetModuleHandle(NULL), module, sizeof(module)); p = strrchr(module, '\\') + 1; - ret = GetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); + ret = pGetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); ok(ret, "GetConsoleInputExeNameA failed\n"); todo_wine ok(!lstrcmpA(buffer, p), "got %s expected %s\n", buffer, p); SetLastError(0xdeadbeef); - ret = SetConsoleInputExeNameA(NULL); + ret = pSetConsoleInputExeNameA(NULL); error = GetLastError(); ok(!ret, "SetConsoleInputExeNameA failed\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); - ret = SetConsoleInputExeNameA(""); + ret = pSetConsoleInputExeNameA(""); error = GetLastError(); ok(!ret, "SetConsoleInputExeNameA failed\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); - ret = SetConsoleInputExeNameA(input_exe); + ret = pSetConsoleInputExeNameA(input_exe); ok(ret, "SetConsoleInputExeNameA failed\n"); - ret = GetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); + ret = pGetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); ok(ret, "GetConsoleInputExeNameA failed\n"); ok(!lstrcmpA(buffer, input_exe), "got %s expected %s\n", buffer, input_exe); } @@ -803,6 +816,8 @@ START_TEST(console) BOOL ret; CONSOLE_SCREEN_BUFFER_INFO sbi; + init_function_pointers(); + /* be sure we have a clean console (and that's our own) * FIXME: this will make the test fail (currently) if we don't run * under X11 @@ -836,5 +851,11 @@ START_TEST(console) testCtrlHandler(); /* still to be done: access rights & access on objects */ - test_GetSetConsoleInputExeName(); + if (!pGetConsoleInputExeNameA && !pSetConsoleInputExeNameA) + { + skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n"); + return; + } + else + test_GetSetConsoleInputExeName(); }

1 0

Roy Shea : svchost: Implementation of svchost.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 4714c4fa806280dc8a4f06e5e4bf5cda73ca6db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4714c4fa806280dc8a4f06e5e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Dec 4 15:00:34 2007 -0800 svchost: Implementation of svchost. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + programs/Makefile.in | 2 + programs/svchost/Makefile.in | 14 ++ programs/svchost/svchost.c | 368 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 391 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4714c4fa806280dc8a4f0…

1 0

Alexandre Julliard : winmm/tests: Don' t mess with the mixer controls in non-interactive mode.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: dfc05649931383927c57e13a30c506385df9ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc05649931383927c57e13a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 13:47:30 2007 +0100 winmm/tests: Don't mess with the mixer controls in non-interactive mode. --- dlls/winmm/tests/mixer.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 2352be3..6cd1c7a 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -195,12 +195,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_UNSIGNED new_value; - if (winetest_interactive) - trace(" Value=%d\n",value.dwValue); + trace(" Value=%d\n",value.dwValue); if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; @@ -275,12 +274,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_BOOLEAN new_value; - if (winetest_interactive) - trace(" Value=%d\n",value.fValue); + trace(" Value=%d\n",value.fValue); if (value.fValue == FALSE) new_value.fValue = TRUE; @@ -584,12 +582,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_UNSIGNED new_value; - if (winetest_interactive) - trace(" Value=%d\n",value.dwValue); + trace(" Value=%d\n",value.dwValue); if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; @@ -664,12 +661,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_BOOLEAN new_value; - if (winetest_interactive) - trace(" Value=%d\n",value.fValue); + trace(" Value=%d\n",value.fValue); if (value.fValue == FALSE) new_value.fValue = TRUE;

1 0