June 2008 - Wine-Commits - list.winehq.org

Dan Kegel : msxml3/tests: VT_EMPTY is not a string.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 578870bc4dced9fda006dd55192a826b099a3a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=578870bc4dced9fda006dd551… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jun 22 23:00:45 2008 -0700 msxml3/tests: VT_EMPTY is not a string. --- dlls/msxml3/tests/xmlelem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 71d9027..ab83329 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -80,7 +80,7 @@ static void test_xmlelem(void) hr = IXMLElement_getAttribute(element, str, &vValue); ok(hr == S_FALSE, "Expected S_FALSE, got %d\n", hr); ok(V_VT(&vValue) == VT_EMPTY, "Expected VT_EMPTY, got %d\n", V_VT(&vValue)); - ok(lstrlenW(V_BSTR(&vValue)) == 0, "Expected empty value\n"); + ok(V_BSTR(&vValue) == NULL, "Expected null value\n"); VariantClear(&vValue); SysFreeString(str); @@ -125,7 +125,7 @@ static void test_xmlelem(void) hr = IXMLElement_getAttribute(element, str, &vValue); ok(hr == 1, "Expected 1, got %d\n", hr); ok(V_VT(&vValue) == VT_EMPTY, "Expected VT_EMPTY, got %d\n", V_VT(&vValue)); - ok(!lstrlenW(V_BSTR(&vValue)), "Expected empty value\n"); + ok(V_BSTR(&vValue) == NULL, "Expected null value\n"); SysFreeString(str); VariantClear(&vValue);

1 0

Dan Kegel : kernel32/tests: Initialize a few variables.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 98fba5e56a8ad997f1363b792173a74278f25c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fba5e56a8ad997f1363b792… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jun 22 14:25:21 2008 -0700 kernel32/tests: Initialize a few variables. --- dlls/kernel32/tests/debugger.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 3d8d7f5..003403f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -137,6 +137,7 @@ static void doDebugger(int argc, char** argv) logfile=(argc >= 4 ? argv[3] : NULL); blackbox.pid=(argc >= 5 ? atol(argv[4]) : 0); + blackbox.attach_err=0; if (strstr(myARGV[2], "attach")) { blackbox.attach_rc=DebugActiveProcess(blackbox.pid); @@ -147,6 +148,7 @@ static void doDebugger(int argc, char** argv) blackbox.attach_rc=TRUE; debug_event=(argc >= 6 ? (HANDLE)atol(argv[5]) : NULL); + blackbox.debug_err=0; if (debug_event && strstr(myARGV[2], "event")) { blackbox.debug_rc=SetEvent(debug_event); @@ -163,6 +165,7 @@ static void doDebugger(int argc, char** argv) WaitForSingleObject(start_event, INFINITE); } + blackbox.nokill_err=0; if (strstr(myARGV[2], "nokill")) { blackbox.nokill_rc=pDebugSetProcessKillOnExit(FALSE); @@ -172,6 +175,7 @@ static void doDebugger(int argc, char** argv) else blackbox.nokill_rc=TRUE; + blackbox.detach_err=0; if (strstr(myARGV[2], "detach")) { blackbox.detach_rc=pDebugActiveProcessStop(blackbox.pid);

1 0

Dan Kegel : gdi32: GdiConvertToDevmodeW should not refer to unintialized name bytes.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 32393796bb534e9cf11dd988dce88722c67f7906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32393796bb534e9cf11dd988d… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jun 22 14:22:06 2008 -0700 gdi32: GdiConvertToDevmodeW should not refer to unintialized name bytes. --- dlls/gdi32/driver.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3a2776c..21342bb 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -431,15 +431,19 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); if (!dmW) return NULL; - MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, CCHDEVICENAME, + MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, -1, dmW->dmDeviceName, CCHDEVICENAME); /* copy slightly more, to avoid long computations */ memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME); if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) { - MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME, + if (dmA->dmFields & DM_FORMNAME) + MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, -1, dmW->dmFormName, CCHFORMNAME); + else + dmW->dmFormName[0] = 0; + if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels)); }

1 0

Dan Kegel : winmm/tests: Initialize MIXERLINECONTROLSA before calling mixerGetLineControlsA.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 97f4fbca7e6c363e39819c33afc613eec4c65ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4fbca7e6c363e39819c33a… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jun 20 20:20:42 2008 -0700 winmm/tests: Initialize MIXERLINECONTROLSA before calling mixerGetLineControlsA. --- dlls/winmm/tests/mixer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index ed68f89..4961547 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -491,6 +491,8 @@ static void mixer_test_deviceA(int device) array=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, mixerlineA.cControls*sizeof(MIXERCONTROLA)); if (array) { + memset(&controls, 0, sizeof(controls)); + rc=mixerGetLineControlsA((HMIXEROBJ)mix,0, MIXER_GETLINECONTROLSF_ALL); ok(rc==MMSYSERR_INVALPARAM,

1 0

Vladimir Pankratov : taskmgr: Add Russian translation.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 87b5e9448034e580f45541f4bf649604b89fc72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b5e9448034e580f45541f4b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jun 20 17:19:44 2008 +0500 taskmgr: Add Russian translation. --- programs/taskmgr/Ru.rc | 500 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 501 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87b5e9448034e580f4554…

1 0

Anatoly Lyutin : user32/tests: Add two tests for ShowWindow(SW_RESTORE).
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: f567cb5878daff27a6ef6903b65e745251d8e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f567cb5878daff27a6ef6903b… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Fri Jun 20 10:33:19 2008 +0400 user32/tests: Add two tests for ShowWindow(SW_RESTORE). --- dlls/user32/tests/msg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a45ff8d..13f43f2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -460,6 +460,48 @@ static const struct message WmShowMaxOverlappedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(SW_RESTORE) for a not visible maximized overlapped window */ +static const struct message WmShowRestoreMaxOverlappedSeq[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; +/* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ +static const struct message WmShowRestoreMinOverlappedSeq[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, + { WM_QUERYOPEN, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED|SWP_NOCOPYBITS }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_STATECHANGED|SWP_FRAMECHANGED|SWP_NOCOPYBITS }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_ACTIVATE, sent|wparam, 1 }, + { 0 } +}; /* ShowWindow(SW_SHOWMINIMIZED) for a not visible overlapped window */ static const struct message WmShowMinOverlappedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, @@ -4124,7 +4166,7 @@ static void test_messages(void) ok_sequence(WmShowMaxOverlappedSeq, "ShowWindow(SW_SHOWMAXIMIZED):overlapped", TRUE); ShowWindow(hwnd, SW_RESTORE); - /* FIXME: add ok_sequence() here */ + ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); flush_sequence(); ShowWindow(hwnd, SW_MINIMIZE); @@ -4132,7 +4174,7 @@ static void test_messages(void) flush_sequence(); ShowWindow(hwnd, SW_RESTORE); - /* FIXME: add ok_sequence() here */ + ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); flush_sequence(); ShowWindow(hwnd, SW_SHOW);

1 0

Joris Huizer : user32/tests: Copy/paste fix.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 85ac6a388b8c500008c3d46cbe236b5b0159cfb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ac6a388b8c500008c3d46cb… Author: Joris Huizer <jorishuizer(a)debian> Date: Thu Jun 19 17:11:19 2008 +0200 user32/tests: Copy/paste fix. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 13f43f2..f2f335f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10726,7 +10726,7 @@ static void test_menu_messages(void) set_menu_style(hmenu, 0); style = get_menu_style(hmenu); - ok(style == 0, "expected MNS_NOTIFYBYPOS, got %u\n", style); + ok(style == 0, "expected 0, got %u\n", style); hmenu_popup = GetSubMenu(hmenu, 0); ok(hmenu_popup != 0, "GetSubMenu returned 0 for submenu 0\n");

1 0

Dan Hipschman : riched20/tests: Add tests for OLE interface.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 76ee788afa72c481c5969577d44a60d7f5de4366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ee788afa72c481c5969577d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 19 17:10:59 2008 -0700 riched20/tests: Add tests for OLE interface. --- dlls/riched20/tests/Makefile.in | 3 +- dlls/riched20/tests/richole.c | 75 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index 74a5686..0993609 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = riched20.dll IMPORTS = ole32 user32 gdi32 kernel32 CTESTS = \ - editor.c + editor.c \ + richole.c @MAKE_TEST_RULES@ diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c new file mode 100644 index 0000000..ba9ce55 --- /dev/null +++ b/dlls/riched20/tests/richole.c @@ -0,0 +1,75 @@ +/* + * Tests for IRichEditOle and friends. + * + * Copyright 2008 Google (Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <assert.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <ole2.h> +#include <richedit.h> +#include <richole.h> +#include <wine/test.h> + +static HMODULE hmoduleRichEdit; + +static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) +{ + HWND hwnd + = CreateWindow(lpClassName, NULL, + dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); + return hwnd; +} + +static HWND new_richedit(HWND parent) +{ + return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); +} + + +START_TEST(richole) +{ + IRichEditOle *reOle = NULL; + LRESULT res; + HWND w; + + /* Must explicitly LoadLibrary(). The test has no references to functions in + * RICHED20.DLL, so the linker doesn't actually link to it. */ + hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); + ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + + w = new_richedit(NULL); + if (!w) { + skip("Couldn't create window\n"); + return; + } + + res = SendMessage(w, EM_GETOLEINTERFACE, 0, (LPARAM) &reOle); + ok(res, "SendMessage\n"); + ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + + IUnknown_Release(reOle); + DestroyWindow(w); +}

1 0

Dan Hipschman : riched20/tests: Add a test for creating ITextDocument.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 9615e2977d136d24fd8acd6dac7701d320657f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9615e2977d136d24fd8acd6da… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 19 17:11:47 2008 -0700 riched20/tests: Add a test for creating ITextDocument. --- dlls/riched20/tests/richole.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index ba9ce55..dc87676 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -29,8 +29,12 @@ #include <ole2.h> #include <richedit.h> #include <richole.h> +#include <tom.h> #include <wine/test.h> +#include <initguid.h> +DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); + static HMODULE hmoduleRichEdit; static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) @@ -52,6 +56,8 @@ static HWND new_richedit(HWND parent) START_TEST(richole) { IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + HRESULT hres; LRESULT res; HWND w; @@ -70,6 +76,12 @@ START_TEST(richole) ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + hres = IUnknown_QueryInterface(reOle, &IID_ITextDocument, + (void **) &txtDoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); + + ITextDocument_Release(txtDoc); IUnknown_Release(reOle); DestroyWindow(w); }

1 0

Marcus Meissner : ws2_32/tests: Initialize memory to send.
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: fb140649f4aa923e0aaa63107c2806dc7e78a645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb140649f4aa923e0aaa63107… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 21 10:32:12 2008 +0200 ws2_32/tests: Initialize memory to send. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2e0ee28..79d2aeb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2021,7 +2021,7 @@ static void test_send(void) goto end; } - buffer = HeapAlloc(GetProcessHeap(), 0, buflen); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buflen); if (buffer == NULL) { ok(0, "HeapAlloc failed, error %d\n", GetLastError());

1 0