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

[PATCH 2/9] taskschd: IRegistrationInfo::put_Author() should accept NULL input.
by Dmitry Timoshkov April 2, 2018

April 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 933d833016..7ae478f58c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -608,15 +608,14 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR author) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(author)); - if (!author) return E_INVALIDARG; - + if (author && !(str = heap_strdupW(author))) return E_OUTOFMEMORY; heap_free(reginfo->author); - reginfo->author = heap_strdupW(author); - /* FIXME: update XML on the server side */ - return reginfo->author ? S_OK : E_OUTOFMEMORY; + reginfo->author = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BSTR *version) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 82f3315099..d006dff703 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1424,6 +1424,7 @@ static void test_TaskDefinition(void) "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" + " <Author>author</Author>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1503,6 +1504,7 @@ static void test_TaskDefinition(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1609,9 +1611,17 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); + ok(hr == S_OK, "get_Author error %#x\n", hr); + ok(!lstrcmpW(bstr, authorW), "expected %s, got %s\n", wine_dbgstr_w(authorW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Author(reginfo, NULL); + ok(hr == S_OK, "put_Author error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Version(reginfo, &bstr); ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 1/9] taskschd: IRegistrationInfo::put_Description() should accept NULL input.
by Dmitry Timoshkov April 2, 2018

April 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 19546c0d71..933d833016 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -581,15 +581,14 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(description)); - if (!description) return E_INVALIDARG; - + if (description && !(str = heap_strdupW(description))) return E_OUTOFMEMORY; heap_free(reginfo->description); - reginfo->description = heap_strdupW(description); - /* FIXME: update XML on the server side */ - return reginfo->description ? S_OK : E_OUTOFMEMORY; + reginfo->description = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c0f691a53d..82f3315099 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1602,6 +1602,13 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = IRegistrationInfo_put_Description(reginfo, NULL); + ok(hr == S_OK, "put_Description error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + ok(hr == S_OK, "get_Description error %#x\n", hr); + ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

Re: [GSoC] Project proposal : Winetest Scripting Interface
by Yash Yadav April 1, 2018

April 1, 2018

Hey Stefan, A big thanks for dedicating some time of your schedule to check out a proposal which has absoluely no chance of being selected. About the idea in the suggested list, I'd agree that the discussion in the IRC gave me a different picture of the project compared to what I thought of after reading on the website. Good all the way, indeed the idea is interesting and comparatively more closer to my strengths than other projects. And yes, You're right, I had not tried out the testsuite then. I should've had. But I wonder what was I thinking when I wrote that <quoted> part of the proposal. I have compiled and installed wine from source before and am aware "make install" certainly wouldn't test it there. Ugh, mistake. As I write this I just ran "make test" from the source root. Test fails at bcrypt dll test, heap allocation errors I guess. The output pattern from this single run seems catchable though. I thought tests would return huge paragraphs of texts for each test (oh what the hell was I thinking), what turned out were lines of fixme/errs just like the ones that show up on a regular program run. The single lined fixme/err(s) seem easier to filter compared to what I was imagining. xD Thanks again for this feedback, I feel great for my first attempt. Great because I didn't think this proposal would be one of the "more selectable" ones. It was my first attempt. I was confused myself of whether my proposal makes sense or not. This has been a good experience for me and as I have not submitted any patch to wine so I have less to regret now as I would've lost it anyway I guess. My main target next is to figure out how to catch problem areas in huge code bases. Might as well try to fix a wine bug sometime, thats a priority for summers. I'm likely to show up in the IRC in the middle of the summers. :) I'm CC'ing this into the mailing list as I usually like to keep things public (except personal things which are supposed to be undercovered). I already have opened my proposal into the mailing list. I have the IRC conversation of us which explained the winetest scripting interface idea to a better extent, I'm not sure if I should publicize it here for future references. I'll keep it unless required. I wish good luck for my fellow students and the organization to get the right set of contributors. Yash Yadav On 04/01/2018 03:03 PM, Stefan Dösinger wrote: > Hi Yash, > > As promised here is my take on the merits of your proposal for future > use. In short, I'd give it a thumbs up, but I am usually easier to > convince than other Wine mentors. Whether we would have accepted it > would also depend on what other proposals we could choose from and how > many slots we'd get. > > A big problem is that the idea (which I proposed on the idea list) is > somewhat poorly defined. It isn't a clear "code to spec" task, but > involves a lot of talking to other projects and investigating how > their test suite and development workflows work. Your proposal > accounts for that, which is great! You had good interaction with us on > IRC and discussed your ideas early, which is also a big plus. Of > course success or failure are partially in those 3rd party project's > hands. If we never get a proper reply from them the GSoC project would > be doomed to failure. > > If time permits I'd like to talk to the Mesa devs and ask them what > would be necessary for them to run our testsuite on a regular basis. > Of course so many priorities need attention :-\ . But my default > action will be to remove the idea from the suggested idea list for > next year. > > I am not sure if you have run the Wine tests yet - "Code the initial > version of the script that would run the “make install” in selected > directories depending upon the type of test that is called in for" > suggests you maybe did not, because running "make install" is not > required to run the tests. In fact you can run all of Wine out of the > source tree, which is much more comfortable when you're working on the > code. Just run "make" to build it and run it from ~/path/to/built/wine > foo.exe . No sudo, no copying of megabytes of files. The canonical way > to run the tests is "make test", which you can run on the top level > directory, or in a subdirectory, e.g. dlls/d3d9/tests. There's > programs/winetest/, which is a comfortable way to copy one binary to > another computer and run the tests. > > The "make install" thing wouldn't be a reason for me to reject the > proposal. It might be a case of poor phrasing, language > misunderstanding, etc. That's where the requirement to send a patch is > handy - if you manage to build Wine, make a small patch, commit it to > your git tree and send it to the mailing list we know you're competent > enough to figure out the difference between "make install" and "make > test" quickly. > > I hope I could shed some light on the magic of GSoC applications and > give you something for your effort to write the proposal despite the > deadline screwup. However, what I've written is just my opinion. Since > I'd mentor such a project it would carry a lot of weight, but it isn't > the the only thing that matters. Projects other than Wine may look at > completely different things. > > Feel free to quote this E-Mail on the mailing list. The things we look > for in proposals aren't a secret. But because this was your proposal > I'm sending this in a private mail to you to give you a choice what to do. > > Best regards, > Stefan

1 0

[PATCH] setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alistair Leslie-Hughes April 1, 2018

April 1, 2018

From: Tim Wanders <timwanders241(a)gmail.com> Fixes: https://bugs.winehq.org/show_bug.cgi?id=43831 Returning CR_SUCCESS assumes that the return value will be valid. This causes crashes in programs which only check the return. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/setupapi/stubs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 990974d9b9..7c3413a7cc 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -180,8 +180,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); - *pdnDevInst = dnDevInst; - return CR_SUCCESS; + if(pdnDevInst) + *pdnDevInst = 0; + return CR_NO_SUCH_DEVNODE; } /*********************************************************************** -- 2.16.2

1 0

[PATCH] winex11.drv: Print a debugstr and not the pointer to it
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f881b0f3f1..c2c1c6a1f7 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -335,7 +335,7 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ unsigned int i; VkResult res; - TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) -- 2.14.3

1 0

[PATCH] user32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/class.c | 12 ++++++------ dlls/user32/dialog.c | 4 ++-- dlls/user32/exticon.c | 4 ++-- dlls/user32/mdi.c | 8 ++++---- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/msgbox.c | 2 +- dlls/user32/nonclient.c | 4 ++-- dlls/user32/spy.c | 11 +++++------ dlls/user32/sysparams.c | 7 +++---- dlls/user32/text.c | 2 +- dlls/user32/win.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index a8b5a8fe5c..d4e7951d39 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -150,7 +150,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'t','o','o','l','t','i','p','s','_','c','l','a','s','s','3','2',0}, }; - int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + int min = 0, max = ARRAY_SIZE( classesW ) - 1; while (min <= max) { @@ -171,7 +171,7 @@ static BOOL is_builtin_class( const WCHAR *name ) {'S','c','r','o','l','l','b','a','r',0}, }; - int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + int min = 0, max = ARRAY_SIZE( classesW ) - 1; while (min <= max) { @@ -473,7 +473,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE strcpyW( classPtr->name, name ); classPtr->basename += basename_offset; } - else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); + else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, ARRAY_SIZE( classPtr->name )); SERVER_START_REQ( create_class ) { @@ -1125,7 +1125,7 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, if (!set_server_info( hwnd, offset, newval, size )) break; retval = class->atomName; class->atomName = newval; - GlobalGetAtomNameW( newval, class->name, sizeof(class->name)/sizeof(WCHAR) ); + GlobalGetAtomNameW( newval, class->name, ARRAY_SIZE( class->name )); break; case GCL_CBCLSEXTRA: /* cannot change this one */ SetLastError( ERROR_INVALID_PARAMETER ); @@ -1166,7 +1166,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) DWORD len; if (count <= 0) return 0; - if (!GetClassNameW( hwnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; + if (!GetClassNameW( hwnd, tmpbuf, ARRAY_SIZE( tmpbuf ))) return 0; RtlUnicodeToMultiByteN( buffer, count - 1, &len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); buffer[len] = 0; return len; @@ -1299,7 +1299,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) if (!IS_INTRESOURCE(name)) { WCHAR nameW[MAX_ATOM_LEN + 1]; - if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE( nameW ))) return FALSE; classPtr = CLASS_FindClass( nameW, hInstance ); } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 46220b0de7..7d1f6b3de7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -960,7 +960,7 @@ static BOOL DIALOG_IsAccelerator( HWND hwnd, HWND hwndDlg, WPARAM wParam ) { dlgCode = SendMessageW( hwndControl, WM_GETDLGCODE, 0, 0 ); if ( (dlgCode & (DLGC_BUTTON | DLGC_STATIC)) && - GetWindowTextW( hwndControl, buffer, sizeof(buffer)/sizeof(WCHAR) )) + GetWindowTextW( hwndControl, buffer, ARRAY_SIZE( buffer ))) { /* find the accelerator key */ LPWSTR p = buffer - 2; @@ -1868,7 +1868,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) { WCHAR temp[MAX_PATH]; - GetCurrentDirectoryW( sizeof(temp)/sizeof(WCHAR), temp ); + GetCurrentDirectoryW( ARRAY_SIZE( temp ), temp ); CharLowerW( temp ); /* Can't use PostMessage() here, because the string is on the stack */ SetDlgItemTextW( hDlg, idStatic, temp ); diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a428ae70c6..a16ae522c7 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -286,8 +286,8 @@ static UINT ICO_ExtractIconExW( TRACE("%s, %d, %d %p 0x%08x\n", debugstr_w(lpszExeFileName), nIconIndex, nIcons, pIconId, flags); - dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); - if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) + dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, ARRAY_SIZE(szExePath), szExePath, NULL); + if ((dwSearchReturn == 0) || (dwSearchReturn > ARRAY_SIZE(szExePath))) { WARN("File %s not found or path too long\n", debugstr_w(lpszExeFileName)); return -1; diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index ea362585a6..f990335d88 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -437,7 +437,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) if (visible == MDI_MOREWINDOWSLIMIT) { - LoadStringW(user32_module, IDS_MDI_MOREWINDOWS, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(user32_module, IDS_MDI_MOREWINDOWS, buf, ARRAY_SIZE(buf)); AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf); break; } @@ -453,7 +453,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) buf[0] = '&'; buf[1] = '0' + visible; buf[2] = ' '; - InternalGetWindowText(ci->child[i], buf + 3, sizeof(buf)/sizeof(WCHAR) - 3); + InternalGetWindowText(ci->child[i], buf + 3, ARRAY_SIZE(buf) - 3); TRACE("Adding %p, id %u %s\n", ci->child[i], id, debugstr_w(buf)); AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf); @@ -979,7 +979,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient, BOOL repaint, LPCWSTR if (!lpTitle && !ci->frameTitle) /* first time around, get title from the frame window */ { - GetWindowTextW( frame, lpBuffer, sizeof(lpBuffer)/sizeof(WCHAR) ); + GetWindowTextW( frame, lpBuffer, ARRAY_SIZE( lpBuffer )); lpTitle = lpBuffer; } @@ -1910,7 +1910,7 @@ static INT_PTR WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wPara { WCHAR buffer[MDI_MAXTITLELENGTH]; - if (!InternalGetWindowText( ci->child[i], buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (!InternalGetWindowText(ci->child[i], buffer, ARRAY_SIZE(buffer))) continue; SendMessageW(hListBox, LB_ADDSTRING, 0, (LPARAM)buffer ); SendMessageW(hListBox, LB_SETITEMDATA, i, (LPARAM)ci->child[i] ); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f4194ed6f2..99a99c0395 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5510,7 +5510,7 @@ INT WINAPI TranslateAcceleratorW( HWND hWnd, HACCEL hAccel, LPMSG msg ) hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam); if (!(count = CopyAcceleratorTableW( hAccel, NULL, 0 ))) return 0; - if (count > sizeof(data)/sizeof(data[0])) + if (count > ARRAY_SIZE( data )) { if (!(ptr = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*ptr) ))) return 0; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6b7f91854f..d2e6a75726 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2312,7 +2312,7 @@ static BOOL process_rawinput_message( MSG *msg, const struct hardware_msg_data * rawinput->data.mouse.usFlags = MOUSE_MOVE_RELATIVE; rawinput->data.mouse.u.s.usButtonFlags = 0; rawinput->data.mouse.u.s.usButtonData = 0; - for (i = 1; i < sizeof(button_flags) / sizeof(*button_flags); ++i) + for (i = 1; i < ARRAY_SIZE(button_flags); ++i) { if (msg_data->flags & (1 << i)) rawinput->data.mouse.u.s.usButtonFlags |= button_flags[i]; @@ -3902,7 +3902,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) } GetKeyboardState( state ); - len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, sizeof(wp)/sizeof(WCHAR), 0); + len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0); if (len == -1) { message = (msg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index d3d11d6ceb..457c3ae7d1 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -294,7 +294,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Position the buttons */ bpos = (wwidth - (bw + bspace) * buttons + bspace) / 2; - for (buttons = i = 0; i < (sizeof(buttonOrder) / sizeof(buttonOrder[0])); i++) { + for (buttons = i = 0; i < ARRAY_SIZE(buttonOrder); i++) { /* Convert the button order to ID* value to order for the buttons */ hItem = GetDlgItem(hwnd, buttonOrder[i]); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 2b38897729..fcf32f01ef 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -343,7 +343,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (!str) { - if (!GetWindowTextW( hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + if (!GetWindowTextW( hwnd, text, ARRAY_SIZE( text ))) text[0] = 0; str = text; } rc.left += 2; @@ -953,7 +953,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, } } - if (GetWindowTextW( hwnd, buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (GetWindowTextW( hwnd, buffer, ARRAY_SIZE( buffer ))) { NONCLIENTMETRICSW nclm; HFONT hFont, hOldFont; diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 80bd0a3133..749fc220b4 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2127,7 +2127,7 @@ const char *SPY_GetClassLongOffsetName( INT offset ) { INT index; if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < - sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + ARRAY_SIZE(ClassLongOffsetNames))) { return ClassLongOffsetNames[index]; } @@ -2148,7 +2148,7 @@ static void SPY_GetClassName( SPY_INSTANCE *sp_e ) strcpyW(sp_e->wnd_class, WC_PROPSHEETW); } else { - GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)/sizeof(WCHAR)); + GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, ARRAY_SIZE(sp_e->wnd_class)); } } @@ -2223,12 +2223,12 @@ static void SPY_GetWndName( SPY_INSTANCE *sp_e ) SPY_GetClassName( sp_e ); - len = InternalGetWindowText(sp_e->msg_hwnd, sp_e->wnd_name, sizeof(sp_e->wnd_name)/sizeof(WCHAR)); + len = InternalGetWindowText(sp_e->msg_hwnd, sp_e->wnd_name, ARRAY_SIZE(sp_e->wnd_name)); if(!len) /* get class name */ { LPWSTR dst = sp_e->wnd_name; LPWSTR src = sp_e->wnd_class; - int n = sizeof(sp_e->wnd_name)/sizeof(WCHAR) - 3; + int n = ARRAY_SIZE(sp_e->wnd_name) - 3; *dst++ = '{'; while ((n-- > 0) && *src) *dst++ = *src++; *dst++ = '}'; @@ -2537,8 +2537,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) if (pnmh->code == NM_CUSTOMDRAW) { /* save and restore error code over the next call */ save_error = GetLastError(); - GetClassNameW(pnmh->hwndFrom, from_class, - sizeof(from_class)/sizeof(WCHAR)); + GetClassNameW(pnmh->hwndFrom, from_class, ARRAY_SIZE(from_class)); SetLastError(save_error); if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0) dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2fcf2fbfea..7780293490 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1383,7 +1383,7 @@ void SYSPARAMS_Init(void) if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ { - for (i = 0; i < sizeof(default_entries)/sizeof(default_entries[0]); i++) + for (i = 0; i < ARRAY_SIZE( default_entries ); i++) default_entries[i]->hdr.init( default_entries[i] ); } } @@ -2251,9 +2251,8 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, { WCHAR buffer[256]; if (pvParam) - if (!MultiByteToWideChar( CP_ACP, 0, pvParam, -1, buffer, - sizeof(buffer)/sizeof(WCHAR) )) - buffer[sizeof(buffer)/sizeof(WCHAR)-1] = 0; + if (!MultiByteToWideChar( CP_ACP, 0, pvParam, -1, buffer, ARRAY_SIZE( buffer ))) + buffer[ARRAY_SIZE(buffer)-1] = 0; ret = SystemParametersInfoW( uiAction, uiParam, pvParam ? buffer : NULL, fuWinIni ); break; } diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 2ac3afd607..0b5bd47461 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -970,7 +970,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, do { - len = sizeof(line)/sizeof(line[0]); + len = ARRAY_SIZE(line); if (invert_y) last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; else diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3c497f878e..019b178f95 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1748,7 +1748,7 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExA( DWORD exStyle, LPCSTR className, if (!IS_INTRESOURCE(className)) { WCHAR bufferW[256]; - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, ARRAY_SIZE( bufferW ))) return 0; return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, FALSE ); } @@ -2024,7 +2024,7 @@ HWND WINAPI FindWindowExA( HWND parent, HWND child, LPCSTR className, LPCSTR tit if (!IS_INTRESOURCE(className)) { WCHAR classW[256]; - if (MultiByteToWideChar( CP_ACP, 0, className, -1, classW, sizeof(classW)/sizeof(WCHAR) )) + if (MultiByteToWideChar( CP_ACP, 0, className, -1, classW, ARRAY_SIZE( classW ))) hwnd = FindWindowExW( parent, child, classW, titleW ); } else -- 2.14.3

1 0

[PATCH] user32: Remove an ARRAY_SIZE() alike macro
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2c4ff5ec8d..2fcf2fbfea 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1300,7 +1300,6 @@ static struct sysparam_rgb_entry system_colors[] = RGB_ENTRY( COLOR_MENUBAR, RGB(212, 208, 200) ) #undef RGB_ENTRY }; -#define NUM_SYS_COLORS (sizeof(system_colors) / sizeof(system_colors[0])) /* entries that are initialized by default in the registry */ static union sysparam_all_entry * const default_entries[] = @@ -2690,7 +2689,8 @@ COLORREF WINAPI DECLSPEC_HOTPATCH GetSysColor( INT nIndex ) { COLORREF ret = 0; - if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) get_entry( &system_colors[nIndex], 0, &ret ); + if (nIndex >= 0 && nIndex < ARRAY_SIZE( system_colors )) + get_entry( &system_colors[nIndex], 0, &ret ); return ret; } @@ -2705,7 +2705,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= NUM_SYS_COLORS) + if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */ @@ -2735,7 +2735,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes */ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) { - if (index < 0 || index >= NUM_SYS_COLORS) return 0; + if (index < 0 || index >= ARRAY_SIZE( system_colors )) return 0; if (!system_colors[index].brush) { @@ -2757,7 +2757,7 @@ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) HPEN SYSCOLOR_GetPen( INT index ) { /* We can assert here, because this function is internal to Wine */ - assert (0 <= index && index < NUM_SYS_COLORS); + assert (0 <= index && index < ARRAY_SIZE( system_colors )); if (!system_colors[index].pen) { -- 2.14.3

1 0

[PATCH] wsdapi: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index cfcae6b042..bea63fb67e 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -215,7 +215,7 @@ BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, U ret = TRUE; cleanup: - if (adapter_addresses != NULL) heap_free(adapter_addresses); + heap_free(adapter_addresses); return ret; } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 7779317850..970bc4f847 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -127,8 +127,7 @@ static inline void free_xml_string(WS_XML_STRING *value) if (value == NULL) return; - if (value->bytes != NULL) - heap_free(value->bytes); + heap_free(value->bytes); heap_free(value); } -- 2.14.3

1 0

[PATCH] wsdapi/tests: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 1c7619d5e6..73fe22c258 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -260,7 +260,7 @@ static void start_listening(messageStorage *msgStorage, const char *multicastAdd cleanup: closesocket(s); - if (parameter != NULL) heap_free(parameter); + heap_free(parameter); cleanup_addresses: freeaddrinfo(multicastAddr); @@ -309,7 +309,7 @@ static BOOL start_listening_on_all_addresses(messageStorage *msgStorage, ULONG f ret = TRUE; cleanup: - if (adapterAddresses != NULL) heap_free(adapterAddresses); + heap_free(adapterAddresses); return ret; } @@ -626,8 +626,8 @@ static void Publish_tests(void) after_publish_test: - if (publisherIdW != NULL) heap_free(publisherIdW); - if (sequenceIdW != NULL) heap_free(sequenceIdW); + heap_free(publisherIdW); + heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); -- 2.14.3

1 0

[PATCH] shell32: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc April 1, 2018

April 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c54fe7854f..c8b93d31f6 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -184,7 +184,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, delete_groupW)) @@ -224,7 +224,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, add_itemW)) -- 2.14.3

1 0