December 2008 - Wine-commits

Francois Gouget : advapi32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 352a1bdb0b17d5dba8f1d69c1814804ec6a313da URL: http://source.winehq.org/git/wine.git/?a=commit;h=352a1bdb0b17d5dba8f1d69c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:37:09 2008 +0100 advapi32/tests: Add a trailing '\n' to ok() calls. --- dlls/advapi32/tests/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 30f505a..e23f872 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -156,9 +156,9 @@ static void test_CredReadDomainCredentialsA(void) * does not check for NULL output pointers and try to zero them out early */ #if 0 ok(!pCredReadDomainCredentialsA(&info, 0, NULL, &creds) && - GetLastError() == ERROR_INVALID_PARAMETER, "!"); + GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); ok(!pCredReadDomainCredentialsA(&info, 0, &count, NULL) && - GetLastError() == ERROR_INVALID_PARAMETER, "!"); + GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); #endif SetLastError(0xdeadbeef);

1 0

Francois Gouget : winecoreaudio.drv: Remove an unused debug channel (midi).
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 0216e3e6c64ae5f2bfe9fdbb237b9b8a618b5d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0216e3e6c64ae5f2bfe9fdbb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:37:20 2008 +0100 winecoreaudio.drv: Remove an unused debug channel (midi). --- dlls/winecoreaudio.drv/coremidi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index c52093e..ea7d2fd 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -28,9 +28,6 @@ #include "coremidi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(midi); MIDIClientRef CoreMIDI_CreateClient(CFStringRef name) {

1 0

Francois Gouget : winedbg: Remove an unused debug channel (winedbg).
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: a9d3d0e9423091b55c19f18e1cbbb7cab06309d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d3d0e9423091b55c19f18e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:37:28 2008 +0100 winedbg: Remove an unused debug channel (winedbg). --- programs/winedbg/tgt_module.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 5341726..71a2449 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -29,9 +29,7 @@ #include <stdarg.h> #include "debugger.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static struct be_process_io be_process_module_io;

1 0

Francois Gouget : browseui/tests: Make some functions static.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: cbf19c30e045d56297b46c45dbac1e0dda465687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf19c30e045d56297b46c45d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:37:40 2008 +0100 browseui/tests: Make some functions static. --- dlls/browseui/tests/autocomplete.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 966721c..9442e6d 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -45,7 +45,7 @@ ok(FALSE, #exp " failed: %x\n", res); \ } -LPWSTR strdup_AtoW(LPCSTR str) +static LPWSTR strdup_AtoW(LPCSTR str) { int size = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); LPWSTR wstr = (LPWSTR)CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); @@ -86,14 +86,14 @@ static TestACL *TestACL_Constructor(int limit, const char **strings) return This; } -ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) +static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { TestACL *This = (TestACL *)iface; trace("ACL(%p): addref (%d)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } -ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) +static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) { TestACL *This = (TestACL *)iface; ULONG res; @@ -103,7 +103,7 @@ ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) return res; } -HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) +static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { TestACL *This = (TestACL *)iface; *ppvOut = NULL; @@ -129,7 +129,7 @@ HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, return E_NOINTERFACE; } -HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) +static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { TestACL *This = (TestACL *)iface; ULONG i; @@ -150,19 +150,19 @@ HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR return S_FALSE; } -HRESULT STDMETHODCALLTYPE TestACL_Skip(IEnumString *iface, ULONG celt) +static HRESULT STDMETHODCALLTYPE TestACL_Skip(IEnumString *iface, ULONG celt) { ok(FALSE, "Unexpected call to TestACL_Skip\n"); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString **out) +static HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString **out) { ok(FALSE, "Unexpected call to TestACL_Clone\n"); return E_OUTOFMEMORY; } -HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) +static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) { TestACL *This = (TestACL *)iface; trace("ACL(%p): Reset\n", This); @@ -170,7 +170,7 @@ HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) return S_OK; } -HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) +static HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) { TestACL *This = impl_from_IACList(iface); trace("ACL(%p): Expand\n", impl_from_IACList(iface)); @@ -190,17 +190,17 @@ IEnumStringVtbl TestACLVtbl = TestACL_Clone }; -ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) +static ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) { return TestACL_AddRef((IEnumString *)impl_from_IACList(iface)); } -ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) +static ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) { return TestACL_Release((IEnumString *)impl_from_IACList(iface)); } -HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) +static HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) { return TestACL_QueryInterface((IEnumString *)impl_from_IACList(iface), iid, ppvout); }

1 0

Vincent Pelletier : wined3d: Detect intel 945 GM.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 143bd931b66a16b6158e9d13b10660b04efcd44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=143bd931b66a16b6158e9d13b… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Dec 27 23:51:47 2008 +0100 wined3d: Detect intel 945 GM. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7c80750..e505ec0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1303,7 +1303,8 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; case VENDOR_INTEL: - if (strstr(gl_info->gl_renderer, "GMA 950")) { + if (strstr(gl_info->gl_renderer, "GMA 950") || + strstr(gl_info->gl_renderer, "945GM")) { /* MacOS calls the card GMA 950, but everywhere else the PCI ID is named 945GM */ gl_info->gl_card = CARD_INTEL_I945GM; vidmem = 64;

1 0

Francois Gouget : kernel32: Fix a comment in LocalInit16().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 770d28d1809cae71d349cf55e4dd5521178af842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770d28d1809cae71d349cf55e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:36:37 2008 +0100 kernel32: Fix a comment in LocalInit16(). --- dlls/kernel32/local16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 48bc6c3..a5b2fc7 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -412,7 +412,7 @@ BOOL16 WINAPI LocalInit16( HANDLE16 selector, WORD start, WORD end ) if (TRACE_ON(local)) { - /* If TRACE_ON(heap) is set, the global heap blocks are */ + /* If TRACE_ON(local) is set, the global heap blocks are */ /* cleared before use, so we can test for double initialization. */ if (LOCAL_GetHeap(selector)) {

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: b7ad9c87b52cf2415cf0ad6e75f649218774f25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ad9c87b52cf2415cf0ad6e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:36:46 2008 +0100 shell32/tests: Add a trailing '\n' to ok() calls. --- dlls/shell32/tests/shlfileop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3eb45d6..37ec523 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -717,7 +717,7 @@ static void test_copy(void) { /* Vista and W2K8 (broken or new behavior ?) */ ok(file_exists("test6.txt\\test1.txt"), "The file is not copied - many files " - "are specified as a target"); + "are specified as a target\n"); DeleteFileA("test6.txt\\test1.txt"); DeleteFileA("test6.txt\\test2.txt"); RemoveDirectoryA("test6.txt\\test4.txt"); @@ -750,9 +750,9 @@ static void test_copy(void) { /* Vista and W2K8 (broken or new behavior ?) */ ok(file_exists("test6.txt\\test1.txt"), "The file is not copied - many files " - "are specified as a target"); + "are specified as a target\n"); ok(file_exists("test7.txt\\test2.txt"), "The file is not copied - many files " - "are specified as a target"); + "are specified as a target\n"); DeleteFileA("test6.txt\\test1.txt"); DeleteFileA("test7.txt\\test2.txt"); RemoveDirectoryA("test6.txt");

1 0

Francois Gouget : wnaspi32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: f2c5f6a28877b3317d7ea13fe88f6bd00bac5e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c5f6a28877b3317d7ea13fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 28 10:36:55 2008 +0100 wnaspi32: Add a trailing '\n' to a Wine trace. --- dlls/wnaspi32/aspi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 2505a25..a0658e7 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -311,7 +311,7 @@ SCSI_LinuxDeviceIo( int fd, WARN("Not enough bytes written to scsi device. bytes=%d .. %d\n", cbInBuffer, dwBytes ); /* FIXME: set_last_error() never sets error to ERROR_NOT_ENOUGH_MEMORY... */ if( save_error == ERROR_NOT_ENOUGH_MEMORY ) - MESSAGE("Your Linux kernel was not able to handle the amount of data sent to the scsi device. Try recompiling with a larger SG_BIG_BUFF value (kernel 2.0.x sg.h)"); + MESSAGE("Your Linux kernel was not able to handle the amount of data sent to the scsi device. Try recompiling with a larger SG_BIG_BUFF value (kernel 2.0.x sg.h)\n"); WARN("error= %d\n", save_error ); *lpcbBytesReturned = 0; return FALSE;

1 0

Ricardo Filipe : oleacc: Add stub for AccessibleObjectFromPoint.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: b15ba7696bcff1106c2e357a7aa49b4a151b1623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15ba7696bcff1106c2e357a7… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Dec 26 19:41:48 2008 +0000 oleacc: Add stub for AccessibleObjectFromPoint. --- dlls/oleacc/main.c | 7 +++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 5df51f1..0e7b78e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "oleacc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -45,6 +46,12 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return E_NOTIMPL; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) +{ + FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); + return E_NOTIMPL; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 2baeb2b..2736a3d 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,6 +1,6 @@ @ stub AccessibleChildren @ stub AccessibleObjectFromEvent -@ stub AccessibleObjectFromPoint +@ stdcall AccessibleObjectFromPoint(double ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA

1 0

Ricardo Filipe : oleacc: Fix LresultFromObject return type.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: bd17f0a6f3fb79daa4a0a22202371663d85ff77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd17f0a6f3fb79daa4a0a2220… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Dec 26 19:37:17 2008 +0000 oleacc: Fix LresultFromObject return type. --- dlls/oleacc/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 5076e00..5df51f1 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -39,7 +39,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, return E_NOTIMPL; } -HRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) +LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); return E_NOTIMPL;

1 0