February 2011 - Wine-Commits

Austin English : ntdll/tests: Make sure return values are used (LLVM/Clang) .
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 3dd514cee7df992bceeba2d39171a6b7379bc21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd514cee7df992bceeba2d39… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:39 2011 -0800 ntdll/tests: Make sure return values are used (LLVM/Clang). --- dlls/ntdll/tests/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index beffca8..774e8a1 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -208,6 +208,7 @@ static void test_query_timeofday(void) sti.uCurrentTimeZoneId = 0xdeadbeef; status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 28, &ReturnLength); + ok(status == STATUS_SUCCESS || broken(status == STATUS_INFO_LENGTH_MISMATCH /* NT4 */), "Expected STATUS_SUCCESS, got %08x\n", status); ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n"); status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 32, &ReturnLength); @@ -366,6 +367,7 @@ static void test_query_procperf(void) /* Find out the number of processors */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); sppi = HeapAlloc(GetProcessHeap(), 0, NeededLength); @@ -515,6 +517,7 @@ static void test_query_interrupt(void) /* Find out the number of processors */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION); sii = HeapAlloc(GetProcessHeap(), 0, NeededLength); @@ -1260,6 +1263,7 @@ static void test_affinity(void) status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ @@ -1278,6 +1282,7 @@ static void test_affinity(void) if (status == STATUS_SUCCESS) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( broken(tbi.AffinityMask == 1) || tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); }

1 0

Austin English : msvcrt/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 2164bb7a7fd5ffb007cc4e1b58f77a296c04c8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164bb7a7fd5ffb007cc4e1b5… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:09 2011 -0800 msvcrt/tests: Make sure return values are used (LLVM/Clang). --- dlls/msvcrt/tests/scanf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e9cb987..cbfb184 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -93,11 +93,14 @@ static void test_sscanf( void ) /* Check float */ ret = sprintf(buffer,"%f %f",res1, res2); + ok( ret == 20, "expected 20, got %u\n", ret); ret = sscanf(buffer,"%f%f",&res11, &res12); + ok( ret == 2, "expected 2, got %u\n", ret); ok( (res11 == res1) && (res12 == res2), "Error reading floats\n"); /* check strings */ ret = sprintf(buffer," %s", pname); + ok( ret == 26, "expected 26, got %u\n", ret); ret = sscanf(buffer,"%*c%[^\n]",buffer1); ok( ret == 1, "Error with format \"%s\"\n","%*c%[^\n]"); ok( strncmp(pname,buffer1,strlen(buffer1)) == 0, "Error with \"%s\" \"%s\"\n",pname, buffer1); @@ -112,6 +115,7 @@ static void test_sscanf( void ) /* check digits */ ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); + ok( ret == 8, "expected 8, got %u\n", ret); ret = sscanf(buffer,"%d%n",&number,&number_so_far); ok(ret == 1 , "problem with format arg \"%%d%%n\"\n"); ok(number == hour,"Read wrong arg %d instead of %d\n",number, hour);

1 0

Matteo Bruni : d3dcompiler: Include the string terminator in the output blob.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: dbc8c9c299ebc0cd8a93c7e0fb2d5dd2922d6eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc8c9c299ebc0cd8a93c7e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 4 16:41:42 2011 +0100 d3dcompiler: Include the string terminator in the output blob. --- dlls/d3dcompiler_43/compiler.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ca48611..42ad09b 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -306,6 +306,7 @@ static int wpp_close_output(void) if(!new_wpp_output) return 0; wpp_output = new_wpp_output; wpp_output[wpp_output_size]='\0'; + wpp_output_size++; return 1; }

1 0

André Hentschel : netapi32: Add stub implementation for NetUseDel.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 01ae887ebe1294f8e937f0fc2618ed661c1cee84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ae887ebe1294f8e937f0fc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 6 19:39:33 2011 +0100 netapi32: Add stub implementation for NetUseDel. --- dlls/netapi32/access.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 7170259..91f98b1 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -908,3 +908,9 @@ NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LP FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); return NERR_Success; } + +NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond) +{ + FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); + return NERR_Success; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 6470280..78bf22d 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -198,7 +198,7 @@ @ stub NetShareSetInfo @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) -@ stub NetUseDel +@ stdcall NetUseDel(wstr wstr long) @ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr)

1 0

André Hentschel : netapi32: Add stub implementation for NetServerDiskEnum.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: ae3e768a2e1f9c21b355798c8fbf473db3d83434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3e768a2e1f9c21b355798c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 6 19:42:36 2011 +0100 netapi32: Add stub implementation for NetServerDiskEnum. --- dlls/netapi32/netapi32.c | 18 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index fb4468f..fafce6b 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -95,6 +95,24 @@ NET_API_STATUS WINAPI NetServerEnumEx( } /************************************************************ + * NetServerDiskEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetServerDiskEnum( + LMCSTR ServerName, + DWORD Level, + LPBYTE *Bufptr, + DWORD PrefMaxlen, + LPDWORD EntriesRead, + LPDWORD totalentries, + LPDWORD Resume_Handle) +{ + FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(ServerName), + Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, Resume_Handle); + + return ERROR_NO_BROWSER_SERVERS_FOUND; +} + +/************************************************************ * NetServerGetInfo (NETAPI32.@) */ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 78bf22d..7905504 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -172,7 +172,7 @@ @ stub NetScheduleJobGetInfo @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel -@ stub NetServerDiskEnum +@ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetServerEnum(wstr long ptr long ptr ptr long wstr ptr) @ stdcall NetServerEnumEx(wstr long ptr long ptr ptr long wstr wstr) @ stdcall NetServerGetInfo(wstr long ptr)

1 0

Joris Huizer : shdocvw: Initialise ie pointer as it's tested (Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: e88caf015ee3a1d669f63e5f5337be5f7f2a09d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88caf015ee3a1d669f63e5f5… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Feb 5 14:37:40 2011 +0100 shdocvw: Initialise ie pointer as it's tested (Clang). --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index f8d74ac..9d8668e 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -868,7 +868,7 @@ static BOOL create_ie_window(LPCSTR cmdline) static ULONG open_dde_url(WCHAR *dde_url) { - InternetExplorer *ie, *iter; + InternetExplorer *ie = NULL, *iter; WCHAR *url, *url_end; VARIANT urlv; HRESULT hres;

1 0

Francois Gouget : comctl32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: fc55c4a2d5d5a2ed9bc557c48e5913d73ffd7810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc55c4a2d5d5a2ed9bc557c48… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 7 12:30:37 2011 +0100 comctl32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5ef277c..653807f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1425,14 +1425,14 @@ static void test_htreeitem_layout(void) ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; - ins.item.mask = 0; + U(ins).item.mask = 0; item1 = TreeView_InsertItem(hTree, &ins); check_item(item1, hChild, 0, 0); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; - ins.item.mask = 0; + U(ins).item.mask = 0; item2 = TreeView_InsertItem(hTree, &ins); check_item(item2, hRoot, hChild, 0);

1 0

Alexander Kochetkov : comctl32: Fixed height of comboboxex32.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: d668e76461dabd4504fade2efa28874724801b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d668e76461dabd4504fade2ef… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Sun Feb 6 19:41:30 2011 +0300 comctl32: Fixed height of comboboxex32. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/tests/comboex.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e516ea8..10d8b87 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1693,7 +1693,7 @@ static LRESULT COMBOEX_WindowPosChanging (const COMBOEX_INFO *infoPtr, WINDOWPOS height = (cb_wrect.bottom-cb_wrect.top) + (cbx_wrect.bottom-cbx_wrect.top) - (cbx_crect.bottom-cbx_crect.top); - if (wp->cy < height) wp->cy = height; + wp->cy = height; if (infoPtr->hwndEdit) { COMBOEX_AdjustEditPos (infoPtr); InvalidateRect (infoPtr->hwndCombo, 0, TRUE); diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index a747500..ca30482 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -380,6 +380,53 @@ static void test_CB_GETLBTEXT(void) DestroyWindow(hCombo); } +static void test_WM_WINDOWPOSCHANGING(void) +{ + HWND hCombo; + WINDOWPOS wp; + RECT rect; + int combo_height; + int ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + ok(hCombo != NULL, "createComboEx failed\n"); + ret = GetWindowRect(hCombo, &rect); + ok(ret, "GetWindowRect failed\n"); + combo_height = rect.bottom - rect.top; + ok(combo_height > 0, "wrong combo height\n"); + + /* Test height > combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height * 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + /* Test height < combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height / 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + ret = DestroyWindow(hCombo); + ok(ret, "DestroyWindow failed\n"); +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -528,6 +575,7 @@ START_TEST(comboex) test_comboboxex(); test_WM_LBUTTONDOWN(); test_CB_GETLBTEXT(); + test_WM_WINDOWPOSCHANGING(); test_comboboxex_subclass(); test_get_set_item();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put_borderRightColor.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 26380e1720db6c759fe1e236d77295e88ad5d0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26380e1720db6c759fe1e236d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 7 13:38:19 2011 +1100 mshtml: Implement IHTMLStyle put_borderRightColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3a976cd..45efd95 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1559,8 +1559,10 @@ static HRESULT WINAPI HTMLStyle_get_borderTopColor(IHTMLStyle *iface, VARIANT *p static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9cc25a3..b5babed 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5461,6 +5461,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderTopColor(style, vDefault); ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + /* borderRightColor */ + hres = IHTMLStyle_get_borderRightColor(style, &vDefault); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("blue"); + hres = IHTMLStyle_put_borderRightColor(style, v); + ok(hres == S_OK, "put_borderRightColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderRightColor(style, &v); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "blue"), "expected blue = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderRightColor(style, vDefault); + ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Use case insensitive comparison in parse_classid.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: eb799366f5b3be1b300c26edd6c821bbeffb7661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb799366f5b3be1b300c26edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 6 22:30:27 2011 +0100 mshtml: Use case insensitive comparison in parse_classid. --- dlls/mshtml/npplugin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 01111a2..042478b 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -154,7 +154,7 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) static const PRUnichar clsidW[] = {'c','l','s','i','d',':'}; - if(strncmpW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) + if(strncmpiW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) return FALSE; ptr = classid + sizeof(clsidW)/sizeof(WCHAR);

1 0