June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 1/4 v4] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Huw Davies

On Tue, May 29, 2018 at 12:12:06PM +0800, Jactry Zeng wrote: > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/riched20/tests/Makefile.in | 2 +- > dlls/riched20/tests/txtsrv.c | 189 ++++++++++++++++++++++++++-------------- > 2 files changed, 126 insertions(+), 65 deletions(-) > > diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in > index 34c00afa7c..ca381d9dc2 100644 > --- a/dlls/riched20/tests/Makefile.in > +++ b/dlls/riched20/tests/Makefile.in > @@ -1,5 +1,5 @@ > TESTDLL = riched20.dll > -IMPORTS = ole32 oleaut32 user32 gdi32 > +IMPORTS = ole32 oleaut32 user32 gdi32 usp10 > > C_SRCS = \ > editor.c \ > diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c > index 88b5adf13c..76b4eb34f6 100644 > --- a/dlls/riched20/tests/txtsrv.c > +++ b/dlls/riched20/tests/txtsrv.c > @@ -37,6 +37,7 @@ > #include <wine/test.h> > #include <oleauto.h> > #include <limits.h> > +#include <usp10.h> > > static HMODULE hmoduleRichEdit; > static IID *pIID_ITextServices; > @@ -697,81 +698,141 @@ static void test_TxSetText(void) > ITextHost_Release(host); > } > > +static void hf_from_cf(HFONT *hf, CHARFORMAT2W cf) > +{ > + LOGFONTW lf; > + > + memset(&lf, 0, sizeof(lf)); > + lstrcpyW(lf.lfFaceName, cf.szFaceName); > + lf.lfHeight = MulDiv(-cf.yHeight, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 1440); > + lf.lfWeight = FW_NORMAL; > + if (cf.dwEffects & cf.dwMask & CFM_BOLD) > + lf.lfWeight = FW_BOLD; > + if (cf.dwMask & CFM_WEIGHT) > + lf.lfWeight = cf.wWeight; > + if (cf.dwEffects & cf.dwMask & CFM_ITALIC) > + lf.lfItalic = TRUE; > + if ((cf.dwEffects & cf.dwMask & CFM_UNDERLINE) && > + !(cf.dwEffects & CFE_LINK) && > + cf.bUnderlineType == CFU_CF1UNDERLINE) > + lf.lfUnderline = TRUE; > + if (cf.dwEffects & cf.dwMask & CFM_STRIKEOUT) > + lf.lfStrikeOut = TRUE; > + if (cf.dwEffects & cf.dwMask & (CFM_SUBSCRIPT | CFM_SUPERSCRIPT)) > + lf.lfHeight = (lf.lfHeight * 2) / 3; > + if (cf.dwMask & CFM_FACE) > + lf.lfPitchAndFamily = cf.bPitchAndFamily; > + if (cf.dwMask & CFM_CHARSET) > + lf.lfCharSet = cf.bCharSet; > + *hf = CreateFontIndirectW(&lf); > +} > + > +static LONG get_max_width(HDC hdc, LPCWSTR string, LONG avail_width, LONG *lines) > +{ > + SCRIPT_ITEM buf[16], *items = buf; > + LONG items_passed = sizeof(buf) / sizeof(buf[0]), num_items; > + SCRIPT_CONTROL control = {LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, > + FALSE, FALSE, 0}; > + SCRIPT_STATE state = {0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0}; > + SCRIPT_CACHE script_cache = NULL; > + LONG max_glyphs = 1.5 * lstrlenW(string) + 16; > + LONG max_clusters = lstrlenW(string) * 2; > + WORD *clusters = HeapAlloc(GetProcessHeap(), 0, max_clusters * sizeof(WORD)); > + WORD *glyphs = HeapAlloc(GetProcessHeap(), 0, max_glyphs * > + (sizeof(WORD) + sizeof(SCRIPT_VISATTR) + sizeof(LONG) + sizeof(GOFFSET))); > + SCRIPT_VISATTR *vis_attrs = (SCRIPT_VISATTR *)((char *)glyphs + max_glyphs * sizeof(WORD)); > + GOFFSET *offsets = (GOFFSET *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR) > + + sizeof(LONG))); > + LONG num_glyphs = 0; > + LONG *advances = (LONG *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR))); > + LONG i, width = 0, max_width = 0; > + > + ScriptItemize(string, lstrlenW(string), items_passed, &control, &state, items, &num_items); > + ScriptShape(hdc, &script_cache, string, lstrlenW(string), max_glyphs, &items[0].a, glyphs, > + clusters, vis_attrs, &num_glyphs); > + ScriptPlace(hdc, &script_cache, glyphs, num_glyphs, vis_attrs, &items[0].a, advances, offsets, > + NULL); > + > + *lines = 1; > + for (i = 0; i < num_glyphs; i++) > + { > + width += advances[i]; > + if (width >= avail_width) > + { > + (*lines)++; > + width -= advances[i]; > + if (width > max_width) > + max_width = width; > + width = advances[i]; > + } > + if (width > max_width) > + max_width = width; > + } Since we'll probably just use ascii characters for this test, you could avoid using uniscribe here and just use gdi32 directly. > + HeapFree(GetProcessHeap(), 0, clusters); > + HeapFree(GetProcessHeap(), 0, glyphs); > + return max_width; > +} > + > +#define CHECK_TXGETNATURALSIZE(res,width,height,expected_width,expected_height) \ > + _check_txgetnaturalsize(res, width, height, expected_width, expected_height, __LINE__) > +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, LONG expected_width, > + LONG expected_height, int line) > +{ > + ok_(__FILE__,line)(res == S_OK, "TxGetNaturalSize failed: 0x%08x.\n", res); > + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, > + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); > + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", > + height, expected_height); > +} > + > static void test_TxGetNaturalSize(void) > { > ITextServices *txtserv; > ITextHost *host; > HRESULT result; > - BOOL ret; > - > - /* This value is used when calling TxGetNaturalSize. MSDN says > - that this is not supported however a null pointer cannot be > - used as it will cause a segmentation violation. The values in > - the structure being pointed to are required to be INT_MAX > - otherwise calculations can give wrong values. */ > - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; > - > - static const WCHAR oneA[] = {'A',0}; > - > - /* Results of measurements */ > - LONG xdim, ydim; > - > - /* The device context to do the tests in */ > + SIZEL psizelExtent = {-1,-1}; > + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; > + LONG width, height, expected_width, expected_height, lines; > HDC hdcDraw; > - > - /* Variables with the text metric information */ > - INT charwidth_caps_text[26]; > - TEXTMETRICA tmInfo_text; > + HWND hwnd; > + RECT rect; > + CHARFORMAT2W cf; > + LRESULT lresult; > + HFONT hf, old_hf; > + TEXTMETRICA tm; > > if (!init_texthost(&txtserv, &host)) > return; > > - hdcDraw = GetDC(NULL); > - SaveDC(hdcDraw); > - > - /* Populate the metric strucs */ > - SetMapMode(hdcDraw,MM_TEXT); > - GetTextMetricsA(hdcDraw, &tmInfo_text); > - SetLastError(0xdeadbeef); > - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); > - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { > - win_skip("GetCharWidth32 is not available\n"); > - goto cleanup; > - } > - > - /* Make measurements in MM_TEXT */ > + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, > + 0, 0, 100, 100, 0, 0, 0, NULL); > + hdcDraw = GetDC(hwnd); > SetMapMode(hdcDraw,MM_TEXT); > - xdim = 0; ydim = 0; > - > - result = ITextServices_TxSetText(txtserv, oneA); > - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); > - if (result != S_OK) { > - skip("Could not set text\n"); > - goto cleanup; > - } > - > - SetLastError(0xdeadbeef); > - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, > - hdcDraw, NULL, NULL, > - TXTNS_FITTOCONTENT, &psizelExtent, > - &xdim, &ydim); > - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ > - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); > - if (result == S_OK) { > - todo_wine ok(ydim == tmInfo_text.tmHeight, > - "Height calculated incorrectly (expected %d, got %d)\n", > - tmInfo_text.tmHeight, ydim); > - /* The native DLL adds one pixel extra when calculating widths. */ > - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, > - "Width calculated incorrectly (expected %d {+1}, got %d)\n", > - charwidth_caps_text[0], xdim); > - } else > - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", > - xdim, ydim, result, GetLastError()); > - > -cleanup: > - RestoreDC(hdcDraw,1); > - ReleaseDC(NULL,hdcDraw); > + GetClientRect(hwnd, &rect); > + > + result = ITextServices_TxSetText(txtserv, test_text); > + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); > + > + cf.cbSize = sizeof(cf); > + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); > + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); > + hf_from_cf(&hf, cf); > + > + old_hf = SelectObject(hdcDraw, hf); How about doing this the other way around - create an hfont, fill out an appropriate cf and use that to set the character format of the text? I think that would end up being simpler. > + expected_width = get_max_width(hdcDraw, test_text, rect.right - rect.left, &lines); > + GetTextMetricsA(hdcDraw, &tm); > + expected_height = (tm.tmAscent + tm.tmDescent) * lines; > + SelectObject(hdcDraw, old_hf); > + > + psizelExtent.cx = -1; psizelExtent.cy = -1; > + width = rect.right - rect.left; > + height = 0; > + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, > + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); > + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); > + > + ReleaseDC(hwnd, hdcDraw); > + DestroyWindow(hwnd); > ITextServices_Release(txtserv); > ITextHost_Release(host); > } > -- > 2.15.1 (Apple Git-101) > > > >

June 4, 2018

Re: [PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Huw Davies

On Sun, Jun 03, 2018 at 02:51:11PM -0500, Zebediah Figura wrote: > On 03/06/18 13:58, Marvin wrote: > > Hi, > > > > While running your changed tests on Windows, I think I found new failures. > > Being a bot and all I'm not very good at pattern recognition, so I might be > > wrong, but could you please double-check? > > Full results can be found at > > https://testbot.winehq.org/JobDetails.pl?Key=38913 > > > > Your paranoid android. > > > > > > === wvistau64 (64 bit typelib) === > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > > These failures are shortcomings in widl exposed by these patches; they > are fixed in patch 4/4. You'll probably have to merge some of the patches in this series to avoid test failures at intermediate stages. Huw.

June 4, 2018

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

June 4, 2018

Re: [PATCH] ole32: Don't try to unregister window class if it was never registered.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

Re: [PATCH v2] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

[PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators

by Jeff Latimer

Resend to wine-devel. --- dlls/netapi32/netapi32.c | 11 +++++++---- dlls/netapi32/tests/access.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

June 4, 2018

[PATCH] msctf/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a02f95117..4a52432aa5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -981,7 +981,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2089,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) -- 2.14.4

June 3, 2018

[PATCH] mpr/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 041afbf130..fc067d98c4 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -60,7 +60,7 @@ static void test_WNetGetUniversalName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +132,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) -- 2.14.4

June 3, 2018

[PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d3e8617b9..a4e94b15e0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); -- 2.14.4

June 3, 2018

[PATCH] mapi32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/tests/prop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4e099318f5..4d7fd7be43 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -135,7 +135,7 @@ static void test_PropCopyMore(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { lpSrc->ulPropTag = ptTypes[i]; @@ -453,11 +453,11 @@ static void test_FPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(FPCProp_Results)/sizeof(FPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(FPCProp_Results); j++) { SHORT lVal = FPCProp_Results[j].lVal; SHORT rVal = FPCProp_Results[j].rVal; @@ -583,11 +583,11 @@ static void test_LPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(LPCProp_Results)/sizeof(LPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(LPCProp_Results); j++) { SHORT lVal = LPCProp_Results[j].lVal; SHORT rVal = LPCProp_Results[j].rVal; @@ -684,7 +684,7 @@ static void test_PpropFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = ptTypes[i]; @@ -923,7 +923,7 @@ static void test_LpValFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); -- 2.14.4

June 3, 2018