- wine-devel - winehq.org

[PATCH] setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alistair Leslie-Hughes 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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 01 Apr '18

01 Apr '18

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

[PATCH] LICENSE: switch to Microsoft Public License
by Austin English 01 Apr '18

01 Apr '18

From 5db15de2eb9c622378e72e0a67d70bcbcf3a526d Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sun, 1 Apr 2018 14:31:04 -0500 Subject: [PATCH] LICENSE: switch to Microsoft Public License For better interoperability with our API overlords Signed-off-by: Austin English <austinenglish(a)gmail.com> --- LICENSE | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 765b9c3978..a9dd7f3328 100644 --- a/LICENSE +++ b/LICENSE @@ -1,17 +1,21 @@ -Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS -for a complete list) +Microsoft Public License (MS-PL) +This license governs use of the accompanying software. If you use the software, you +accept this license. If you do not accept the license, do not use the software. -Wine is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License as published by the -Free Software Foundation; either version 2.1 of the License, or (at -your option) any later version. +1. Definitions +The terms "reproduce," "reproduction," "derivative works," and "distribution" have the +same meaning here as under U.S. copyright law. +A "contribution" is the original software, or any additions or changes to the software. +A "contributor" is any person that distributes its contribution under this license. +"Licensed patents" are a contributor's patent claims that read directly on its contribution. -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +2. Grant of Rights +(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. +(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. -A copy of the GNU Lesser General Public License is included in the -Wine distribution in the file COPYING.LIB. If you did not receive this -copy, write to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. +3. Conditions and Limitations +(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. +(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. +(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. +(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. +(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. -- 2.16.3

1 0

[PATCH 4/4] winmm: Fix MEVT_LONGMSG handling in MIDI stream.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)

2 1

[PATCH 2/4] midimap: Open lower devices when opening MIDI Mapper.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

Without this change, the lower device can't get a long message at the beginning. The mapper didn't open it before receiving a short message in modData function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 27 ++++++++++++++------------- dlls/winmm/tests/midi.c | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-)

1 0

[PATCH 1/4] winmm/tests: Add MIDI System Exclusive message tests.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)

1 0

[PATCH] kernel32: add stub for RequestDeviceWakeup
by Louis Lenders 01 Apr '18

01 Apr '18

For https://bugs.winehq.org/show_bug.cgi?id=44874

1 0

[PATCH] comctl32/button: Keep control style
by Nikolay Sivov 01 Apr '18

01 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/button.c | 8 +++++++- dlls/comctl32/tests/button.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7d48fe7956..1e339ef19c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -91,6 +91,7 @@ typedef struct _BUTTON_INFO { HWND hwnd; HWND parent; + LONG style; LONG state; HFONT font; WCHAR *note; @@ -340,11 +341,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; - infoPtr->parent = GetParent(hWnd); + infoPtr->parent = cs->hwndParent; + infoPtr->style = cs->style; return DefWindowProcW(hWnd, uMsg, wParam, lParam); + } case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0aacfa5888..7bd73de7cb 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1004,6 +1004,7 @@ static void test_button_data(void) { HWND self; HWND parent; + LONG style; }; unsigned int i; HWND parent; @@ -1027,6 +1028,7 @@ static void test_button_data(void) { ok(desc->self == hwnd, "Unexpected 'self' field.\n"); ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + ok(desc->style == (WS_CHILD | BS_NOTIFY | styles[i]), "Unexpected 'style' field.\n"); } DestroyWindow(hwnd); -- 2.16.2

1 0

[PATCH 1/2] comdlg32: Add some traces for custom Places (Coverity)
by Nikolay Sivov 01 Apr '18

01 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 43d5f41180..7bed51556d 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -312,14 +312,21 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) static const WCHAR placeW[] = {'P','l','a','c','e','%','d',0}; WCHAR nameW[8]; DWORD value; + HRESULT hr; WCHAR *str; sprintfW(nameW, placeW, i); if (get_config_key_dword(hkey, nameW, &value)) - SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + { + hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + if (FAILED(hr)) + WARN("Unrecognized special folder %u.\n", value); + } else if (get_config_key_string(hkey, nameW, &str)) { - SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + hr = SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + if (FAILED(hr)) + WARN("Failed to parse custom places location, %s.\n", debugstr_w(str)); heap_free(str); } } -- 2.16.2

1 1

[PATCH] po: Update Ancient Greek translation.
by Zebediah Figura 01 Apr '18

01 Apr '18

--- I'd say I spent far too much time on an April Fools' joke, but then again, who doesn't? po/Makefile.in | 1 + po/grc.po | 1181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1182 insertions(+) create mode 100644 po/grc.po diff --git a/po/Makefile.in b/po/Makefile.in index 430a9a8..5c2bdb0 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -13,6 +13,7 @@ PO_SRCS = \ fa.po \ fi.po \ fr.po \ + grc.po \ he.po \ hi.po \ hr.po \ diff --git a/po/grc.po b/po/grc.po new file mode 100644 index 0000000..8c6e56e --- /dev/null +++ b/po/grc.po @@ -0,0 +1,1181 @@ +# Ancient Greek translations for Wine +# +msgid "" +msgstr "" +"Project-Id-Version: Wine\n" +"Report-Msgid-Bugs-To: https://bugs.winehq.org\n" +"POT-Creation-Date: N/A\n" +"PO-Revision-Date: 2018-04-01 00:00-0500\n" +"Last-Translator: Ζεβεδαῖος\n" +"Language-Team: Ancient Greek\n" +"Language: grc\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: appwiz.rc:58 +msgid "Install/Uninstall" +msgstr "Ἐνιστάναι/Ἀφιστάναι" + +#: appwiz.rc:61 +msgid "" +"To install a new program from a floppy disk, CD-ROM drive, or your hard " +"drive, click Install." +msgstr "" +"Ὥστε νέον πρόγραμμα ἐξ ὑγροῦ ἢ CD-ROM ἢ σκληροῦ κύκλου ἐνιστάναι, θλῖβε" +"Ἐνιστάναι." + +#: appwiz.rc:62 +msgid "&Install..." +msgstr "&Ἐνιστάναι..." + +#: appwiz.rc:65 +msgid "" +"The following software can be automatically removed. To remove a program or " +"to modify its installed components, select it from the list and click Modify/" +"Remove." +msgstr "" +"Τάδε μαλάγματα δύναται αὐτομάτως ἐξαιρεθῆναι. Ὥστε πρόγραμμα ἐξαιρεῖν ἢ" +"ὥστε μετατιθέναι τὰ ἑσταμένα συστατικὰ, ἑλοῦ ἐξ ἀπογραφῆς καὶ θλῖβε" +"Μετατιθέναι/Ἐξαιρεῖν." + +#: appwiz.rc:67 +msgid "&Support Information" +msgstr "&Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:68 regedit.rc:133 regedit.rc:232 +msgid "&Modify..." +msgstr "&Μετατιθέναι..." + +#: appwiz.rc:69 appwiz.rc:45 cryptui.rc:346 msacm32.rc:40 winecfg.rc:200 +#: winecfg.rc:237 wordpad.rc:256 +msgid "&Remove" +msgstr "&Ἐξαιρεῖν" + +#: appwiz.rc:75 +msgid "Support Information" +msgstr "Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:78 avifil32.rc:54 comctl32.rc:65 comctl32.rc:55 comdlg32.rc:232 +#: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:359 comdlg32.rc:398 +#: comdlg32.rc:452 credui.rc:52 cryptui.rc:263 cryptui.rc:275 cryptui.rc:365 +#: dinput.rc:46 ieframe.rc:96 localui.rc:44 localui.rc:57 mpr.rc:49 +#: msacm32.rc:53 mshtml.rc:47 mshtml.rc:57 msvfw32.rc:36 oledlg.rc:62 +#: oledlg.rc:94 serialui.rc:41 setupapi.rc:59 shell32.rc:276 shell32.rc:300 +#: shell32.rc:322 shell32.rc:341 shlwapi.rc:44 twain.rc:32 user32.rc:83 +#: user32.rc:98 wininet.rc:51 wininet.rc:71 winspool.rc:42 net.rc:47 +#: notepad.rc:117 oleview.rc:161 oleview.rc:174 progman.rc:106 progman.rc:124 +#: progman.rc:142 progman.rc:158 progman.rc:180 progman.rc:199 progman.rc:216 +#: regedit.rc:296 regedit.rc:307 regedit.rc:320 regedit.rc:336 regedit.rc:349 +#: regedit.rc:362 taskmgr.rc:442 taskmgr.rc:517 winecfg.rc:214 winecfg.rc:224 +#: wineconsole.rc:135 winefile.rc:128 winefile.rc:151 winefile.rc:181 +#: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 +#: wordpad.rc:244 wordpad.rc:257 +msgid "OK" +msgstr "Εἶεν" + +#: appwiz.rc:79 +msgid "The following information can be used to get technical support for %s:" +msgstr "Ἥδ' ἐπιστήμη δύναται ὠφελεῖν ὥστε τεχνικὸν ἔρεισμα κτᾶσθαι ἐπὶ %s:" + +#: appwiz.rc:80 +msgid "Publisher:" +msgstr "Ἐκφορεύς:" + +#: appwiz.rc:81 winefile.rc:166 +msgid "Version:" +msgstr "Ἑρμηνεία:" + +#: appwiz.rc:82 +msgid "Contact:" +msgstr "Ὁμιλία:" + +#: appwiz.rc:83 +msgid "Support Information:" +msgstr "Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:84 +msgid "Support Telephone:" +msgstr "Ἐρείσματος Τηλέφωνος:" + +#: appwiz.rc:85 +msgid "Readme:" +msgstr "Ἀναγίγνωσκέμε:" + +#: appwiz.rc:86 +msgid "Product Updates:" +msgstr "Ἐργου Καινίσεις:" + +#: appwiz.rc:87 +msgid "Comments:" +msgstr "Σχόλια:" + +#: appwiz.rc:100 +msgid "Wine Gecko Installer" +msgstr "Οἶνου-Γαλεώτου Ἐνστάτης" + +#: appwiz.rc:103 +msgid "" +"Wine could not find a Gecko package which is needed for applications " +"embedding HTML to work correctly. Wine can automatically download and " +"install it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " +"details." +msgstr "" +"Οἶνος οὐκ ἐδύνατο Γαλεώτου φορτίον εὑρεῖν ὃ δεῖ προσθέσεις σὺν HTML ὀρθῶς" +"ἐργάζεσθαι. Οἶνος δύναται αὐτοματῶς κατακτᾶσθαι καὶ ἐνιστάναι ἀντί σου.\n" +"\n" +"Μάθε: χρὴ τὰ φορτία τῆς διανομῆς ἀντὶ τούτων χρῆσθαι. Εἶδε εἰς <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> ἐπ' " +"ἀκριβείᾳ." + +#: appwiz.rc:109 appwiz.rc:124 +msgid "&Install" +msgstr "&Ἐνιστάναι" + +#: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:40 comctl32.rc:66 +#: comctl32.rc:81 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 +#: comdlg32.rc:211 comdlg32.rc:233 comdlg32.rc:263 comdlg32.rc:306 +#: comdlg32.rc:328 comdlg32.rc:348 comdlg32.rc:360 comdlg32.rc:399 +#: comdlg32.rc:453 comdlg32.rc:478 comdlg32.rc:504 comdlg32.rc:527 credui.rc:53 +#: cryptui.rc:264 cryptui.rc:276 cryptui.rc:366 dinput.rc:47 ieframe.rc:97 +#: inetcpl.rc:81 localui.rc:45 localui.rc:58 mpr.rc:50 msacm32.rc:54 +#: mshtml.rc:48 mshtml.rc:58 msvfw32.rc:37 oledlg.rc:63 oledlg.rc:95 +#: serialui.rc:42 setupapi.rc:42 setupapi.rc:60 shell32.rc:277 shell32.rc:301 +#: shell32.rc:312 shell32.rc:342 shlwapi.rc:45 twain.rc:33 user32.rc:84 +#: user32.rc:99 wininet.rc:52 wininet.rc:72 winspool.rc:43 notepad.rc:118 +#: oleview.rc:162 oleview.rc:175 progman.rc:107 progman.rc:125 progman.rc:143 +#: progman.rc:159 progman.rc:181 progman.rc:200 progman.rc:217 regedit.rc:297 +#: regedit.rc:308 regedit.rc:321 regedit.rc:337 regedit.rc:350 regedit.rc:363 +#: taskmgr.rc:443 taskmgr.rc:518 wineboot.rc:34 winecfg.rc:215 winecfg.rc:225 +#: wineconsole.rc:136 winefile.rc:129 winefile.rc:152 winefile.rc:182 +#: winemine.rc:99 wordpad.rc:216 wordpad.rc:227 wordpad.rc:245 wordpad.rc:258 +msgid "Cancel" +msgstr "Καθαιρεῖν" + +#: appwiz.rc:115 +msgid "Wine Mono Installer" +msgstr "Οἴνου-Μονο Ἐνστάτης" + +#: appwiz.rc:118 +msgid "" +"Wine could not find a wine-mono package which is needed for .NET " +"applications to work correctly. Wine can automatically download and install " +"it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " +"details." +msgstr "" +"Οἶνος οὐκ ἐδύνατο οἴνου-μονο φορτίον εὑρεῖν ὃ δεῖ προσθέσεις σὺν .NET ὀρθῶς" +"ἐργάζεσθαι. Οἶνος δύναται αὐτοματῶς κατακτᾶσθαι καὶ ἐνιστάναι ἀντί σου.\n" +"\n" +"Μάθε: χρὴ τὰ φορτία τῆς διανομῆς ἀντὶ τούτων χρῆσθαι. Εἶδε εἰς <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> ἐπ' " +"ἀκριβείᾳ." + +#: appwiz.rc:31 +msgid "Add/Remove Programs" +msgstr "Προγράμματα Προστιθέναι/Ἐξαιρεῖν" + +#: appwiz.rc:32 +msgid "" +"Allows you to install new software, or remove existing software from your " +"computer." +msgstr "" +"Ἐᾷ σε νεὰ μαλάγματα ἐνστάναι ἢ ὑπάρχοντα μαλάγματα ἐξελεῖν ἀπὸ τοῦ λογιστοῦ." + +#: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 +msgid "Applications" +msgstr "Προσθέσεις" + +#: appwiz.rc:35 +msgid "" +"Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " +"entry for this program from the registry?" +msgstr "" +"Ἀδύνατος ἀποστάτην ἐπεξελθεῖν, '%s'. Ἐθέλεις ἁπὸ τὴν ἀναγραφὴν τὴν παραγραφὴν " +"τῆς ἀποστάσεως τούτου προγράμματος ἐξελεῖν;" + +#: appwiz.rc:36 +msgid "Not specified" +msgstr "Οὐκ ὀνομάσας" + +#: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 +msgid "Name" +msgstr "Ὄνομα" + +#: appwiz.rc:39 +msgid "Publisher" +msgstr "Ἐκφορεύς" + +#: appwiz.rc:40 cryptui.rc:54 +msgid "Version" +msgstr "Ἑρμηνεία" + +#: appwiz.rc:41 +msgid "Installation programs" +msgstr "Προγράμματα τῆς ἐνστάσεως" + +#: appwiz.rc:42 +msgid "Programs (*.exe)" +msgstr "Πρόγραμματα (*.exe)" + +#: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 +#: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:42 winhlp32.rc:90 +msgid "All files (*.*)" +msgstr "Πάντα βίβλια (*.*)" + +#: appwiz.rc:46 +msgid "&Modify/Remove" +msgstr "&Μετατιθέναι/Ἐξαιρεῖν" + +#: appwiz.rc:51 +msgid "Downloading..." +msgstr "Κατακτώμενος..." + +#: appwiz.rc:52 +msgid "Installing..." +msgstr "Ἐνιστάς..." + +#: appwiz.rc:53 +msgid "" +"Unexpected checksum of downloaded file. Aborting installation of corrupted " +"file." +msgstr "" +"Ἀπροσδόκητος εὐθυάριθμος τοῦ κατακεκτημένου βίβλιου. Ἀμβλῶν τὴν ἐνστάσιν τοῦ " +"διεφθαρμένου βιβλίου." + +#: avifil32.rc:42 +msgid "Compress options" +msgstr "Συστολῆς αἱρέσεις" + +#: avifil32.rc:45 +msgid "&Choose a stream:" +msgstr "&Αἱροῦ ῥοῦν:" + +#: avifil32.rc:48 wordpad.rc:76 +msgid "&Options..." +msgstr "Αἱρέσεις" + +#: avifil32.rc:49 +msgid "&Interleave every" +msgstr "&Παραλλάσσειν διὰ" + +#: avifil32.rc:51 msvfw32.rc:51 +msgid "frames" +msgstr "κύτεων" + +#: avifil32.rc:52 +msgid "Current format:" +msgstr "Παρὸν σχῆμα:" + +#: avifil32.rc:30 +msgid "Waveform: %s" +msgstr "Κυμομορφή: %s" + +#: avifil32.rc:31 +msgid "Waveform" +msgstr "Κυμομορφή" + +#: avifil32.rc:32 +msgid "All multimedia files" +msgstr "Πάντα πολύπορα βίβλια" + +#: avifil32.rc:34 +msgid "video" +msgstr "θεά" + +#: avifil32.rc:35 +msgid "audio" +msgstr "φωνή" + +#: avifil32.rc:36 +msgid "Wine AVI-default-filehandler" +msgstr "Οἶνος AVI-ἐρῆμος-βιβλιοχρήστης" + +#: avifil32.rc:37 +msgid "uncompressed" +msgstr "ἀσύστολος" + +#: browseui.rc:28 +msgid "Canceling..." +msgstr "Καθαιρῶν..." + +#: comctl32.rc:62 winefile.rc:157 +msgid "Properties for %s" +msgstr "Ἰδια ἐπὶ %s" + +#: comctl32.rc:67 comdlg32.rc:264 +msgid "&Apply" +msgstr "&Προσφέρειν" + +#: comctl32.rc:68 comctl32.rc:82 comdlg32.rc:307 user32.rc:88 +msgid "Help" +msgstr "Ὠφέλεια" + +#: comctl32.rc:75 +msgid "Wizard" +msgstr "Φαρμακεύς" + +#: comctl32.rc:78 +msgid "< &Back" +msgstr "< &Πάλιν" + +#: comctl32.rc:79 +msgid "&Next >" +msgstr "&Ἑξῆς >" + +#: comctl32.rc:80 +msgid "Finish" +msgstr "Τελευτᾶν" + +#: comctl32.rc:91 +msgid "Customize Toolbar" +msgstr "Ἰδιῶσθαι Ὀργανομοχλός" + +#: comctl32.rc:94 comctl32.rc:57 cryptui.rc:351 ieframe.rc:43 oleview.rc:83 +#: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 +msgid "&Close" +msgstr "&Κλείειν" + +#: comctl32.rc:95 +msgid "R&eset" +msgstr "Ἀ&ναλύειν" + +#: comctl32.rc:96 comdlg32.rc:172 comdlg32.rc:194 comdlg32.rc:265 +#: comdlg32.rc:329 comdlg32.rc:349 comdlg32.rc:361 comdlg32.rc:479 +#: comdlg32.rc:505 comdlg32.rc:528 ieframe.rc:58 msacm32.rc:52 oledlg.rc:96 +#: shell32.rc:128 clock.rc:44 notepad.rc:60 notepad.rc:119 oleview.rc:72 +#: progman.rc:55 progman.rc:108 progman.rc:126 progman.rc:144 progman.rc:160 +#: progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 +#: winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 +msgid "&Help" +msgstr "&Ὠφέλεια" + +#: comctl32.rc:97 +msgid "Move &Up" +msgstr "Κινεῖν &Ἄνω" + +#: comctl32.rc:98 +msgid "Move &Down" +msgstr "Κινεῖν &Κάτω" + +#: comctl32.rc:99 +msgid "A&vailable buttons:" +msgstr "Π&ρόχειροι ὀμφαλοί:" + +#: comctl32.rc:101 +msgid "&Add ->" +msgstr "&Προστιθέναι ->" + +#: comctl32.rc:102 +msgid "<- &Remove" +msgstr "<- &Ἐξαιρεῖν" + +#: comctl32.rc:103 +msgid "&Toolbar buttons:" +msgstr "&Ὀμφαλοὶ τοῦ ὀργανομοχλοῦ:" + +#: comctl32.rc:42 +msgid "Separator" +msgstr "Χωριστής" + +#: comctl32.rc:47 progman.rc:81 +msgctxt "hotkey" +msgid "None" +msgstr "Οὐδὲν" + +#: comctl32.rc:52 shell32.rc:309 shlwapi.rc:46 user32.rc:79 +msgid "&Yes" +msgstr "&Ναί" + +#: comctl32.rc:53 shell32.rc:311 shlwapi.rc:47 user32.rc:80 +msgid "&No" +msgstr "&Οὔ" + +#: comctl32.rc:54 user32.rc:82 +msgid "&Retry" +msgstr "Πειρᾶν πάλιν" + +#: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:60 +#: winedbg.rc:75 wordpad.rc:180 +msgid "Close" +msgstr "Κλείειν" + +#: comctl32.rc:36 +msgid "Today:" +msgstr "Σήμερον:" + +#: comctl32.rc:37 +msgid "Go to today" +msgstr "Ἰέναι ἐν σήμερον" + +#: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:459 comdlg32.rc:484 +#: comdlg32.rc:511 shell32.rc:167 oleview.rc:101 +msgid "Open" +msgstr "Ἀνοιγνύναι" + +#: comdlg32.rc:160 comdlg32.rc:182 +msgid "File &Name:" +msgstr "&Ὄνομα τοῦ βιβλίου:" + +#: comdlg32.rc:163 comdlg32.rc:185 +msgid "&Directories:" +msgstr "&Χωρία:" + +#: comdlg32.rc:166 comdlg32.rc:188 +msgid "List Files of &Type:" +msgstr "Ἀριθμεῖν Βίβλια τοῦδε γένους:" + +#: comdlg32.rc:168 comdlg32.rc:190 +msgid "Dri&ves:" +msgstr "Κύκλοι:" + +#: comdlg32.rc:173 comdlg32.rc:195 winefile.rc:173 +msgid "&Read Only" +msgstr "&Μόνον Ἀναγνωστέον" + +#: comdlg32.rc:179 +msgid "Save As..." +msgstr "Σῴζειν ὡς..." + +#: comdlg32.rc:192 comdlg32.rc:145 +msgid "Save As" +msgstr "Σῴζειν ὡς" + +#: comdlg32.rc:201 comdlg32.rc:210 comdlg32.rc:356 comdlg32.rc:54 hhctrl.rc:49 +#: wordpad.rc:173 +msgid "Print" +msgstr "Ἐπισημαίνειν" + +#: comdlg32.rc:204 +msgid "Printer:" +msgstr "Ἐπισημαντήρ:" + +#: comdlg32.rc:206 comdlg32.rc:383 +msgid "Print range" +msgstr "Βολή τοῦ ἐπισημαίνειν" + +#: comdlg32.rc:207 comdlg32.rc:384 regedit.rc:268 +msgid "&All" +msgstr "&Ὅλα" + +#: comdlg32.rc:208 +msgid "S&election" +msgstr "&Αἵρεσις" + +#: comdlg32.rc:209 +msgid "&Pages" +msgstr "&Γραφαί" + +#: comdlg32.rc:212 comdlg32.rc:234 +msgid "&Setup" +msgstr "&Σκεύασμα" + +#: comdlg32.rc:213 +msgid "&From:" +msgstr "&Ἀπό:" + +#: comdlg32.rc:214 +msgid "&To:" +msgstr "&Εἰς:" + +#: comdlg32.rc:215 wineps.rc:42 +msgid "Print &Quality:" +msgstr "&Λεπτότης τοῦ Ἐπισημαίνειν:" + +#: comdlg32.rc:217 +msgid "Print to Fi&le" +msgstr "Εἰς &Βίβλιον Ἐπισημαίνειν" + +#: comdlg32.rc:218 +msgid "Condensed" +msgstr "Σύντομος" + +#: comdlg32.rc:224 comdlg32.rc:395 +msgid "Print Setup" +msgstr "Σκεύασμα τοῦ Ἐπισημαίνειν" + +#: comdlg32.rc:227 comdlg32.rc:363 comdlg32.rc:402 +msgid "Printer" +msgstr "Ἐπισημαντήρ" + +#: comdlg32.rc:228 +msgid "&Default Printer" +msgstr "&Ἐρῆμος ἐπισημαντήρ" + +#: comdlg32.rc:229 +msgid "[none]" +msgstr "[οὐδέν]" + +#: comdlg32.rc:230 +msgid "Specific &Printer" +msgstr "Εἰδικὸς &Ἐπισημαντήρ" + +#: comdlg32.rc:235 comdlg32.rc:421 comdlg32.rc:440 wineps.rc:34 +msgid "Orientation" +msgstr "εὐθυωρία" + +#: comdlg32.rc:236 +msgid "Po&rtrait" +msgstr "Εἰ&κών" + +#: comdlg32.rc:237 comdlg32.rc:442 wineps.rc:37 +msgid "&Landscape" +msgstr "&Χώρα" + +#: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 +msgid "Paper" +msgstr "Βίβλος" + +#: comdlg32.rc:241 +msgid "Si&ze" +msgstr "Μέγε&θος" + +#: comdlg32.rc:242 +msgid "&Source" +msgstr "&Πηγή" + +#: comdlg32.rc:250 wineconsole.rc:85 +msgid "Font" +msgstr "Τύπος" + +#: comdlg32.rc:253 +msgid "&Font:" +msgstr "&Τύπος:" + +#: comdlg32.rc:256 +msgid "Font St&yle:" +msgstr "&Τρόπος τοῦ τύπου:" + +#: comdlg32.rc:259 comdlg32.rc:436 winecfg.rc:294 +msgid "&Size:" +msgstr "&Μέγεθος:" + +#: comdlg32.rc:266 +msgid "Effects" +msgstr "τέχναι" + +#: comdlg32.rc:267 +msgid "Stri&keout" +msgstr "Διαγραφή" + +#: comdlg32.rc:268 +msgid "&Underline" +msgstr "&Ὑπόγραμμα" + +#: comdlg32.rc:269 winecfg.rc:292 +msgid "&Color:" +msgstr "&Χρῶμα:" + +#: comdlg32.rc:272 +msgid "Sample" +msgstr "Δεῖγμα" + +#: comdlg32.rc:274 +msgid "Scr&ipt:" +msgstr "&Γραμματική:" + +#: comdlg32.rc:282 +msgid "Color" +msgstr "Χρῶμα" + +#: comdlg32.rc:285 +msgid "&Basic Colors:" +msgstr "Ἁπλᾶ Χρώματα" + +#: comdlg32.rc:286 +msgid "&Custom Colors:" +msgstr "&Ἴδια Χρώματα:" + +#: comdlg32.rc:287 comdlg32.rc:310 +msgid "Color | Sol&id" +msgstr "Χρῶμα | &Στερεόν" + +#: comdlg32.rc:288 +msgid "&Red:" +msgstr "&Ἐρυθρόν:" + +#: comdlg32.rc:290 +msgid "&Green:" +msgstr "&Χλωρόν:" + +#: comdlg32.rc:292 +msgid "&Blue:" +msgstr "&Κυανόν:" + +#: comdlg32.rc:294 +msgid "&Hue:" +msgstr "&Χρόα:" + +#: comdlg32.rc:296 +msgctxt "Saturation" +msgid "&Sat:" +msgstr "&Μεστότης" + +#: comdlg32.rc:298 +msgctxt "Luminance" +msgid "&Lum:" +msgstr "&Λαμπρότης:" + +#: comdlg32.rc:308 +msgid "&Add to Custom Colors" +msgstr "&Προστιθέναι Ἰδίοις Χρώμασιν" + +#: comdlg32.rc:309 +msgid "&Define Custom Colors >>" +msgstr "&Ὁρίζειν Ἴδια Χρώματα >>" + +#: comdlg32.rc:316 regedit.rc:275 regedit.rc:285 +msgid "Find" +msgstr "Εὑρεῖν" + +#: comdlg32.rc:319 comdlg32.rc:338 +msgid "Fi&nd What:" +msgstr "Τίνα Εὑρεῖν:" + +#: comdlg32.rc:321 comdlg32.rc:342 +msgid "Match &Whole Word Only" +msgstr "&Ὅλον Λόγον Μόνον Ἰσοῦσθαι" + +#: comdlg32.rc:322 comdlg32.rc:343 +msgid "Match &Case" +msgstr "Κᾶσον Ἰσοῦσθαι" + +#: comdlg32.rc:323 joy.rc:71 +msgid "Direction" +msgstr "Τρόπος" + +#: comdlg32.rc:324 view.rc:42 +msgid "&Up" +msgstr "&Ἄνω" + +#: comdlg32.rc:325 view.rc:43 +msgid "&Down" +msgstr "&Κάτω" + +#: comdlg32.rc:327 comdlg32.rc:345 +msgid "&Find Next" +msgstr "&Ἑξῆς εὑρεῖν" + +#: comdlg32.rc:335 +msgid "Replace" +msgstr "Μεταλλάσσειν" + +#: comdlg32.rc:340 +msgid "Re&place With:" +msgstr "Μεταλλάσσειν:" + +#: comdlg32.rc:346 +msgid "&Replace" +msgstr "&Μεταλλάσσειν" + +#: comdlg32.rc:347 +msgid "Replace &All" +msgstr "&Ὅλα Μεταλλάσσειν" + +#: comdlg32.rc:364 +msgid "Print to fi&le" +msgstr "Εἰς &Βίβλιον Ἐπισημαίνειν" + +#: comdlg32.rc:365 comdlg32.rc:403 ieframe.rc:42 shdoclc.rc:61 shell32.rc:108 +#: clock.rc:31 wineconsole.rc:30 +msgid "&Properties" +msgstr "&Ἴδια" + +#: comdlg32.rc:366 comdlg32.rc:404 msacm32.rc:34 winefile.rc:138 +msgid "&Name:" +msgstr "&Ὄνομα:" + +#: comdlg32.rc:368 comdlg32.rc:406 +msgid "Status:" +msgstr "Τάξις:" + +#: comdlg32.rc:370 comdlg32.rc:408 +msgid "Type:" +msgstr "Γένος:" + +#: comdlg32.rc:372 comdlg32.rc:410 +msgid "Where:" +msgstr "Ποῦ:" + +#: comdlg32.rc:374 comdlg32.rc:412 +msgid "Comment:" +msgstr "Σχόλιον:" + +#: comdlg32.rc:377 +msgid "Copies" +msgstr "Μιμήματα" + +#: comdlg32.rc:378 +msgid "Number of &copies:" +msgstr "Ἀριθμὸς &μιμημάτων:" + +#: comdlg32.rc:380 +msgid "C&ollate" +msgstr "Συντάσσειν" + +#: comdlg32.rc:385 +msgid "Pa&ges" +msgstr "Γρα&φαί" + +#: comdlg32.rc:386 +msgid "&Selection" +msgstr "&Αἵρεσις" + +#: comdlg32.rc:389 +msgid "&from:" +msgstr "&ἀπό:" + +#: comdlg32.rc:390 +msgid "&to:" +msgstr "&εἰς:" + +#: comdlg32.rc:416 winecfg.rc:300 +msgid "Si&ze:" +msgstr "Μέγε&θος:" + +#: comdlg32.rc:418 +msgid "&Source:" +msgstr "&Πηγή:" + +#: comdlg32.rc:423 +msgid "P&ortrait" +msgstr "Ε&ἰκών" + +#: comdlg32.rc:424 +msgid "L&andscape" +msgstr "&Χώρα" + +#: comdlg32.rc:429 +msgid "Setup Page" +msgstr "Γραφὴν Σκευάζειν" + +#: comdlg32.rc:438 +msgid "&Tray:" +msgstr "Σανίδιον" + +#: comdlg32.rc:441 wineps.rc:35 +msgid "&Portrait" +msgstr "&Εἰκών" + +#: comdlg32.rc:444 +msgid "L&eft:" +msgstr "Ἀ&ριστερά:" + +#: comdlg32.rc:446 notepad.rc:112 +msgid "&Right:" +msgstr "&Δεξιά:" + +#: comdlg32.rc:448 +msgid "T&op:" +msgstr "&Ἄνω:" + +#: comdlg32.rc:450 notepad.rc:114 +msgid "&Bottom:" +msgstr "&Κάτω:" + +#: comdlg32.rc:454 +msgid "P&rinter..." +msgstr "Εκ&τυπωτής..." + +#: comdlg32.rc:462 comdlg32.rc:487 +msgid "Look &in:" +msgstr "Εἰδεῖν ἐν:" + +#: comdlg32.rc:468 comdlg32.rc:494 +msgid "File &name:" +msgstr "&Ὄνομα βιβλίου:" + +#: comdlg32.rc:472 comdlg32.rc:498 +msgid "Files of &type:" +msgstr "Βίβλια τοῦδε &γένους:" + +#: comdlg32.rc:475 comdlg32.rc:501 +msgid "Open as &read-only" +msgstr "Ἀνοιγνύναι ὡς &μόνον-ἀναγνωστέον" + +#: comdlg32.rc:477 comdlg32.rc:503 comdlg32.rc:521 shdoclc.rc:127 shell32.rc:99 +msgid "&Open" +msgstr "&Ἀνοιγνύναι" + +#: comdlg32.rc:514 +msgid "File name:" +msgstr "Ὄνομα βιβλίου" + +#: comdlg32.rc:517 +msgid "Files of type:" +msgstr "Βιβλία τοῦδε γένους:" + +#: comdlg32.rc:32 +msgid "File not found" +msgstr "Τὸ βιβλίον οὐχ ηὑρέθη" + +#: comdlg32.rc:33 +msgid "Please verify that the correct file name was given" +msgstr "Συγγνώμη, βεβαίου τὸ ὀρθὸν ὄνομα τοῦ βιβλίου δοθῆναι" + +#: comdlg32.rc:34 +msgid "" +"File does not exist.\n" +"Do you want to create file?" +msgstr "" +"Τὸ βιβλίον οὐχ ὑπάρχει.\n" +"Ἐθέλεις γεννᾶν;" + +#: comdlg32.rc:35 +msgid "" +"File already exists.\n" +"Do you want to replace it?" +msgstr "" +"Τὸ βιβλίον ὑπάρχει ἤδη.\n" +"Ἐθέλεις μεταλλάσσειν;" + +#: comdlg32.rc:36 +msgid "Invalid character(s) in path" +msgstr "Ἄκυρα γράμματα ἐν ὁδῷ" + +#: comdlg32.rc:37 +msgid "" +"A filename cannot contain any of the following characters:\n" +" / : < > |" +msgstr "" +"Ὄνομα βιβλίου οὐ δύναται τινας τῶνδε γράμματα ἔχειν:\n" +" / : < > |" + +#: comdlg32.rc:38 +msgid "Path does not exist" +msgstr "Ἡ ὁδὸς οὐχ ὑπάρχει" + +#: comdlg32.rc:39 +msgid "File does not exist" +msgstr "Τὸ βιβλίον οὑχ ὑπάρχει" + +#: comdlg32.rc:40 +msgid "The selection contains a non-folder object" +msgstr "Ἡ αἵρεσις ἀχώριον σκεῦος ἔχει" + +#: comdlg32.rc:45 +msgid "Up One Level" +msgstr "Ἄνω Ἓν Κῶλον" + +#: comdlg32.rc:46 +msgid "Create New Folder" +msgstr "Νεὸν Χωρίον Γεννᾶν" + +#: comdlg32.rc:47 +msgid "List" +msgstr "Ἀπογραφή" + +#: comdlg32.rc:48 cryptui.rc:196 +msgid "Details" +msgstr "Ἀκρίβεια" + +#: comdlg32.rc:49 +msgid "Browse to Desktop" +msgstr "Νέμεσθαι πρὸς Βάθρον" + +#: comdlg32.rc:113 +msgid "Regular" +msgstr "Νόμιμος" + +#: comdlg32.rc:114 +msgid "Bold" +msgstr "Βαρύς" + +#: comdlg32.rc:115 +msgid "Italic" +msgstr "Πλάγιος" + +#: comdlg32.rc:116 +msgid "Bold Italic" +msgstr "Βαρὺς καὶ Πλάγιος" + +#: comdlg32.rc:121 wordpad.rc:125 +msgid "Black" +msgstr "Μέλας" + +#: comdlg32.rc:122 wordpad.rc:126 +msgid "Maroon" +msgstr "" + +#: comdlg32.rc:123 wordpad.rc:127 +msgid "Green" +msgstr "Χλωρός" + +#: comdlg32.rc:124 wordpad.rc:128 +msgid "Olive" +msgstr "Ἐλαία" + +#: comdlg32.rc:125 wordpad.rc:129 +msgid "Navy" +msgstr "" + +#: comdlg32.rc:126 wordpad.rc:130 +msgid "Purple" +msgstr "" + +#: comdlg32.rc:127 wordpad.rc:131 +msgid "Teal" +msgstr "" + +#: comdlg32.rc:128 wordpad.rc:132 +msgid "Gray" +msgstr "Σκαιός" + +#: comdlg32.rc:129 wordpad.rc:133 +msgid "Silver" +msgstr "Ἀργύρεος" + +#: comdlg32.rc:130 wordpad.rc:134 +msgid "Red" +msgstr "Ἐρυθρός" + +#: comdlg32.rc:131 wordpad.rc:135 +msgid "Lime" +msgstr "Φιλύρινος" + +#: comdlg32.rc:132 wordpad.rc:136 +msgid "Yellow" +msgstr "Ξανθός" + +#: comdlg32.rc:133 wordpad.rc:137 +msgid "Blue" +msgstr "Κυανός" + +#: comdlg32.rc:134 wordpad.rc:138 +msgid "Fuchsia" +msgstr "" + +#: comdlg32.rc:135 wordpad.rc:139 +msgid "Aqua" +msgstr "" + +#: comdlg32.rc:136 wordpad.rc:140 +msgid "White" +msgstr "Λευκός" + +#: comdlg32.rc:56 +msgid "Unreadable Entry" +msgstr "" + +#: comdlg32.rc:58 +msgid "" +"This value does not lie within the page range.\n" +"Please enter a value between %1!d! and %2!d!." +msgstr "" +"Οὗτος ἀριθμὸς οὐκ εἴσω τοῦ βολῆς τῶν γραφῶν.\n" +"Συγγνώμη, γράφε ἀριθμὸν μεταξὺ %1!d! καὶ %2!d!." + +#: comdlg32.rc:60 +msgid "The 'from' entry cannot exceed the 'to' entry." +msgstr "Δεῖ τὸν 'ἀπό' ἀριθμὸν οὐ τὸν 'εἰς' ἀριθμὸν ὑπερβάλλειν." + +#: comdlg32.rc:62 +msgid "" +"Margins overlap or fall outside Paper boundaries.\n" +"Please reenter margins." +msgstr "" +"Τὰ χεῖλα ὑπερέχουσιν ἢ ἔξω τῶν ὅρεων τοῦ βίβλου.\n" +"Συγγνώμη, γράφε τὰ χεῖλα πάλιν." + +#: comdlg32.rc:64 +msgid "The 'Number of copies' field cannot be empty." +msgstr "Δεῖ τὸν 'Ἀριθμὸς μιμημάτων' οὐ κοῖλον εἶναι." + +#: comdlg32.rc:66 +msgid "" +"This large number of copies is not supported by your printer.\n" +"Please enter a value between 1 and %d." +msgstr "" +"Οὗτος μέγας ἀριθμὸς οὐκ ἐρείδονται ὑπο σοῦ ἐκτυπωτοῦ.\n" +"Συγγνώμη, γράφε ἀριθμόν τινα μεταξὺ 1 καὶ %d." + +#: comdlg32.rc:67 +msgid "A printer error occurred." +msgstr "Ἁμαρτία τις τοῦ ἐκτυπωτοῦ ἐγένετο." + +#: comdlg32.rc:68 +msgid "No default printer defined." +msgstr "Οὐδεὶς ἐρῆμος ἐκτυπωτὴς ὀρίζεται." + +#: comdlg32.rc:69 +msgid "Cannot find the printer." +msgstr "Οὐ δύναται τὸν ἐκτυπωτὴν εὑρεῖν." + +#: comdlg32.rc:70 progman.rc:76 +msgid "Out of memory." +msgstr "Μνήμης ἐνδέης." + +#: comdlg32.rc:71 +msgid "An error occurred." +msgstr "Ἁμαρτία ἐγένετο." + +#: comdlg32.rc:72 +msgid "Unknown printer driver." +msgstr "Ἀγνὼς ἐκτυπωτοῦ ἡνίοχος." + +#: comdlg32.rc:75 +msgid "" +"Before you can perform printer-related tasks such as page setup or printing " +"a document, you need to install a printer. Please install one and retry." +msgstr "" +"Πρὶν ἐκτυπωτικὰ ἔργα πράσσειν δύνασθαι οἷα σκεύασμα γραφῆς ἢ ἐκτύπωμα " +"γραμματείου, δεῖ σε ἐκτυπωτὴν ἐνστῆσαι. Συγγνώμη, τινὰ ἐνστῆσον καὶ πειρᾶν " +"πάλιν." + +#: comdlg32.rc:141 +msgid "Select a font size between %1!d! and %2!d! points." +msgstr "Ἑλοῦ μέγεθός τις τοῦ τύπου μεταξὺ %1!d! καὶ %2!d! στιγμῶν." + +#: comdlg32.rc:142 ieframe.rc:35 +msgid "&Save" +msgstr "&Σῴζειν" + +#: comdlg32.rc:143 +msgid "Save &in:" +msgstr "Σῴζειν ἐν:" + +#: comdlg32.rc:144 +msgid "Save" +msgstr "Σῴζειν" + +#: comdlg32.rc:146 +msgid "Open File" +msgstr "Ἀνοιγνύναι Βιβλίον" + +#: comdlg32.rc:147 +msgid "Select Folder" +msgstr "Χωρίον Ἑλεῖν" + +#: comdlg32.rc:148 +msgid "Font size has to be a number." +msgstr "Δεῖ τὸν μέγεθον τοῦ τύπος ἀριθμόν τινα εἶναι." + +#: comdlg32.rc:83 oleview.rc:98 +msgid "Ready" +msgstr "Ἑτοῖμος" + +#: comdlg32.rc:84 +msgid "Paused; " +msgstr "Παυθείς, " + +#: comdlg32.rc:85 +msgid "Error; " +msgstr "Ἁμαρτία, " + +#: comdlg32.rc:86 +msgid "Pending deletion; " +msgstr "Μέλλων ἐξαλείψειν, " + +#: comdlg32.rc:87 +msgid "Paper jam; " +msgstr "Πηκτὸς βίβλος, " + +#: comdlg32.rc:88 +msgid "Out of paper; " +msgstr "Βίβλου ἐνδέης, " + +#: comdlg32.rc:89 +msgid "Feed paper manual; " +msgstr "Βόσκε βίβλον χειρὸς, " + +#: comdlg32.rc:90 +msgid "Paper problem; " +msgstr "Πρόβλημα τοῦ βίβλου, " + +#: comdlg32.rc:91 +msgid "Printer offline; " +msgstr "Οἴχεται ἐκτυπωτής, " + +#: comdlg32.rc:92 +msgid "I/O Active; " +msgstr "I/O ἄσχυλος, " + +#: comdlg32.rc:93 +msgid "Busy; " +msgstr "Ἔνεργος, " + +#: comdlg32.rc:94 +msgid "Printing; " +msgstr "Ἐκτυπῶν, " + +#: comdlg32.rc:95 +msgid "Output tray is full; " +msgstr "Μεστὸν σανίδιον τῆς ἐκθέσεως, " + +#: comdlg32.rc:96 +msgid "Not available; " +msgstr "Οὐ πρόχειρος, " + +#: comdlg32.rc:97 +msgid "Waiting; " +msgstr "Μένων, " + +#: comdlg32.rc:98 +msgid "Processing; " +msgstr "Πομπεύων, " + +#: comdlg32.rc:99 +msgid "Initializing; " +msgstr "Παρασκευάζων, " + +#: comdlg32.rc:100 +msgid "Warming up; " +msgstr "Θέρμων, " + +#: comdlg32.rc:101 +msgid "Toner low; " +msgstr "" + +#: comdlg32.rc:102 +msgid "No toner; " +msgstr "" + +#: comdlg32.rc:103 +msgid "Page punt; " +msgstr "" + +#: comdlg32.rc:104 +msgid "Interrupted by user; " +msgstr "" + +#: comdlg32.rc:105 +msgid "Out of memory; " +msgstr "Μνήμης ἐνδέης, " + +#: comdlg32.rc:106 +msgid "The printer door is open; " +msgstr "Ἀνεῳγμένη ὴ θύρα τοῦ ἐκτυπωτοῦ, " + +#: comdlg32.rc:107 +msgid "Print server unknown; " +msgstr "" + +#: comdlg32.rc:108 +msgid "Power save mode; " +msgstr "" + +#: comdlg32.rc:77 +msgid "Default Printer; " +msgstr "Ἐρῆμος ἐκτυπωτής, " + +#: comdlg32.rc:78 +msgid "There are %d documents in the queue" +msgstr "Εἴσιν %δ γραμματεῖα ἐν ἀπογραφῇ" + +#: comdlg32.rc:79 +msgid "Margins [inches]" +msgstr "Χεῖλα [δάκτυλοι]" + +#: comdlg32.rc:80 +msgid "Margins [mm]" +msgstr "Χεῖλα [μμ]" + +#: comdlg32.rc:81 sane.rc:33 +msgctxt "unit: millimeters" +msgid "mm" +msgstr "μμ" -- 2.7.4

2 1

Wine staging 3.5 release
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

Packages have been published to the following repository. https://repos.wine-staging.com/alesliehughes/ Summary of the past few weeks * Rebased to current wine 3.5 (950 patches are applied to wine vanilla) * All existing bcrypt patches accepted upstream (Thank Hans for reviewing) * Removed patches that have already being fixed upstream. * Reviewed and upstreamed patches. Fixes * Corrected 1D Texture support. New Patches * Added support for Implicit MTA. * Added more ntoskrnl stubs for BattlEye service * Added support for fucntion BCryptDeriveKeyPBKDF2 * Added function _crtCaptureCurrentContext for Rise of the Tomb Raider Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Banished, Claybook, Diablo 2 * 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.com Best Regards Alistair.

1 0

[PATCH v2 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 5

[PATCH] testbot: Standardize the packages inheritance and exports.
by Francois Gouget 31 Mar '18

31 Mar '18

Use "our" instead of the antiquated 'use vars'. Use "use Exporter 'import'" as this form avoid exporting the whole Exporter interface from each of our packages. This means we can also drop @ISA in those cases where we don't need to inherit from another package. Also we don't need the Exporter module just to inherit an interface so remove unneeded uses of Exporter. Defining the package inheritance and public interface does not depend on the rest of the package so move these statements first, even before all the other imports. Remove the ampersands from the exported functions names: they are unnecessary (and reportedly slower). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++------ .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 6 +----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++---- testbot/lib/ObjectModel/Collection.pm | 7 ++----- testbot/lib/ObjectModel/DBIBackEnd.pm | 12 +++++------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 8 ++++---- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/Item.pm | 8 +++----- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 9 ++++----- testbot/lib/ObjectModel/PropertyDescriptor.pm | 4 ---- testbot/lib/WineTestBot/Activity.pm | 9 +++------ testbot/lib/WineTestBot/Branches.pm | 16 +++++++--------- testbot/lib/WineTestBot/CGI/PageBase.pm | 9 +++------ testbot/lib/WineTestBot/CGI/Sessions.pm | 18 +++++++----------- testbot/lib/WineTestBot/Engine/Events.pm | 6 ++---- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++++--------- testbot/lib/WineTestBot/Jobs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/LibvirtDomain.pm | 8 +++----- testbot/lib/WineTestBot/Log.pm | 9 +++------ testbot/lib/WineTestBot/Patches.pm | 21 +++++++++------------ testbot/lib/WineTestBot/PendingPatchSets.pm | 20 ++++++++------------ testbot/lib/WineTestBot/PendingPatches.pm | 17 ++++++----------- testbot/lib/WineTestBot/RecordGroups.pm | 18 ++++++------------ testbot/lib/WineTestBot/Records.pm | 18 +++++++----------- testbot/lib/WineTestBot/Roles.pm | 16 +++++----------- testbot/lib/WineTestBot/Steps.pm | 20 ++++++++------------ testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 21 ++++++++------------- testbot/lib/WineTestBot/TestAgent.pm | 17 +++++++---------- testbot/lib/WineTestBot/UserRoles.pm | 17 ++++++----------- testbot/lib/WineTestBot/Users.pm | 21 +++++++++------------ testbot/lib/WineTestBot/Utils.pm | 12 +++++------- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/WineTestBotObjects.pm | 18 +++++++----------- testbot/web/index.pl | 17 +++++++++-------- 41 files changed, 199 insertions(+), 322 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 0bb48cf7c..ae209a4c1 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,8 @@ should provide. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +use Exporter 'import'; +our @EXPORT = qw(AddDBBackEnd GetDBBackEnd RemoveDBBackEnd CloseAllDBBackEnds); sub new($@) { diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 4c3382cb0..766a34230 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -30,13 +30,11 @@ This handles the boolean, a number and string columns. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateBasicPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateBasicPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index ca2c6d3e1..155717aee 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -27,15 +27,12 @@ ObjectModel::CGI::CollectionBlock - Base class for list blocks package ObjectModel::CGI::CollectionBlock; +use Exporter 'import'; +our @EXPORT = qw(new); + use POSIX qw(strftime); use URI::Escape; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); - -@EXPORT = qw(new); sub new($$$@) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 3dd8154a7..ff8247ec9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -28,11 +28,8 @@ ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::CollectionBlock Exporter); sub CallGenerateFormStart($) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index e45b2a4a7..6593afcd2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -27,13 +27,10 @@ ObjectModel::CGI::CollectionPage - Base class for list pages =cut -use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); +use ObjectModel::CGI::CollectionBlockForPage; sub _initialize($$$$) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 1745ec87b..b3861dd2a 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -29,11 +29,8 @@ ObjectModel::CGI::FormPage - Base class for web forms =cut use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 7af04c498..c4f00101b 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -28,10 +28,6 @@ ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut use ObjectModel::CGI::FormPage; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +our @ISA = qw(ObjectModel::CGI::FormPage); 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b44e5b2d3..c208aea31 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -28,13 +28,10 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -use URI::Escape; use ObjectModel::CGI::FormPage; +our @ISA = qw(ObjectModel::CGI::FormPage); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +use URI::Escape; sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index ff7e8487a..b91022832 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -27,13 +27,13 @@ ObjectModel::CGI::Page - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(new SetPageBaseCreator); + use CGI; -use vars qw(@ISA @EXPORT $PageBaseCreator); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(new SetPageBaseCreator); +my $PageBaseCreator; sub new($$$@) { diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 032c7386d..712172bca 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -37,11 +37,8 @@ criteria. =cut -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new &ComputeMasterKey); +use Exporter 'import'; +our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(weaken); use ObjectModel::BackEnd; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0016e19c6..40bfe85f7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -30,16 +30,14 @@ ObjectModel::BackEnd =cut -use DBI; -use Time::Local; - +use Exporter 'import'; use ObjectModel::BackEnd; +our @ISA = qw(ObjectModel::BackEnd); +our @EXPORT = qw(UseDBIBackEnd); -use vars qw(@ISA @EXPORT); +use DBI; +use Time::Local; -require Exporter; -@ISA = qw(ObjectModel::BackEnd Exporter); -@EXPORT = qw(&UseDBIBackEnd); sub GetDb($) { diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index d60fe6395..25144d08c 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -25,11 +25,11 @@ ObjectModel::DetailrefPropertyDescriptor - A reference to a collection of relate =cut -use vars qw(@ISA @EXPORT); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateDetailrefPropertyDescriptor SetDetailrefKeyPrefix); -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3e116ba72..d5850698e 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -30,13 +30,11 @@ new value is allowed. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateEnumPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateEnumPropertyDescriptor); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 201577c98..fb125f015 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,15 +26,13 @@ ObjectModel::Item - Base class for items =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new); =pod diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 21806a269..cba4f9af1 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -25,11 +25,10 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateItemrefPropertyDescriptor); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 583082e81..f13a4b248 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -32,10 +32,6 @@ required or not. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); sub new($$$$$@) { diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index acec6064c..b3e576a19 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,18 +25,15 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Exporter 'import'; +our @EXPORT = qw(GetActivity GetStatistics); + use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&GetActivity &GetStatistics); - sub _UpdateMin($$) { diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index a67832590..a18fafcbd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -27,12 +27,10 @@ WineTestBot::Branch - Describes a Wine branch =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -42,6 +40,7 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } + package WineTestBot::Branches; =head1 NAME @@ -50,14 +49,13 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateBranches); -use vars qw (@ISA @EXPORT); +use ObjectModel::BasicPropertyDescriptor; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateBranches); sub GetDefaultBranch($) { diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fa383c512..67e8fc86f 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -28,6 +28,9 @@ WineTestBot::CGI::PageBase - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(CreatePageBase); + use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; @@ -36,12 +39,6 @@ use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Utils; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&CreatePageBase); - sub new($$$$@) { my $class = shift; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 87fd15fb2..af30fbb85 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -28,12 +28,10 @@ WineTestBot::CGI::Session - A web user's session =cut -use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -require Exporter; -use vars qw(@ISA @EXPORT); -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +use WineTestBot::Utils; sub InitializeNew($$) { @@ -53,19 +51,17 @@ WineTestBot::CGI::Sessions - A Session collection =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSessions DeleteSessions NewSession); + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index c3ebe9baf..677debfbf 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -27,11 +27,9 @@ WineTestBot::Engine::Events - Engine events =cut -use vars qw (@ISA @EXPORT); +use Exporter 'import'; +our @EXPORT = qw(AddEvent DeleteEvent EventScheduled RunEvents); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddEvent &DeleteEvent &EventScheduled &RunEvents); my %Events; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c277f7aa9..ddb14d2fa 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -27,18 +27,16 @@ WineTestBot::Engine::Notify - Engine notification =cut +use Exporter 'import'; +our $RunningInEngine; +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel + JobRestart RescheduleJobs VMStatusChange + WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); +our @EXPORT_OK = qw($RunningInEngine); + use Socket; use WineTestBot::Config; -use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange - &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); -@EXPORT_OK = qw($RunningInEngine); - sub SendCmdReceiveReply($) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f810b4f12..29f7860cb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -51,17 +51,15 @@ A Job is composed of multiple WineTestBot::Step objects. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Path; use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -391,11 +389,15 @@ those that are yet to be run. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; @@ -404,12 +406,6 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 37d519ce9..843579361 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -32,14 +32,12 @@ technologies. =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Sys::Virt; use Image::Magick; -use vars qw (@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); my $HackVirtURI = 1; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 65782c514..36efb48a2 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -25,14 +25,11 @@ WineTestBot::Log - Logging =cut -use WineTestBot::Config; -use WineTestBot::Utils; +use Exporter 'import'; +our @EXPORT = qw(LogMsg OpenLog Time Elapsed PrettyElapsed); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 7906f1cb6..e4b9b0089 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,9 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Encode qw/decode/; use File::Basename; @@ -42,13 +45,8 @@ use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; use WineTestBot::Engine::Notify; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -357,6 +355,7 @@ sub GetEMailRecipient($) return BuildEMailRecipient($self->FromEMail, $self->FromName); } + package WineTestBot::Patches; =head1 NAME @@ -365,15 +364,13 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePatches); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePatches); +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Config; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index d51652221..88dc73677 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -38,15 +38,13 @@ The WineTestBot::PendingPatchSet class is where this tracking is implemented. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use WineTestBot::Config; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); =pod =over 12 @@ -153,19 +151,17 @@ WineTestBot::PendingPatchSets - A collection of WineTestBot::PendingPatchSet obj =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatchSets); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatchSets); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 281db60ef..4de599dac 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -32,11 +32,8 @@ identifying the patch series it belongs to. =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::PendingPatches; @@ -46,16 +43,14 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatches); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatches); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 1e5dbbdd4..9f0f52036 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -31,12 +31,8 @@ or the state of the TestBot at at a given time. =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -56,17 +52,15 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 98d5ee7d9..990ae421e 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -38,13 +38,11 @@ only limited by the amount of data dumped into the Records table. =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -62,15 +60,13 @@ WineTestBot::Records - A collection of WineTestBot::Record objects =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecords); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecords); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index a617ac14e..45f370f1d 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -30,11 +30,7 @@ A Role is a class of users and defines what they can do. =cut use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +our @ISA = qw(WineTestBot::WineTestBotItem); package WineTestBot::Roles; @@ -45,14 +41,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRoles); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRoles); +use ObjectModel::BasicPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ef2b3872b..237347347 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -36,16 +36,14 @@ or to reset their PreviousNo fields beforehand. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Copy; use File::Path; use WineTestBot::Config; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -184,17 +182,15 @@ WineTestBot::Steps - A collection of Job Steps =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSteps); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSteps); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 3610492ba..9dec8060a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -26,13 +26,11 @@ WineTestBot::StepTask - Merged Step + Task object =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub GetStepDir($) { @@ -82,6 +80,7 @@ sub GetTitle($) return $Title; } + package WineTestBot::StepsTasks; =head1 NAME @@ -97,18 +96,16 @@ a specific database table. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateStepsTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateStepsTasks); sub _initialize($$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f16dfe201..4473df217 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -33,18 +33,15 @@ virtual machine that the test must be performed in. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -203,17 +200,15 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateTasks); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2f7ec4def..8957b9f82 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -22,11 +22,8 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); +use Exporter 'import'; +our @EXPORT_OK = qw(new); my $BLOCK_SIZE = 65536; @@ -1097,7 +1094,7 @@ sub GetVersion($) return $self->{agentversion}; } -$SENDFILE_EXE = 1; +our $SENDFILE_EXE = 1; sub _SendStringOrFile($$$$$$) { @@ -1173,10 +1170,10 @@ sub GetFileToString($$) return $self->_GetStringOrFile($ServerPathName, undef, undef); } -$RUN_DNT = 1; -$RUN_DNTRUNC_OUT = 2; -$RUN_DNTRUNC_ERR = 4; -$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; +our $RUN_DNT = 1; +our $RUN_DNTRUNC_OUT = 2; +our $RUN_DNTRUNC_ERR = 4; +our $RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 972bdc0e9..585537ae8 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -26,11 +26,8 @@ WineTestBot::UserRole - A UserRole item =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::UserRoles; @@ -40,16 +37,14 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUserRoles); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUserRoles); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 178b377b9..4752006ab 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -26,18 +26,16 @@ WineTestBot::User - A User =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Digest::SHA qw(sha1_hex); use URI::Escape; use WineTestBot::Config; use WineTestBot::Roles; use WineTestBot::UserRoles; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -287,6 +285,7 @@ sub HasRole($$) return defined($self->Roles->GetItem($RoleName)); } + package WineTestBot::Users; =head1 NAME @@ -295,19 +294,17 @@ WineTestBot::Users - A collection of WineTestBot::User objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); + use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; -use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 63b906242..81a2eda39 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -25,17 +25,15 @@ WineTestBot::Utils - Utility functions =cut +use Exporter 'import'; +our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString + OpenNewFile CreateNewFile CreateNewLink CreateNewDir + DurationToString BuildEMailRecipient); + use Fcntl; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e74640bf2..b6305e83e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,9 @@ are undergoing maintenance. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Basename; use ObjectModel::BackEnd; @@ -150,12 +153,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -637,15 +635,13 @@ role or status. =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateVMs); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateVMs); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index 20ff6b1e3..bc34b74c8 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -25,14 +25,12 @@ WineTestBot::WineTestBotItem - Base item class for WineTestBot =cut -use ObjectModel::BackEnd; use ObjectModel::Item; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::Item); -use vars qw (@ISA @EXPORT); +use ObjectModel::BackEnd; +use WineTestBot::Config; -require Exporter; -@ISA = qw(ObjectModel::Item Exporter); sub GetBackEnd($) { @@ -49,15 +47,13 @@ WineTestBot::WineTestBotCollection - Base collection class for WineTestBot =cut +use ObjectModel::Collection; +our @ISA = qw(ObjectModel::Collection); + use ObjectModel::BackEnd; -use ObjectModel::Item; +use WineTestBot::Item; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::Collection Exporter); - sub GetBackEnd($) { #my ($self) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 427d7f6b9..72bd307d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -21,13 +21,12 @@ use strict; package JobStatusBlock; -use URI::Escape; use ObjectModel::CGI::CollectionBlock; -use WineTestBot::Branches; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); +use URI::Escape; +use WineTestBot::Branches; -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -140,13 +139,12 @@ sub GenerateDataCell($$$$) } } + package VMStatusBlock; use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); - -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -183,16 +181,18 @@ sub GetDetailsPage($) return undef; } + package StatusPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::VMs; -@StatusPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -303,6 +303,7 @@ EOF print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; -- 2.16.2

1 0

[PATCH 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 4

[PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type
by Adeniyi Mayokun 31 Mar '18

31 Mar '18

>From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001 From: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> Date: Wed, 14 Mar 2018 06:55:15 +0100 Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type Signed-off-by: Adeniyi Mayokun <adeniyimayokun17@gmail> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c00d715f4..247d383ff7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type); -- 2.14.1

3 2

WineConf and sound recording
by M. GOUJON 31 Mar '18

31 Mar '18

Hi everyone, Recordings of previous wine confs have been somewhat disappointing especially the sound part: microphone buggy, people asking question too far from the micro... Some of you are native English speakers, others not and understanding everyone quickly becomes a challenge (and you ends up with a headache). May I suggest you to buy some clip-on microphones ? Handheld ones ones are heavy and people always forget to speak in it. If you wanna invest some bucks, digital recorders are the best option. If needed, I can donate those missing bucks.

4 4

[PATCH] ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled.
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/om.c | 26 ++++++++++++++++ dlls/ntdll/tests/exception.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index febe5bd81d..0b56251348 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "ntdll_misc.h" #include "wine/server.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -377,6 +378,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { @@ -390,6 +397,25 @@ NTSTATUS close_handle( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + EXCEPTION_RECORD record; + record.ExceptionCode = EXCEPTION_INVALID_HANDLE; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 0; + RtlRaiseException( &record ); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY + } + return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b3592e6e1e..64a23110a5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtClose)(HANDLE); #if defined(__x86_64__) typedef struct @@ -1091,6 +1092,16 @@ static void test_debugger(void) if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 11 || stage == 12 || stage == 13) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + EXCEPTION_INVALID_HANDLE); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + + if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2895,6 +2906,54 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + + invalid_handle_exceptions++; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_closehandle(DWORD numexc, HANDLE handle) +{ + PVOID vectored_handler; + NTSTATUS status; + DWORD res; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + invalid_handle_exceptions = 0; + res = CloseHandle(handle); + + ok(!res || (is_wow64 && res), "CloseHandle(%p) unexpectedly succeeded\n", handle); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d\n", + GetLastError(), ERROR_INVALID_HANDLE); + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + invalid_handle_exceptions = 0; + status = pNtClose(handle); + ok(status == STATUS_INVALID_HANDLE || (is_wow64 && status == 0), "NtClose(%p) returned status %08x\n", handle, status); + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2949,6 +3008,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); @@ -2997,6 +3057,7 @@ START_TEST(exception) if (pRtlRaiseException) { test_stage = 1; + run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); @@ -3004,6 +3065,7 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; test_outputdebugstring(0, FALSE); test_stage = 4; @@ -3020,6 +3082,12 @@ START_TEST(exception) test_breakpoint(0); test_stage = 10; test_breakpoint(1); + test_stage = 11; + test_closehandle(0, (HANDLE)0xdeadbeef); + test_stage = 12; + test_closehandle(1, (HANDLE)0xdeadbeef); + test_stage = 13; + test_closehandle(0, 0); /* Special case. */ } else skip( "RtlRaiseException not found\n" ); @@ -3036,6 +3104,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -3043,7 +3112,6 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); - #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddFunctionTable" ); @@ -3069,6 +3137,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_virtual_unwind(); test___C_specific_handler(); -- 2.16.2

1 0

[PATCH 2/2] kernel32: improve stub for SetThreadUILanguage a bit
by Louis Lenders 31 Mar '18

31 Mar '18

For https://bugs.winehq.org/show_bug.cgi?id=44469

1 0

[PATCH 1/2] Add simple test for SetThreadUILanguage
by Louis Lenders 31 Mar '18

31 Mar '18

1 0

[PATCH] shell32: Fix destination buffer size (Coverity)
by Nikolay Sivov 31 Mar '18

31 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 525eba4544..e78e8f8c56 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1082,8 +1082,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT2), info->szOtherStuff ); GetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), template, ARRAY_SIZE(template) ); - MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, - version, ARRAY_SIZE(template) ); + MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, version, ARRAY_SIZE(version) ); sprintfW( buffer, template, version ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); -- 2.16.2

1 0

DXTn/S3TC in d3dx9
by Henri Verbeet 31 Mar '18

31 Mar '18

On 30 March 2018 at 04:34, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > I would like to hear about support for DTXn. (as long as someone > records it for me). Since the patent on this format has expired. > It's now officially part of mesa(17?), and since a large number of bugs > depend on this missing feature. How could we get implement > it quickly? > I don't know about a large number of bugs depending on d3dx9 DXTn support, but it would probably be good to resolve the issue regardless. You'll probably want to look into libsquish [1], either making sure the upstream API is suitable for usage in d3dx9, or perhaps just importing it into the Wine tree. [1] http://sjbrown.co.uk/2006/01/19/dxt-compression-techniques/

3 4

Re: WineConf and sound recording
by M. GOUJON 30 Mar '18

30 Mar '18

On 03/30/2018 08:46 PM, M. GOUJON wrote: > On 03/30/2018 05:04 PM, Henri Verbeet wrote: >> On 29 March 2018 at 20:30, M. GOUJON <ale.goujon(a)gmail.com> wrote: >>> Recordings of previous wine confs have been somewhat disappointing >>> especially the sound part: microphone buggy, people asking question >>> too far >>> from the micro... >>> Some of you are native English speakers, others not and understanding >>> everyone quickly becomes a challenge (and you ends up with a headache). >>> >>> May I suggest you to buy some clip-on microphones ? >>> Handheld ones ones are heavy and people always forget to speak in it. >>> If you wanna invest some bucks, digital recorders are the best option. >>> >>> If needed, I can donate those missing bucks. >>> >> I happen to agree that the recordings have room for improvement, and >> would like to see us do better there. Budget is definitely a >> consideration though, and as much as I would like to promise that this >> year will be better, I don't think I can. I'm curious though, did you >> have specific equipment in mind that you'd like to recommend? > Yes, it's called H4N from Zoom. I know it's a bit expensive but it's > an excellent recorder. > Just put it on the table in front of the audience, adjust the micro > level, start recording in WAVE and forget it. > As I said, we can find an arrangement like me buying the recorder and > you buying the SD card. Forgot to CC'ing wine-devel. On 03/30/2018 10:54 PM, Stefan Dösinger wrote: > I'm afraid the answer is no. The main requirement for the recording is > that it does not interrupt the conference itself. We had clip on > microphones and mics to pass around at FOSDEM and on the WineConf 2007 > in Zurich, and they always cause problems. Batteries are empty, clips > coming off, passing around the microphone slows down conversations, etc. Handy recorders are designed to be put somewhere and record for several hours. If you want to avoid batteries issue, you can still buy the power adaptor. As long as you don't play drum with your fingers on the table the recorder is on, sound quality is quite good. > What would be highly welcome is help with editing the videos afterwards. If someone has the patience to create subtitles for everything we'd make life easier for non-native speakers. I'm not used to do that but yeah, I guess I can also contribute this way.

1 0

[PATCH v2] dsound/tests: Call interface methods properly.
by Zebediah Figura 30 Mar '18

30 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 30 +++++++++--------------------- dlls/dsound/tests/ds3d8.c | 11 ----------- dlls/dsound/tests/dsound.c | 5 +++-- dlls/dsound/tests/dsound8.c | 34 +++++++++++++++++----------------- dlls/dsound/tests/duplex.c | 6 +++--- 6 files changed, 34 insertions(+), 56 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4eae28b..a23d1eb 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -114,7 +114,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IUnknown) " "failed: %08x\n", rc); if (rc==DS_OK) - IDirectSoundCapture_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IDirectSoundCapture, (LPVOID*)&dsc); @@ -162,7 +162,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ZeroMemory(&dsccaps, sizeof(dsccaps)); /* DSOUND: Error: Invalid caps buffer */ - rc=IDirectSound_GetCaps(dsco, &dsccaps); + rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_GetCaps() " "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 6c12f71..d4356c2 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -535,18 +535,6 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, - &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); @@ -1193,6 +1181,8 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; LPDIRECTSOUNDBUFFER temp_buffer=NULL; + IKsPropertySet *propset; + rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " @@ -1231,11 +1221,10 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) temp_buffer = NULL; rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, - (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); } /* Testing the reference counting */ @@ -1244,12 +1233,11 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } - temp_buffer = NULL; - rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + propset = NULL; + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 25eb010..00340af 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -371,17 +371,6 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1ccb8f9..07c8908 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -30,6 +30,7 @@ #include "wine/test.h" #include "mmsystem.h" +#define COBJMACROS #include "dsound.h" #include "dsconf.h" #include "initguid.h" @@ -61,7 +62,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -337,7 +338,7 @@ static HRESULT test_dsound(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; - rc=IDirectSound_QueryInterface(secondary, &IID_IDirectSound3DBuffer, + rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL,"IDirectSound_QueryInterface() " "failed: %08x\n",rc); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 53b3d47..a6e3f12 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -72,7 +72,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, rc=IDirectSound8_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound8_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -353,7 +353,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; LPDIRECTSOUNDBUFFER8 buffer8; - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL, @@ -363,7 +363,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " "should have 2\n",ref); } - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); if (rc==DS_OK && buffer8!=NULL) { @@ -645,7 +645,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -756,7 +756,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) || rc == DS_OK, /* driver dependent? */ @@ -779,7 +779,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample; wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -791,7 +791,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -804,7 +804,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -815,7 +815,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -826,7 +826,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -837,7 +837,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -850,7 +850,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); ++wfxe.Samples.wValidBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -862,7 +862,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) --wfxe.Samples.wValidBitsPerSample; wfxe.Samples.wValidBitsPerSample = 0; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -873,7 +873,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -1162,7 +1162,7 @@ static void test_COM(void) ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectSound_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk8); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); @@ -1194,7 +1194,7 @@ static void test_effects(void) rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); if (rc!=DS_OK) { - IDirectSound_Release(dso); + IDirectSound8_Release(dso); return; } @@ -1372,7 +1372,7 @@ static void test_effects(void) IDirectSoundBuffer_Release(primary); } - while (IDirectSound_Release(dso)); + while (IDirectSound8_Release(dso)); } START_TEST(dsound8) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ecdebdc..b770515 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -49,7 +49,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) { - ref=IDirectSoundFullDuplex_Release(unknown); + ref = IUnknown_Release(unknown); ok(ref==0, "IDirectSoundFullDuplex_Release() has %d references, " "should have 0\n", ref); } @@ -94,7 +94,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, "failed: %08x\n",rc); if (rc==DS_OK) { ok(dsfdo==dsfd, "different interfaces\n"); - ref=IDirectSound8_Release(dsfd); + ref=IDirectSoundFullDuplex_Release(dsfd); ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, should have 1\n", ref); } @@ -319,7 +319,7 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - hr = IDirectSoundCapture_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); -- 2.7.4

2 1

[PATCH 2/2] windowscodecs: Cache component info objects.
by Jacek Caban 30 Mar '18

30 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 47 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 3 +++ dlls/windowscodecs/tests/info.c | 31 +++++++++++++++++++--- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 78 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] windowscodecs: Use common base structure for component info implementations.
by Jacek Caban 30 Mar '18

30 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 148 ++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 77 deletions(-)

2 3

[PATCH 5/5] wined3d: Add some traces to arbfp_blitter_blit().
by Henri Verbeet 30 Mar '18

30 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c0a46f779a..d29264d6714 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7814,12 +7814,24 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), color_key, debug_d3dtexturefiltertype(filter)); + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, &dst_texture->resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); } arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Add some traces to fbo_blitter_blit().
by Henri Verbeet 30 Mar '18

30 Mar '18

For easier debugging. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d7aaf24110..ee325a1af5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2192,6 +2192,12 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit struct wined3d_device *device; struct wined3d_blitter *next; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); + src_resource = &src_texture->resource; dst_resource = &dst_texture->resource; @@ -2208,9 +2214,15 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!fbo_blitter_supported(blit_op, context->gl_info, src_resource, src_location, dst_resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); } if (blit_op == WINED3D_BLIT_OP_COLOR_BLIT) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset().
by Henri Verbeet 30 Mar '18

30 Mar '18

Since we use this for ddraw now. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b17effefd5a..adaa4f10000 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,7 +4778,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); - if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) + if (swapchain_desc->backbuffer_usage && swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD -- 2.11.0

1 0

[PATCH 2/5] wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm().
by Henri Verbeet 30 Mar '18

30 Mar '18

Perhaps this made sense when we still pretended to support P8 textures, but currently this should never get used, and certainly not in the colour-keying path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 7 +----- dlls/wined3d/utils.c | 57 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b94b07ba6e4..8d7aaf24110 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2091,9 +2091,6 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); if (conversion) { - /* This code is only entered for color keying fixups */ - struct wined3d_palette *palette = NULL; - wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -2105,10 +2102,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re context_release(context); return FALSE; } - if (texture->swapchain && texture->swapchain->palette) - palette = texture->swapchain->palette; conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, - width, height, palette, &texture->async.gl_color_key); + width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95f26a36939..8b2019d671d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -895,45 +895,9 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, - BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) -{ - const BYTE *src_row; - unsigned int x, y; - DWORD *dst_row; - - if (!palette) - { - /* FIXME: This should probably use the system palette. */ - FIXME("P8 surface loaded without a palette.\n"); - - for (y = 0; y < height; ++y) - { - memset(&dst[dst_pitch * y], 0, width * 4); - } - - return; - } - - for (y = 0; y < height; ++y) - { - src_row = &src[src_pitch * y]; - dst_row = (DWORD *)&dst[dst_pitch * y]; - for (x = 0; x < width; ++x) - { - BYTE src_color = src_row[x]; - dst_row[x] = 0xff000000 - | (palette->colors[src_color].rgbRed << 16) - | (palette->colors[src_color].rgbGreen << 8) - | palette->colors[src_color].rgbBlue; - } - } -} - static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -956,7 +920,7 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -979,7 +943,7 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const BYTE *src_row; unsigned int x, y; @@ -1000,7 +964,7 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1023,7 +987,7 @@ static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1062,10 +1026,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers {WINED3DFMT_B8G8R8X8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key }}, {WINED3DFMT_B8G8R8A8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key }}, }; - static const struct wined3d_color_key_conversion convert_p8 = - { - WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm - }; if (need_alpha_ck && (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY)) { @@ -1078,13 +1038,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(format->id)); } - /* FIXME: This should check if the blitter backend can do P8 conversion, - * instead of checking for ARB_fragment_program. */ - if (format->id == WINED3DFMT_P8_UINT - && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM] - && texture->swapchain && texture == texture->swapchain->front_buffer)) - return &convert_p8; - return NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 080134d0340..a25d984a4f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4214,8 +4214,8 @@ struct wined3d_rational struct wined3d_color_key_conversion { enum wined3d_format_id dst_format; - void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, - unsigned int height, const struct wined3d_palette *palette, const struct wined3d_color_key *color_key); + void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, + unsigned int width, unsigned int height, const struct wined3d_color_key *colour_key); }; struct wined3d_format -- 2.11.0

1 0

[PATCH 1/5] ddraw: Copy the entire front-buffer surface after a buffer swap.
by Henri Verbeet 30 Mar '18

30 Mar '18

wined3d_swapchain_present() will invalidate everything except WINED3D_LOCATION_DRAWABLE, which means a partial blit to the front-buffer afterwards might need to read the drawable contents back to the texture. For P8 front-buffers that's problematic, because the original palette indices are lost. We may want to improve the wined3d side of this to avoid reading back the drawable, but copying the entire surface in ddraw in this situation seems like a good idea regardless. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a9632de502f..b8552af2871 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -59,6 +59,7 @@ struct FvfToDecl #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 #define DDRAW_SCL_RECURSIVE 0x00000020 +#define DDRAW_SWAPPED 0x00000040 #define DDRAW_STRIDE_ALIGNMENT 8 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2d200493c95..cb837b1f903 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -50,6 +50,12 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; + if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + { + surface->ddraw->flags &= ~DDRAW_SWAPPED; + rect = NULL; + } + if (!rect) { SetRect(&r, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); @@ -78,7 +84,10 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) + { hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + surface->ddraw->flags |= DDRAW_SWAPPED; + } return hr; } -- 2.11.0

1 0

[RFC 0/2] Cleaning up DXTn support patches in Staging
by Kyle Devir 30 Mar '18

30 Mar '18

This is my first stab at helping a FOSS project, in a middle of a rough spot in life, so please don't mind my awkward wordiness. :) libtxc_dxtn has now been depreciated due to the functionality now being merged into Mesa a while ago now. Some distros, including Arch, have completely removed the library in response to this. Given that adding proper DXTn support without libtxc_dxtn feels out of my league for now, I thought I might as well clean up the useless code, and additionally add the needed code from Mesa in a file called dxtn.h. In Mesa, the code is also in header file, used by internal Mesa functions. I'm not sure just yet how to turn this into something that just uses GL more directly, but that'll be a something I'll be starting to research soon. For now, this minor cleanup might be suitable for Staging, but eventually, I plan to get this into mainline, which will need to be a lot tidier than it currently is. Throw any suggestions at me that you think will help. :) Kyle Devir (2): wined3d: implement DXTn compression support d3dx9_36: implement DXTn compression support dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/surface.c | 100 ++++- dlls/d3dx9_36/tests/surface.c | 8 +- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/dxtn.c | 435 +++++++++++++++++++ dlls/wined3d/dxtn.h | 987 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 153 +++++++ dlls/wined3d/wined3d.spec | 7 + dlls/wined3d/wined3d_main.c | 1 + include/wine/wined3d.h | 13 + 29 files changed, 1714 insertions(+), 31 deletions(-) create mode 100644 dlls/wined3d/dxtn.c create mode 100644 dlls/wined3d/dxtn.h -- 2.16.3

1 2

[PATCH] comctl32/button: Improve button data layout compatibility
by Nikolay Sivov 30 Mar '18

30 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44857 dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 8b5a654efc..7d48fe7956 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,6 +90,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); typedef struct _BUTTON_INFO { HWND hwnd; + HWND parent; LONG state; HFONT font; WCHAR *note; @@ -342,6 +343,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; + infoPtr->parent = GetParent(hWnd); return DefWindowProcW(hWnd, uMsg, wParam, lParam); case WM_NCDESTROY: diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 4c07f0adcd..0aacfa5888 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -979,6 +979,62 @@ static void register_parent_class(void) RegisterClassA(&cls); } +static void test_button_data(void) +{ + static const DWORD styles[] = + { + BS_PUSHBUTTON, + BS_DEFPUSHBUTTON, + BS_CHECKBOX, + BS_AUTOCHECKBOX, + BS_RADIOBUTTON, + BS_3STATE, + BS_AUTO3STATE, + BS_GROUPBOX, + BS_USERBUTTON, + BS_AUTORADIOBUTTON, + BS_OWNERDRAW, + BS_SPLITBUTTON, + BS_DEFSPLITBUTTON, + BS_COMMANDLINK, + BS_DEFCOMMANDLINK, + }; + + struct button_desc + { + HWND self; + HWND parent; + }; + unsigned int i; + HWND parent; + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + struct button_desc *desc; + HWND hwnd; + + hwnd = create_button(styles[i], parent); + ok(hwnd != NULL, "Failed to create a button.\n"); + + desc = (void *)GetWindowLongPtrA(hwnd, 0); + ok(desc != NULL, "Expected window data.\n"); + + if (desc) + { + ok(desc->self == hwnd, "Unexpected 'self' field.\n"); + ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + } + + DestroyWindow(hwnd); + } + + DestroyWindow(parent); +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -995,6 +1051,7 @@ START_TEST(button) test_button_class(); test_button_messages(); test_note(); + test_button_data(); unload_v6_module(ctx_cookie, hCtx); } -- 2.16.2

1 0

[PATCH] testbot/web: Grab the last 12 hours of activity by default.
by Francois Gouget 30 Mar '18

30 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 12 hours is probably sufficient in most cases and the rest of the time a higher value can be specified. testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 96a1ef0a7..08e0291ae 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -33,7 +33,7 @@ use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); -my $HOURS_DEFAULT = 24; +my $HOURS_DEFAULT = 12; sub _initialize($$$) { -- 2.16.2

1 0

[PATCH] testbot: Fix Collection::IsEmpty() on perl 5.20.
by Francois Gouget 30 Mar '18

30 Mar '18

Although scalar(%hash) is 0 when the hash is empty, the rest of the time it is not a number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a57a32942..032c7386d 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,8 +420,9 @@ sub IsEmpty($) } # Even though scalar(hash) does not return the number of items in Perl 5.20 - # it returns 0 for an empty hash. - return !$self->{Items} || scalar(%{$self->{Items}}) == 0; + # (and cannot generally be compared to numbers), it evaluates to true for + # all hashes except empty ones. + return !$self->{Items} || !%{$self->{Items}}; } sub CombineKey($@) -- 2.16.2

1 0

[PATCH 8/8] mstask: Implement setting and getting a task comment using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 64 +++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0b984d84..5a4023694c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -62,7 +61,6 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); - HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -247,56 +245,45 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetComment( - ITask* iface, - LPCWSTR pwszComment) +static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_comment; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); + TRACE("(%p, %s)\n", iface, debugstr_w(comment)); - /* Empty comment */ - if (pwszComment[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = NULL; - return S_OK; - } + if (!comment || !comment[0]) + comment = NULL; - /* Set to pwszComment */ - n = (lstrlenW(pwszComment) + 1); - tmp_comment = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_comment) - return E_OUTOFMEMORY; - lstrcpyW(tmp_comment, pwszComment); - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = tmp_comment; - - return S_OK; + return IExecAction_put_Id(This->action, (BSTR)comment); } -static HRESULT WINAPI MSTASK_ITask_GetComment( - ITask* iface, - LPWSTR *ppwszComment) +static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR id; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszComment); + TRACE("(%p, %p)\n", iface, comment); - n = This->comment ? lstrlenW(This->comment) + 1 : 1; - *ppwszComment = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszComment) - return E_OUTOFMEMORY; + hr = IExecAction_get_Id(This->action, &id); + if (hr != S_OK) return hr; - if (!This->comment) - *ppwszComment[0] = 0; + len = id ? lstrlenW(id) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!id) + *comment[0] = 0; + else + lstrcpyW(*comment, id); + hr = S_OK; + } else - lstrcpyW(*ppwszComment, This->comment); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(id); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetCreator( @@ -798,7 +785,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->comment = NULL; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ -- 2.16.2

1 0

[PATCH 7/8] mstask: Implement setting and getting working directory using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1aba435efd..ed0b984d84 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -533,20 +533,45 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( - ITask* iface, - LPCWSTR pwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory(ITask * iface, LPCWSTR workdir) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszWorkingDirectory)); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %s)\n", iface, debugstr_w(workdir)); + + if (!workdir || !workdir[0]) + workdir = NULL; + + return IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); } -static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory( - ITask* iface, - LPWSTR *ppwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory(ITask *iface, LPWSTR *workdir) { - FIXME("(%p, %p): stub\n", iface, ppwszWorkingDirectory); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR dir; + DWORD len; + + TRACE("(%p, %p)\n", iface, workdir); + + hr = IExecAction_get_WorkingDirectory(This->action, &dir); + if (hr != S_OK) return hr; + + len = dir ? lstrlenW(dir) + 1 : 1; + *workdir = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*workdir) + { + if (!dir) + *workdir[0] = 0; + else + lstrcpyW(*workdir, dir); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(dir); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetPriority( -- 2.16.2

1 0

[PATCH 6/8] mstask: Implement setting and getting parameters using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 62 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1a079cc8c5..1aba435efd 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; @@ -64,7 +63,6 @@ static void TaskDestructor(TaskImpl *This) HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); - HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -493,55 +491,46 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appn return hr; } -static HRESULT WINAPI MSTASK_ITask_SetParameters( - ITask* iface, - LPCWSTR pwszParameters) +static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_parameters; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); + TRACE("(%p, %s)\n", iface, debugstr_w(params)); /* Empty parameter list */ - if (pwszParameters[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = NULL; - return S_OK; - } + if (!params || !params[0]) + params = NULL; - /* Set to pwszParameters */ - n = (lstrlenW(pwszParameters) + 1); - tmp_parameters = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_parameters) - return E_OUTOFMEMORY; - lstrcpyW(tmp_parameters, pwszParameters); - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = tmp_parameters; - return S_OK; + return IExecAction_put_Arguments(This->action, (BSTR)params); } -static HRESULT WINAPI MSTASK_ITask_GetParameters( - ITask* iface, - LPWSTR *ppwszParameters) +static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR args; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszParameters); + TRACE("(%p, %p)\n", iface, params); - n = This->parameters ? lstrlenW(This->parameters) + 1 : 1; - *ppwszParameters = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszParameters) - return E_OUTOFMEMORY; + hr = IExecAction_get_Arguments(This->action, &args); + if (hr != S_OK) return hr; - if (!This->parameters) - *ppwszParameters[0] = 0; + len = args ? lstrlenW(args) + 1 : 1; + *params = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*params) + { + if (!args) + *params[0] = 0; + else + lstrcpyW(*params, args); + hr = S_OK; + } else - lstrcpyW(*ppwszParameters, This->parameters); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(args); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( @@ -784,7 +773,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->parameters = NULL; This->comment = NULL; This->accountName = NULL; -- 2.16.2

1 0

[PATCH 5/8] mstask: Implement setting and getting an application name using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 110 +++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 97d778255f..1a079cc8c5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -37,8 +37,8 @@ typedef struct IPersistFile IPersistFile_iface; LONG ref; ITaskDefinition *task; + IExecAction *action; LPWSTR task_name; - LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; @@ -58,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + if (This->action) + IExecAction_Release(This->action); ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); @@ -427,73 +429,68 @@ static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( return S_OK; } -static HRESULT WINAPI MSTASK_ITask_SetApplicationName( - ITask* iface, - LPCWSTR pwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_name; + DWORD len; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); + TRACE("(%p, %s)\n", iface, debugstr_w(appname)); /* Empty application name */ - if (pwszApplicationName[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = NULL; - return S_OK; - } + if (!appname || !appname[0]) + return IExecAction_put_Path(This->action, NULL); /* Attempt to set pwszApplicationName to a path resolved application name */ - n = SearchPathW(NULL, pwszApplicationName, NULL, 0, NULL, NULL); - if (n) + len = SearchPathW(NULL, appname, NULL, 0, NULL, NULL); + if (len) { - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + LPWSTR tmp_name; + HRESULT hr; + + tmp_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; - n = SearchPathW(NULL, pwszApplicationName, NULL, n, tmp_name, NULL); - if (n) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; - } + len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); + if (len) + hr = IExecAction_put_Path(This->action, tmp_name); else - HeapFree(GetProcessHeap(), 0, tmp_name); + hr = HRESULT_FROM_WIN32(GetLastError()); + + HeapFree(GetProcessHeap(), 0, tmp_name); + return hr; } - /* If unable to path resolve name, simply set to pwszApplicationName */ - n = (lstrlenW(pwszApplicationName) + 1); - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_name) - return E_OUTOFMEMORY; - lstrcpyW(tmp_name, pwszApplicationName); - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; + /* If unable to path resolve name, simply set to appname */ + return IExecAction_put_Path(This->action, (BSTR)appname); } -static HRESULT WINAPI MSTASK_ITask_GetApplicationName( - ITask* iface, - LPWSTR *ppwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR path; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszApplicationName); + TRACE("(%p, %p)\n", iface, appname); - n = This->applicationName ? lstrlenW(This->applicationName) + 1 : 1; - *ppwszApplicationName = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszApplicationName) - return E_OUTOFMEMORY; + hr = IExecAction_get_Path(This->action, &path); + if (hr != S_OK) return hr; - if (!This->applicationName) - *ppwszApplicationName[0] = 0; + len = path ? lstrlenW(path) + 1 : 1; + *appname = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*appname) + { + if (!path) + *appname[0] = 0; + else + lstrcpyW(*appname, path); + hr = S_OK; + } else - lstrcpyW(*ppwszApplicationName, This->applicationName); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(path); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetParameters( @@ -767,6 +764,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t { TaskImpl *This; ITaskDefinition *taskdef; + IActionCollection *actions; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); @@ -786,7 +784,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; This->accountName = NULL; @@ -794,7 +791,20 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *task = &This->ITask_iface; - InterlockedIncrement(&dll_ref); - return S_OK; + hr = ITaskDefinition_get_Actions(This->task, &actions); + if (hr == S_OK) + { + hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, (IAction **)&This->action); + IActionCollection_Release(actions); + if (hr == S_OK) + { + *task = &This->ITask_iface; + InterlockedIncrement(&dll_ref); + return S_OK; + } + } + + ITaskDefinition_Release(This->task); + ITask_Release(&This->ITask_iface); + return hr; } -- 2.16.2

1 0

[PATCH 4/8] mstask/tests: Add some tests for task file storage.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 151 +++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 31d284819c..e1e76e8c9c 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -2,6 +2,7 @@ * Test suite for TaskScheduler interface * * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -231,9 +232,159 @@ if (0) { /* crashes on win2k */ ITaskScheduler_Release(scheduler); } +static BOOL file_exists(const WCHAR *name) +{ + return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; +} + +static void test_save_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + ok(file_exists(curfile), "curfile should exist\n"); + + hr = IPersistFile_Save(pfile, curfile, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, curfile, TRUE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "Save error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); +} + +static WCHAR *get_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); +todo_wine + ok(hr == S_OK, "GetCurFile error %#x\n", hr); +todo_wine + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); + + return curfile; +} + +static void test_task_storage(void) +{ + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k',0 }; + static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','.','j','o','b',0 }; + WCHAR task_full_name[MAX_PATH]; + HRESULT hr; + ITaskScheduler *scheduler; + ITask *task, *task2; + WCHAR *curfile, *curfile2; + + GetWindowsDirectoryW(task_full_name, MAX_PATH); + lstrcatW(task_full_name, Task1_job); + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#x\n", hr); + return; + } + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); + ok(!file_exists(curfile), "curfile should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(task2 != task, "tasks should not be equal\n"); + + curfile2 = get_task_curfile(task); + ok(!file_exists(curfile2), "curfile2 should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile); + CoTaskMemFree(curfile2); + + task2 = (ITask *)0xdeadbeef; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + ITask_Release(task); + + task = NULL; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); +todo_wine + ok(hr == S_OK, "Activate error %#x\n", hr); +todo_wine + ok(task != NULL, "task should not be set to NULL\n"); + if (task == NULL) goto fail; + + curfile2 = get_task_curfile(task); + ok(file_exists(curfile2), "curfile2 should exist\n"); + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile2); + + test_save_task_curfile(task); + + DeleteFileW(curfile); + CoTaskMemFree(curfile); + + ITask_Release(task); +fail: + ITaskScheduler_Release(scheduler); +} + START_TEST(task_scheduler) { CoInitialize(NULL); + + test_task_storage(); test_NewWorkItem(); test_Activate(); test_GetTargetComputer(); -- 2.16.2

1 0

[PATCH 3/8] mstask: Improve stubs for ITask::GetTaskFlags and ITask::GetFlags.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 18 ++++++++---------- dlls/mstask/tests/task.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e77a959e0f..97d778255f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -373,12 +373,11 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( @@ -588,12 +587,11 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTaskFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetTaskFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index d139207039..956aa0bbd0 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -496,6 +496,39 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } +static void test_GetFlags(void) +{ + BOOL setup; + HRESULT hr; + DWORD flags; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + if (0) /* crashes under Windows */ + hr = ITask_GetFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(test_task, &flags); + ok(hr == S_OK, "GetFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + if (0) /* crashes under Windows */ + hr = ITask_GetTaskFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetTaskFlags(test_task, &flags); + ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + cleanup_task(); +} + START_TEST(task) { CoInitialize(NULL); @@ -505,5 +538,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); + test_GetFlags(); CoUninitialize(); } -- 2.16.2

1 0

[PATCH 2/8] mstask: Switch to using ITaskDefinition instead of IRegisteredTask.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Testing under Windows revealed that task definition on disk should be created only when IPersistFile::Save() is called, and until that ITask should stay as a task description in memory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_private.h | 15 ++++++++++++++- dlls/mstask/task.c | 37 ++++++++++--------------------------- dlls/mstask/task_scheduler.c | 14 +------------- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 511019ded6..038c6c84c1 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -19,6 +19,9 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ +#include "wine/heap.h" +#include "wine/unicode.h" + extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; @@ -26,6 +29,16 @@ extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; -extern HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) DECLSPEC_HIDDEN; + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 095431cb04..e77a959e0f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -36,7 +36,8 @@ typedef struct ITask ITask_iface; IPersistFile IPersistFile_iface; LONG ref; - IRegisteredTask *regtask; + ITaskDefinition *task; + LPWSTR task_name; LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; @@ -57,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + ITaskDefinition_Release(This->task); + HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); @@ -762,49 +765,29 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) +HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) { TaskImpl *This; - IRegisteredTask *regtask; - BSTR bstr; + ITaskDefinition *taskdef; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); - bstr = SysAllocString(task_name); - if (!bstr) return E_OUTOFMEMORY; - - if (create) - { - static const char xml_tmplate[] = - "<?xml version=\"1.0\"?>\n" - "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" - "</Task>\n"; - WCHAR xmlW[sizeof(xml_tmplate)]; - VARIANT v_null; - - MultiByteToWideChar(CP_ACP, 0, xml_tmplate, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); - - V_VT(&v_null) = VT_NULL; - hr = ITaskFolder_RegisterTask(folder, bstr, xmlW, TASK_CREATE | TASK_UPDATE, - v_null, v_null, TASK_LOGON_NONE, v_null, &regtask); - } - else - hr = ITaskFolder_GetTask(folder, bstr, &regtask); - SysFreeString(bstr); + hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - IRegisteredTask_Release(regtask); + ITaskDefinition_Release(taskdef); return E_OUTOFMEMORY; } This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; - This->regtask = regtask; + This->task = taskdef; + This->task_name = heap_strdupW(task_name); This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index e9b8727633..6e17a57908 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -37,7 +37,6 @@ typedef struct ITaskScheduler ITaskScheduler_iface; LONG ref; ITaskService *service; - ITaskFolder *root; } TaskSchedulerImpl; typedef struct @@ -59,7 +58,6 @@ static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); - ITaskFolder_Release(This->root); ITaskService_Release(This->service); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); @@ -308,7 +306,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( if (!IsEqualGUID(riid, &IID_ITask)) return E_NOINTERFACE; - return TaskConstructor(This->root, task_name, (ITask **)task, TRUE); + return TaskConstructor(This->service, task_name, (ITask **)task); } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( @@ -349,7 +347,6 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) { TaskSchedulerImpl *This; ITaskService *service; - ITaskFolder *root; VARIANT v_null; HRESULT hr; @@ -366,24 +363,15 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } - hr = ITaskService_GetFolder(service, NULL, &root); - if (hr != S_OK) - { - ITaskService_Release(service); - return hr; - } - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - ITaskFolder_Release(root); ITaskService_Release(service); return E_OUTOFMEMORY; } This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; This->service = service; - This->root = root; This->ref = 1; *ppObj = &This->ITaskScheduler_iface; -- 2.16.2

1 0

[PATCH 1/8] taskschd: Implement ExecAction::put_Id and ExecAction::get_Id.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 27 +++++++++++++++++++++++---- dlls/taskschd/tests/scheduler.c | 24 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1b6a7015ee..19546c0d71 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1679,6 +1679,7 @@ typedef struct WCHAR *path; WCHAR *directory; WCHAR *args; + WCHAR *id; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1703,6 +1704,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) heap_free(action->path); heap_free(action->directory); heap_free(action->args); + heap_free(action->id); heap_free(action); } @@ -1759,14 +1761,30 @@ static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFII static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) { - FIXME("%p,%p: stub\n", iface, id); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, id); + + if (!id) return E_POINTER; + + if (!action->id) *id = NULL; + else if (!(*id = SysAllocString(action->id))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) { - FIXME("%p,%s: stub\n", iface, debugstr_w(id)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(id)); + + if (id && !(str = heap_strdupW((id)))) return E_OUTOFMEMORY; + heap_free(action->id); + action->id = str; + + return S_OK; } static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) @@ -1896,6 +1914,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->path = NULL; action->directory = NULL; action->args = NULL; + action->id = NULL; *obj = &action->IExecAction_iface; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 80bc1c9034..c0f691a53d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1306,12 +1306,13 @@ static void create_action(ITaskDefinition *taskdef) static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; + static WCHAR comment[] = { 'c','o','m','m','e','n','t',0 }; HRESULT hr; IActionCollection *actions; IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; - BSTR path; + BSTR path, str; hr = ITaskDefinition_get_Actions(taskdef, NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -1384,7 +1385,7 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "put_Arguments error %#x\n", hr); hr = IExecAction_put_Arguments(exec_action, args); - ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); path = NULL; hr = IExecAction_get_Arguments(exec_action, &path); @@ -1393,6 +1394,25 @@ static void create_action(ITaskDefinition *taskdef) ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); + + str = (BSTR)0xdeadbeef; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str == NULL, "id should be NULL\n"); + + hr = IExecAction_put_Id(exec_action, NULL); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + hr = IExecAction_put_Id(exec_action, comment); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + str = NULL; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str != NULL, "should not be NULL\n"); + ok(!lstrcmpW(str, comment), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions); -- 2.16.2

1 0

[PATCH 01/11] winex11: Print error message when libvulkan cannot be loaded.
by Józef Kucia 30 Mar '18

30 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c633579286eb..58ba5d71b1ef 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -134,7 +134,11 @@ static BOOL wine_vk_init(void) if (init_done) return (vulkan_handle != NULL); init_done = TRUE; - if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) return FALSE; + if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) + { + ERR("Failed to load " SONAME_LIBVULKAN); + return FALSE; + } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkAcquireNextImageKHR) -- 2.16.1

2 21

[PATCH 1/4] wusa: create temp directories for installer
by Vijay Kiran Kamuju 29 Mar '18

29 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/wusa/main.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 5 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index aa7a38fe178..77dd46d8bd4 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1,5 +1,7 @@ /* * Copyright 2012 Austin English + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,17 +19,176 @@ */ #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wusa); +struct installer_tempdir { + struct list entry; + WCHAR *path; +}; + +struct installer_state { + BOOL norestart; + BOOL quiet; + struct list tempdirs; +}; + +static const WCHAR *path_combine(const WCHAR *path, const WCHAR *filename) +{ + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *result; + DWORD length; + + if (!path || !filename) + return NULL; + length = strlenW(path) + strlenW(filename) + 2; + if (!(result = heap_alloc(length * sizeof(WCHAR)))) + return NULL; + + strcpyW(result,path); + if (result[0] && result[strlenW(result) - 1] != '\\') + strcatW(result, backslashW); + strcatW(result,filename); + return result; +} + +static BOOL delete_directory(const WCHAR *path) +{ + static const WCHAR starW[] = {'*',0}; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WIN32_FIND_DATAW data; + WCHAR *full_path; + HANDLE search; + + if (!(full_path = (WCHAR *)path_combine(path, starW))) + return FALSE; + search = FindFirstFileW(full_path, &data); + heap_free(full_path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (!strcmpW(data.cFileName, dotW)) + continue; + if (!strcmpW(data.cFileName, dotdotW)) + continue; + if (!(full_path = (WCHAR *)path_combine(path, data.cFileName))) + continue; + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + delete_directory(full_path); + else + DeleteFileW(full_path); + heap_free(full_path); + } while (FindNextFileW(search, &data)); + FindClose(search); + } + + return RemoveDirectoryW(full_path); +} + +static const WCHAR *create_temp_directory(struct installer_state *state) +{ + static const WCHAR msuW[] = {'m','s','u',0}; + static UINT id; + struct installer_tempdir *entry; + WCHAR tmp[MAX_PATH]; + + if (!GetTempPathW(sizeof(tmp)/sizeof(WCHAR), tmp)) + return NULL; + if (!(entry = heap_alloc(sizeof(*entry)))) + return NULL; + if (!(entry->path = heap_alloc((MAX_PATH+20)*sizeof(WCHAR)))) + { + heap_free(entry); + return NULL; + } + + for(;;) + { + if (!GetTempFileNameW(tmp, msuW, ++id, entry->path)) + { + heap_free(entry->path); + heap_free(entry); + return NULL; + } + if (CreateDirectoryW(entry->path, NULL)) + break; + } + + list_add_tail(&state->tempdirs, &entry->entry); + return entry->path; +} + +static void installer_cleanup(struct installer_state *state) +{ + struct installer_tempdir *tempdir, *tempdir2; + + LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) + { + list_remove(&tempdir->entry); + delete_directory(tempdir->path); + heap_free(tempdir->path); + heap_free(tempdir); + } +} + +static BOOL install_msu(WCHAR *filename, struct installer_state *state) +{ + const WCHAR *temp_path; + + list_init(&state->tempdirs); + + WINE_TRACE("Processing msu file %s\n", wine_dbgstr_w(filename)); + if (!(temp_path = create_temp_directory(state))) + return FALSE; + + installer_cleanup(state); + return TRUE; +} + int wmain(int argc, WCHAR *argv[]) { + static const WCHAR norestartW[] = {'/','n','o','r','e','s','t','a','r','t',0}; + static const WCHAR quietW[] = {'/','q','u','i','e','t',0}; + struct installer_state state; + WCHAR *filename = NULL; int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (TRACE_ON(wusa)) + { + WINE_TRACE("Command line :"); + for (i = 0; i < argc; i++) + WINE_TRACE(" %s", wine_dbgstr_w(argv[i])); + WINE_TRACE("\n"); + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + if (!strcmpW(argv[i], norestartW)) + state.norestart = TRUE; + else if (!strcmpW(argv[i], quietW)) + state.quiet = TRUE; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + else if (!filename) + filename = argv[i]; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + + if (!filename) + { + WINE_FIXME("Missing filename argument\n"); + return 1; + } - return 0; + return !install_msu(filename, &state); } -- 2.16.2

3 6

[PATCH 5/5] wsdapi/tests: Add test for Hello message Any body element.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel