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

[PATCH] browseui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 23, 2018

July 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/browseui/progressdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7cba7d6464..2355b0cfa0 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -114,7 +114,7 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) WCHAR string[256]; LPWSTR ret; - LoadStringW(hInstance, uiResourceId, string, sizeof(string)/sizeof(string[0])); + LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); ret = HeapAlloc(GetProcessHeap(), 0, (strlenW(string) + 1) * sizeof(WCHAR)); strcpyW(ret, string); return ret; -- 2.14.4

1 0

[PATCH] taskmgr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 23, 2018

July 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/about.c | 2 +- programs/taskmgr/affinity.c | 16 +++++++-------- programs/taskmgr/applpage.c | 14 ++++++------- programs/taskmgr/column.c | 50 ++++++++++++++++++++++----------------------- programs/taskmgr/dbgchnl.c | 8 ++++---- programs/taskmgr/debug.c | 16 +++++++-------- programs/taskmgr/endproc.c | 14 ++++++------- programs/taskmgr/perfdata.c | 2 +- programs/taskmgr/perfpage.c | 4 ++-- programs/taskmgr/priority.c | 10 ++++----- programs/taskmgr/procpage.c | 4 ++-- programs/taskmgr/taskmgr.c | 32 ++++++++++++++--------------- programs/taskmgr/trayicon.c | 6 +++--- 13 files changed, 88 insertions(+), 90 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index c625139645..1eff50f003 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -36,7 +36,7 @@ void OnAbout(void) WCHAR copy[] = {'B','r','i','a','n',' ', 'P','a','l','m','e','r',' ', '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; - LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); + LoadStringW( hInst, IDC_TASKMGR, appname, ARRAY_SIZE( appname )); ShellAboutW( hMainWnd, appname, copy, LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 48, 48, LR_SHARED )); } diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index c195a2d7ce..4e33f50d4f 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -51,9 +51,9 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * the number of CPUs present in the system */ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); EndDialog(hDlg, 0); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); } @@ -291,8 +291,8 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) if (!dwProcessAffinityMask) { WCHAR wszErrorMsg[255]; WCHAR wszErrorTitle[255]; - LoadStringW(hInst, IDS_AFFINITY_ERROR_MESSAGE, wszErrorMsg, sizeof(wszErrorMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_AFFINITY_ERROR_TITLE, wszErrorTitle, sizeof(wszErrorTitle)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_ERROR_MESSAGE, wszErrorMsg, ARRAY_SIZE(wszErrorMsg)); + LoadStringW(hInst, IDS_AFFINITY_ERROR_TITLE, wszErrorTitle, ARRAY_SIZE(wszErrorTitle)); MessageBoxW(hDlg, wszErrorMsg, wszErrorTitle, MB_OK|MB_ICONSTOP); return TRUE; } @@ -301,9 +301,9 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * Try to set the process affinity */ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); EndDialog(hDlg, LOWORD(wParam)); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); } @@ -341,8 +341,8 @@ void ProcessPage_OnSetAffinity(void) return; hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); return; } diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index e2874b5943..ae881b530c 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -249,10 +249,8 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) return TRUE; /* Check and see if this is a top-level app window */ - if (!GetWindowTextW(hWnd, wszText, sizeof(wszText)/sizeof(WCHAR)) || - !IsWindowVisible(hWnd) || - (GetParent(hWnd) != NULL) || - (GetWindow(hWnd, GW_OWNER) != NULL) || + if (!GetWindowTextW(hWnd, wszText, ARRAY_SIZE(wszText)) || !IsWindowVisible(hWnd) || + (GetParent(hWnd) != NULL) || (GetWindow(hWnd, GW_OWNER) != NULL) || (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { return TRUE; /* Skip this window */ @@ -415,8 +413,8 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) WCHAR wszNotResponding[255]; WCHAR wszRunning[255]; - LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, ARRAY_SIZE(wszNotResponding)); + LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, ARRAY_SIZE(wszRunning)); pnmh = (LPNMHDR) lParam; pnmdi = (LV_DISPINFOW*) lParam; @@ -842,8 +840,8 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) WCHAR wszTask[255]; WCHAR wszStatus[255]; - LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, sizeof(wszTask)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, sizeof(wszStatus)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, ARRAY_SIZE(wszTask)); + LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, ARRAY_SIZE(wszStatus)); switch (message) { case WM_INITDIALOG: diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 35ba2a0b94..27c5926b5b 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -63,31 +63,31 @@ static WCHAR wszIOOtherBytes[255]; static void load_column_headers(void) { - LoadStringW(hInst, IDS_IMAGENAME, wszImageName, sizeof(wszImageName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PID, wszPID, sizeof(wszPID)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_USERNAME, wszUserName, sizeof(wszUserName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_SESSIONID, wszSessionID, sizeof(wszSessionID)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_CPUUSAGE, wszCPU, sizeof(wszCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_CPUTIME, wszCPUTime, sizeof(wszCPUTime)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_MEMORYUSAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PEAKMEMORYUSAGE, wszPeakMemUsage, sizeof(wszPeakMemUsage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_MEMORYUSAGEDELTA, wszMemDelta, sizeof(wszMemDelta)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEFAULTS, wszPageFaults, sizeof(wszPageFaults)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEFAULTSDELTA, wszPFDelta, sizeof(wszPFDelta)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIRTUALMEMORYSIZE, wszVMSize, sizeof(wszVMSize)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEDPOOL, wszPagedPool, sizeof(wszPagedPool)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_NONPAGEDPOOL, wszNPPool, sizeof(wszNPPool)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_BASEPRIORITY, wszBasePri, sizeof(wszBasePri)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_HANDLECOUNT, wszHandles, sizeof(wszHandles)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_THREADCOUNT, wszThreads, sizeof(wszThreads)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_USEROBJECTS, wszUSERObjects, sizeof(wszUSERObjects)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_GDIOBJECTS, wszGDIObjects, sizeof(wszGDIObjects)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOREADS, wszIOReads, sizeof(wszIOReads)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOWRITES, wszIOWrites, sizeof(wszIOWrites)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOOTHER, wszIOOther, sizeof(wszIOOther)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOREADBYTES, wszIOReadBytes, sizeof(wszIOReadBytes)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOWRITEBYTES, wszIOWriteBytes, sizeof(wszIOWriteBytes)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOOTHERBYTES, wszIOOtherBytes, sizeof(wszIOOtherBytes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IMAGENAME, wszImageName, ARRAY_SIZE(wszImageName)); + LoadStringW(hInst, IDS_PID, wszPID, ARRAY_SIZE(wszPID)); + LoadStringW(hInst, IDS_USERNAME, wszUserName, ARRAY_SIZE(wszUserName)); + LoadStringW(hInst, IDS_SESSIONID, wszSessionID, ARRAY_SIZE(wszSessionID)); + LoadStringW(hInst, IDS_CPUUSAGE, wszCPU, ARRAY_SIZE(wszCPU)); + LoadStringW(hInst, IDS_CPUTIME, wszCPUTime, ARRAY_SIZE(wszCPUTime)); + LoadStringW(hInst, IDS_MEMORYUSAGE, wszMemUsage, ARRAY_SIZE(wszMemUsage)); + LoadStringW(hInst, IDS_PEAKMEMORYUSAGE, wszPeakMemUsage, ARRAY_SIZE(wszPeakMemUsage)); + LoadStringW(hInst, IDS_MEMORYUSAGEDELTA, wszMemDelta, ARRAY_SIZE(wszMemDelta)); + LoadStringW(hInst, IDS_PAGEFAULTS, wszPageFaults, ARRAY_SIZE(wszPageFaults)); + LoadStringW(hInst, IDS_PAGEFAULTSDELTA, wszPFDelta, ARRAY_SIZE(wszPFDelta)); + LoadStringW(hInst, IDS_VIRTUALMEMORYSIZE, wszVMSize, ARRAY_SIZE(wszVMSize)); + LoadStringW(hInst, IDS_PAGEDPOOL, wszPagedPool, ARRAY_SIZE(wszPagedPool)); + LoadStringW(hInst, IDS_NONPAGEDPOOL, wszNPPool, ARRAY_SIZE(wszNPPool)); + LoadStringW(hInst, IDS_BASEPRIORITY, wszBasePri, ARRAY_SIZE(wszBasePri)); + LoadStringW(hInst, IDS_HANDLECOUNT, wszHandles, ARRAY_SIZE(wszHandles)); + LoadStringW(hInst, IDS_THREADCOUNT, wszThreads, ARRAY_SIZE(wszThreads)); + LoadStringW(hInst, IDS_USEROBJECTS, wszUSERObjects, ARRAY_SIZE(wszUSERObjects)); + LoadStringW(hInst, IDS_GDIOBJECTS, wszGDIObjects, ARRAY_SIZE(wszGDIObjects)); + LoadStringW(hInst, IDS_IOREADS, wszIOReads, ARRAY_SIZE(wszIOReads)); + LoadStringW(hInst, IDS_IOWRITES, wszIOWrites, ARRAY_SIZE(wszIOWrites)); + LoadStringW(hInst, IDS_IOOTHER, wszIOOther, ARRAY_SIZE(wszIOOther)); + LoadStringW(hInst, IDS_IOREADBYTES, wszIOReadBytes, ARRAY_SIZE(wszIOReadBytes)); + LoadStringW(hInst, IDS_IOWRITEBYTES, wszIOWriteBytes, ARRAY_SIZE(wszIOWriteBytes)); + LoadStringW(hInst, IDS_IOOTHERBYTES, wszIOOtherBytes, ARRAY_SIZE(wszIOOtherBytes)); } static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 6e2dea0e14..7200eb476c 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -113,7 +113,7 @@ static int list_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ int index; HWND hChannelLV = user; - MultiByteToWideChar(CP_ACP, 0, channel->name, sizeof(channel->name), nameW, sizeof(nameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, channel->name, sizeof(channel->name), nameW, ARRAY_SIZE(nameW)); lvitem.mask = LVIF_TEXT; lvitem.pszText = nameW; @@ -231,7 +231,7 @@ static void DebugChannels_OnCreate(HWND hwndDlg) LVCOLUMNW lvc; WCHAR debug_channelW[255]; - LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, sizeof(debug_channelW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, ARRAY_SIZE(debug_channelW)); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; @@ -293,8 +293,8 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam) unsigned bitmask = 1 << (lhti.iSubItem - 1); struct cce_user user; - ListView_GetItemTextA(hChannelLV, lhti.iItem, 0, name, sizeof(name) / sizeof(name[0])); - ListView_GetItemTextW(hChannelLV, lhti.iItem, lhti.iSubItem, val, sizeof(val) / sizeof(val[0])); + ListView_GetItemTextA(hChannelLV, lhti.iItem, 0, name, ARRAY_SIZE(name)); + ListView_GetItemTextW(hChannelLV, lhti.iItem, lhti.iSubItem, val, ARRAY_SIZE(val)); user.name = name; user.value = (val[0] == 'x') ? 0 : bitmask; user.mask = bitmask; diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index 10fa912feb..ceb27d11f9 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -57,9 +57,9 @@ void ProcessPage_OnDebug(void) 'A','e','D','e','b','u','g',0}; static const WCHAR wszDebugger[] = {'D','e','b','u','g','g','e','r',0}; - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_DEBUG_UNABLE2DEBUG, wszUnable2Debug, sizeof(wszUnable2Debug)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_DEBUG_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); + LoadStringW(hInst, IDS_DEBUG_UNABLE2DEBUG, wszUnable2Debug, ARRAY_SIZE(wszUnable2Debug)); + LoadStringW(hInst, IDS_DEBUG_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); for (Index=0; Index<Count; Index++) @@ -82,14 +82,14 @@ void ProcessPage_OnDebug(void) if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszSubKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } @@ -97,7 +97,7 @@ void ProcessPage_OnDebug(void) dwDebuggerSize = 260; if (RegQueryValueExW(hKey, wszDebugger, NULL, NULL, (LPBYTE)wstrDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); RegCloseKey(hKey); return; @@ -108,7 +108,7 @@ void ProcessPage_OnDebug(void) hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } @@ -120,7 +120,7 @@ void ProcessPage_OnDebug(void) si.cb = sizeof(STARTUPINFOW); if (!CreateProcessW(NULL, wstrDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 89c2d7bf80..7ed5ff08c6 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -38,9 +38,9 @@ static WCHAR wszUnable2Terminate[255]; static void load_message_strings(void) { - LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_TERMINATE_UNABLE2TERMINATE, wszUnable2Terminate, sizeof(wszUnable2Terminate)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); + LoadStringW(hInst, IDS_TERMINATE_UNABLE2TERMINATE, wszUnable2Terminate, ARRAY_SIZE(wszUnable2Terminate)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); } void ProcessPage_OnEndProcess(void) @@ -79,14 +79,14 @@ void ProcessPage_OnEndProcess(void) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); } @@ -129,14 +129,14 @@ void ProcessPage_OnEndProcessTree(void) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index aa19914d61..f86d52159f 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -248,7 +248,7 @@ void PerfDataRefresh(void) else { WCHAR idleW[255]; - LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, sizeof(idleW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, ARRAY_SIZE(idleW)); lstrcpyW(pPerfData[Idx].ImageName, idleW ); } diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 3969ce41a2..63fb009eda 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -141,7 +141,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) static const WCHAR wszFormatDigit[] = {'%','u',0}; WCHAR wszMemUsage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, ARRAY_SIZE(wszMemUsage)); /* Create the event */ hPerformancePageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); @@ -190,7 +190,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) args[1] = CommitChargeLimit; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, wszMemUsage, 0, 0, Text, - sizeof(Text)/sizeof(*Text), (__ms_va_list*)args); + ARRAY_SIZE(Text), (__ms_va_list*)args); SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text); /* diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index 577a1aee14..90323db0c4 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -44,9 +44,9 @@ static void DoSetPriority(DWORD priority) WCHAR wszWarnTitle[255]; WCHAR wszUnable2Change[255]; - LoadStringW(hInst, IDS_PRIORITY_CHANGE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PRIORITY_UNABLE2CHANGE, wszUnable2Change, sizeof(wszUnable2Change)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PRIORITY_CHANGE_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); + LoadStringW(hInst, IDS_PRIORITY_UNABLE2CHANGE, wszUnable2Change, ARRAY_SIZE(wszUnable2Change)); Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); for (Index=0; Index<Count; Index++) @@ -74,14 +74,14 @@ static void DoSetPriority(DWORD priority) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Change, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, priority)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Change, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index beccd86e5f..5ea2e6b044 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -384,8 +384,8 @@ static DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) WCHAR wszCPU_Usage[255]; WCHAR wszProcesses[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); /* Create the event */ hProcessPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b280f7975d..1983d4d443 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -122,9 +122,9 @@ static BOOL OnCreate(HWND hWnd) static WCHAR wszProcesses[255]; static WCHAR wszPerformance[255]; - LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, sizeof(wszApplications)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, ARRAY_SIZE(wszApplications)); + LoadStringW(hInst, IDS_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); + LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, ARRAY_SIZE(wszPerformance)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, @@ -501,8 +501,8 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) WCHAR wszCPU_Usage[255]; WCHAR wszProcesses[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); bInMenuLoop = FALSE; /* Update the status bar pane sizes */ @@ -522,7 +522,7 @@ static void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU { WCHAR wstr[256] = {0}; - LoadStringW(hInst, nItemID, wstr, sizeof(wstr)/sizeof(WCHAR)); + LoadStringW(hInst, nItemID, wstr, ARRAY_SIZE(wstr)); SendMessageW(hStatusWnd, SB_SETTEXTW, 0, (LPARAM)wstr); } @@ -610,16 +610,16 @@ static void TaskManager_OnTabWndSelChange(void) WCHAR wszCPUHistory[255]; WCHAR wszShowKernelTimes[255]; - LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, sizeof(wszLargeIcons)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, sizeof(wszSmallIcons)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, sizeof(wszDetails)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WINDOWS, wszWindows, sizeof(wszWindows)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, sizeof(wszSelectColumns)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, sizeof(wszShow16bTasks)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, sizeof(wszOneGraphAllCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, sizeof(wszOneGraphPerCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, sizeof(wszCPUHistory)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, sizeof(wszShowKernelTimes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, ARRAY_SIZE(wszLargeIcons)); + LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, ARRAY_SIZE(wszSmallIcons)); + LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, ARRAY_SIZE(wszDetails)); + LoadStringW(hInst, IDS_WINDOWS, wszWindows, ARRAY_SIZE(wszWindows)); + LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, ARRAY_SIZE(wszSelectColumns)); + LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, ARRAY_SIZE(wszShow16bTasks)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, ARRAY_SIZE(wszOneGraphAllCPU)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, ARRAY_SIZE(wszOneGraphPerCPU)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, ARRAY_SIZE(wszCPUHistory)); + LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, ARRAY_SIZE(wszShowKernelTimes)); hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index af98474c24..b814e8c7c0 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -140,7 +140,7 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL bRetVal; WCHAR wszCPU_Usage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -187,8 +187,8 @@ BOOL TrayIcon_ShellUpdateTrayIcon(void) BOOL bRetVal; WCHAR wszCPU_Usage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); -- 2.14.4

1 0

[PATCH] amstream: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 23, 2018

July 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/main.c | 4 ++-- dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 2cadf9c32f..65aafba3e6 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -174,13 +174,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1a14572c8a..52e691fea4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -479,7 +479,7 @@ static void test_media_streams(void) ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); -- 2.14.4

1 0

[PATCH] dsound: Correctly calculate angle between vectors with equal and opposite directions
by Andrew Eikum July 23, 2018

July 23, 2018

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dsound/sound3d.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 03fd3d4678..8dafa1dd64 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -111,6 +111,13 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT return 0; cos = product/(la*lb); + if(fabs(1 - cos) < 0.0001f){ + angle = 0; + }else if(fabs(-1 - cos) < 0.0001f){ + angle = M_PI; + }else{ + angle = acos(cos); + } angle = acos(cos); TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); -- 2.18.0

1 0

The compiled from source WINE has no font antialiasing, but installed from the package has.
by John Found July 23, 2018

July 23, 2018

When I build WINE from source code and then run it from the build directory, all programs run with weird font rendering: some fonts has only grayscale antialiasing, most are not antialiased at all. Subpixel smooting is not working at all. The installed from the system repositories WINE (Manjaro Linux/Arch) has fine subpixel antialiasing. Both versions run on the same WINEPREFIX (~/.wine/) and all the registry keys are properly set for subpixel antialiasing. Tried to make new wine prefix, but the result is the same, with the difference that even the rare grayscale antialiasing disappeared. When building, I am following the directions from here: https://wiki.winehq.org/Building_Wine#Shared_WoW64 What I am doing wrong when building and how to diagnose/fix it? -- John Found <johnfound(a)asm32.info>

2 1

Wine staging 3.13 release
by Alistair Leslie-Hughes July 23, 2018

July 23, 2018

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.13 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Updated patchsets * xaudio2 WMA support. * kernelbase-PathCchCombineEx * winepulse-PulseAudio_Support Added * [44888] Implement WINED3DFMT_B8G8R8X8_UNORM to WINED3DFMT_L8_UNORM conversion * [36763] Rogue Squadron 3D 1.3: Crashes with game resolutions above 640x480 * [28282] Sound constantly crackling in lot of games Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

3 5

[PATCH] mmdevapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 23, 2018

July 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/devenum.c | 10 +++++----- dlls/mmdevapi/main.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b189e8e060..685ec27de6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -338,7 +338,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st cur->state = state; cur->devguid = *id; - StringFromGUID2(&cur->devguid, guidstr, sizeof(guidstr)/sizeof(*guidstr)); + StringFromGUID2(&cur->devguid, guidstr, ARRAY_SIZE(guidstr)); if (flow == eRender) root = key_render; @@ -429,7 +429,7 @@ static HRESULT load_devices_from_reg(void) DWORD len; PROPVARIANT pv = { VT_EMPTY }; - len = sizeof(guidvalue)/sizeof(guidvalue[0]); + len = ARRAY_SIZE(guidvalue); ret = RegEnumKeyExW(cur, i++, guidvalue, &len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) { @@ -1395,7 +1395,7 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro return hr; *nprops = 0; do { - DWORD len = sizeof(buffer)/sizeof(*buffer); + DWORD len = ARRAY_SIZE(buffer); if (RegEnumValueW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; i++; @@ -1410,7 +1410,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR { MMDevPropStore *This = impl_from_IPropertyStore(iface); WCHAR buffer[50]; - DWORD len = sizeof(buffer)/sizeof(*buffer); + DWORD len = ARRAY_SIZE(buffer); HRESULT hr; HKEY propkey; @@ -1530,7 +1530,7 @@ static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, if (!lstrcmpW(name, dsguid)) { WCHAR guidstr[39]; - StringFromGUID2(&This->devguid, guidstr,sizeof(guidstr)/sizeof(*guidstr)); + StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); var->n1.n2.vt = VT_BSTR; var->n1.n2.n3.bstrVal = SysAllocString(guidstr); return S_OK; diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 2b0a6f946b..8886975c96 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -295,7 +295,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return E_NOINTERFACE; } - for (i = 0; i < sizeof(MMDEVAPI_CF)/sizeof(MMDEVAPI_CF[0]); ++i) + for (i = 0; i < ARRAY_SIZE(MMDEVAPI_CF); ++i) { if (IsEqualGUID(rclsid, MMDEVAPI_CF[i].rclsid)) { IClassFactory_AddRef(&MMDEVAPI_CF[i].IClassFactory_iface); -- 2.14.4

2 1

[PATCH] api-ms-win-devices-config-l1-1-0: Add dll.
by Andrey Gusev July 23, 2018

July 23, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-devices-config-l1-1-0.spec | 38 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 43 insertions(+) create mode 100644 dlls/api-ms-win-devices-config-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec diff --git a/configure b/configure index 337ce912fe..fd58e1538b 100755 --- a/configure +++ b/configure @@ -1045,6 +1045,7 @@ enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 enable_api_ms_win_crt_utility_l1_1_0 +enable_api_ms_win_devices_config_l1_1_0 enable_api_ms_win_devices_config_l1_1_1 enable_api_ms_win_devices_query_l1_1_1 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -19137,6 +19138,7 @@ wine_fn_config_makefile dlls/api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_s wine_fn_config_makefile dlls/api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-devices-config-l1-1-0 enable_api_ms_win_devices_config_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-devices-config-l1-1-1 enable_api_ms_win_devices_config_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-devices-query-l1-1-1 enable_api_ms_win_devices_query_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index be247ea200..ddf7ee3a20 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-string-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-time-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-utility-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-config-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-config-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-query-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in b/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1e11946aa7 --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-devices-config-l1-1-0.dll diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec new file mode 100644 index 0000000000..fcd3aaa4ad --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -0,0 +1,38 @@ +@ stub CM_Delete_Class_Key +@ stub CM_Delete_DevNode_Key +@ stub CM_Delete_Device_Interface_KeyW +@ stub CM_Disable_DevNode +@ stub CM_Enable_DevNode +@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stub CM_Get_Class_PropertyW +@ stub CM_Get_Class_Property_Keys +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stub CM_Get_Depth +@ stub CM_Get_DevNode_PropertyW +@ stub CM_Get_DevNode_Property_Keys +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stub CM_Get_Device_Interface_ListW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stub CM_Get_Device_Interface_PropertyW +@ stub CM_Get_Device_Interface_Property_KeysW +@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent +@ stub CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stub CM_Open_Class_KeyW +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stub CM_Open_Device_Interface_KeyW +@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Register_Notification +@ stub CM_Set_Class_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stub CM_Set_DevNode_PropertyW +@ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Set_Device_Interface_PropertyW +@ stub CM_Setup_DevNode +@ stub CM_Uninstall_DevNode +@ stub CM_Unregister_Notification diff --git a/tools/make_specfiles b/tools/make_specfiles index 4faf66559d..cd3af877bb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -105,6 +105,7 @@ my @dll_groups = [ "setupapi", "cfgmgr32", + "api-ms-win-devices-config-l1-1-0", "api-ms-win-devices-config-l1-1-1", "api-ms-win-devices-query-l1-1-1", ], -- 2.17.1

1 0

[PATCH] winemac.drv: Print the debug string and not the pointer to it
by Michael Stefaniuc July 22, 2018

July 22, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index b1211dff54..d49c9a1ab2 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -342,7 +342,7 @@ static VkResult macdrv_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.4

2 1

[PATCH] winex11.drv: Allow the children windows to accept WM_DROPFILES if they have WS_EX_ACCEPTFILES.
by John Found July 22, 2018

July 22, 2018

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=41606 Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 58 +++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..2ba98491e1 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,31 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* the recursive worker for window_from_point_dnd */ +HWND do_window_from_point_dnd(HWND hwnd, POINT* point) +{ + HWND w; + w = ChildWindowFromPointEx(hwnd, *point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE); + if (w && (w != hwnd)) + { + ClientToScreen(hwnd, point); + ScreenToClient(w, point); + w = do_window_from_point_dnd(w, point); + } + return w; +} + + +/* Recursively search for the window on given coordinates in a drag&drop specific manner. */ +HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + POINT p; + p.x = point.x; + p.y = point.y; + ScreenToClient(hwnd, &p); + return do_window_from_point_dnd(hwnd, &p); +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +295,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +359,18 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + while (targetWindow && !(GetWindowLongW(targetWindow, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + targetWindow = GetParent(targetWindow); + + if (targetWindow && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +455,20 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + POINT pt; + HWND hwnd_drop; + + pt.x = XDNDxy.x; + pt.y = XDNDxy.y; + + hwnd_drop = window_from_point_dnd(hWnd, pt); + + while (hwnd_drop && !(GetWindowLongW(hwnd_drop, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + hwnd_drop = GetParent(hwnd_drop); + + if (hwnd_drop) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.18.0

2 2