April 2015 - Wine-commits - list.winehq.org

Erich E. Hoover : kernel32: Invalid console handles for new processes are 0, not INVALID_HANDLE_VALUE.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 4b559f02dd6ad61287fb79547c93105aaa2f7525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b559f02dd6ad61287fb79547… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sat Jan 3 23:37:42 2015 -0700 kernel32: Invalid console handles for new processes are 0, not INVALID_HANDLE_VALUE. --- dlls/kernel32/console.c | 15 ++++++------ dlls/kernel32/environ.c | 12 +++++----- dlls/kernel32/tests/process.c | 53 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 303b638..14f1189 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3119,24 +3119,25 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) } /* convert value from server: - * + 0 => INVALID_HANDLE_VALUE + * + INVALID_HANDLE_VALUE => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE + * + 0 => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE * + console handle needs to be mapped */ - if (!params->hStdInput) - params->hStdInput = INVALID_HANDLE_VALUE; + if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) + params->hStdInput = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); } - if (!params->hStdOutput) - params->hStdOutput = INVALID_HANDLE_VALUE; + if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) + params->hStdOutput = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) params->hStdOutput = console_handle_map(params->hStdOutput); - if (!params->hStdError) - params->hStdError = INVALID_HANDLE_VALUE; + if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) + params->hStdError = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) params->hStdError = console_handle_map(params->hStdError); diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 57b6a1f..99bf706 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -464,9 +464,9 @@ void ENV_CopyStartupInformation(void) startup_infoW.wShowWindow = rupp->wShowWindow; startup_infoW.cbReserved2 = rupp->RuntimeInfo.MaximumLength; startup_infoW.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoW.hStdInput = rupp->hStdInput; - startup_infoW.hStdOutput = rupp->hStdOutput; - startup_infoW.hStdError = rupp->hStdError; + startup_infoW.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoW.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoW.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; startup_infoA.cb = sizeof(startup_infoA); startup_infoA.lpReserved = NULL; @@ -485,9 +485,9 @@ void ENV_CopyStartupInformation(void) startup_infoA.wShowWindow = rupp->wShowWindow; startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoA.hStdInput = rupp->hStdInput; - startup_infoA.hStdOutput = rupp->hStdOutput; - startup_infoA.hStdError = rupp->hStdError; + startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; RtlReleasePebLock(); } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c63d6b1..4f7c58d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -57,7 +57,7 @@ wine_dbgstr_w(expected), wine_dbgstr_w(value)); \ } while (0) -static HINSTANCE hkernel32; +static HINSTANCE hkernel32, hntdll; static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pGetSystemRegistryQuota)(PDWORD, PDWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -66,6 +66,7 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); @@ -208,6 +209,8 @@ static BOOL init(void) if ((p = strrchr(exename, '/')) != NULL) exename = p + 1; hkernel32 = GetModuleHandleA("kernel32"); + hntdll = GetModuleHandleA("ntdll.dll"); + pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); @@ -216,6 +219,7 @@ static BOOL init(void) pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); + pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); @@ -291,6 +295,16 @@ static void doChild(const char* file, const char* option) siA.dwFlags, siA.wShowWindow, (DWORD_PTR)siA.hStdInput, (DWORD_PTR)siA.hStdOutput, (DWORD_PTR)siA.hStdError); + if (pNtCurrentTeb) + { + RTL_USER_PROCESS_PARAMETERS *params = pNtCurrentTeb()->Peb->ProcessParameters; + + /* check the console handles in the TEB */ + childPrintf(hFile, "[TEB]\nhStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", + (DWORD_PTR)params->hStdInput, (DWORD_PTR)params->hStdOutput, + (DWORD_PTR)params->hStdError); + } + /* since GetStartupInfoW is only implemented in win2k, * zero out before calling so we can notice the difference */ @@ -2642,6 +2656,42 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } +void test_StartupNoConsole(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + DWORD code; + + if (!pNtCurrentTeb) + { + win_skip( "NtCurrentTeb not supported\n" ); + return; + } + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info), "CreateProcess\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ok(GetExitCodeProcess(info.hProcess, &code), "Getting exit code\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdError", (UINT)INVALID_HANDLE_VALUE); + okChildInt("TEB", "hStdInput", 0); + okChildInt("TEB", "hStdOutput", 0); + okChildInt("TEB", "hStdError", 0); + release_memory(); + DeleteFileA(resfile); +#endif +} + START_TEST(process) { HANDLE job; @@ -2690,6 +2740,7 @@ START_TEST(process) test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle(); + test_StartupNoConsole(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Matteo Bruni : ddraw/tests: Fix ddraw2 test_lighting() cleanup code.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 969e72396dfe5217c8a984b8dfa22a027f90aad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969e72396dfe5217c8a984b8d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 22 19:30:32 2015 +0200 ddraw/tests: Fix ddraw2 test_lighting() cleanup code. --- dlls/ddraw/tests/ddraw2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6ed3b0e..11248f5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6639,6 +6639,8 @@ static void test_lighting(void) ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); } + hr = IDirect3DViewport2_DeleteLight(viewport, light); + ok(SUCCEEDED(hr), "Failed to remove a light from the viewport, hr %#x.\n", hr); IDirect3DLight_Release(light); destroy_material(material); destroy_viewport(device, viewport); @@ -6646,7 +6648,7 @@ static void test_lighting(void) refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D2_Release(d3d); - IDirectDraw2_Release(ddraw); + refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Ddraw object has %u references left.\n", refcount); DestroyWindow(window); }

1 0

Matteo Bruni : ddraw: Cleanup d3d_light_SetLight() a bit.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: e7548fc4215214693027c8d817e6915d0230cd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7548fc4215214693027c8d81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 22 19:30:33 2015 +0200 ddraw: Cleanup d3d_light_SetLight() a bit. --- dlls/ddraw/light.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c632c32..a3660a3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -163,12 +163,9 @@ static HRESULT WINAPI d3d_light_Initialize(IDirect3DLight *iface, IDirect3D *d3d return D3D_OK; } -static const float zero_value[] = { - 0.0, 0.0, 0.0, 0.0 -}; - static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { + static const D3DCOLORVALUE zero_value = {{0.0f}, {0.0f}, {0.0f}, {0.0f}}; struct d3d_light *light = impl_from_IDirect3DLight(iface); DWORD flags = data->dwSize >= sizeof(D3DLIGHT2) ? ((D3DLIGHT2 *)data)->dwFlags : D3DLIGHT_ACTIVE; D3DLIGHT7 *light7 = &light->light7; @@ -184,10 +181,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (!(flags & D3DLIGHT_NO_SPECULAR)) - light7->dcvSpecular = data->dcvColor; + if (flags & D3DLIGHT_NO_SPECULAR) + light7->dcvSpecular = zero_value; else - light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; + light7->dcvSpecular = data->dcvColor; light7->dcvAmbient = data->dcvColor; light7->dvPosition = data->dvPosition; light7->dvDirection = data->dvDirection; @@ -200,7 +197,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, data, sizeof(D3DLIGHT)); + memcpy(&light->light, data, sizeof(*data)); if (!(light->light.dwFlags & D3DLIGHT_ACTIVE) && flags & D3DLIGHT_ACTIVE) light_activate(light); else if (light->light.dwFlags & D3DLIGHT_ACTIVE && !(flags & D3DLIGHT_ACTIVE))

1 0

Nikolay Sivov : msdmo: Remove a helper only used once.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 65bf359d6faed5e75a0806223780bd50a6094789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bf359d6faed5e75a0806223… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 23:06:35 2015 +0300 msdmo: Remove a helper only used once. --- dlls/msdmo/dmoreg.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 4bd7ab4..f42bc56 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -19,6 +19,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -359,23 +361,6 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) } /************************************************************************** -* IEnumDMOImpl_Destructor -*/ -static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This) -{ - TRACE("%p\n", This); - - if (This->hkey) - RegCloseKey(This->hkey); - - HeapFree(GetProcessHeap(), 0, This->pInTypes); - HeapFree(GetProcessHeap(), 0, This->pOutTypes); - - return TRUE; -} - - -/************************************************************************** * IEnumDMO_Constructor */ static HRESULT IEnumDMO_Constructor( @@ -450,10 +435,7 @@ static HRESULT IEnumDMO_Constructor( lerr: if (FAILED(hr)) - { - IEnumDMOImpl_Destructor(lpedmo); - HeapFree(GetProcessHeap(), 0, lpedmo); - } + IEnumDMO_Release(&lpedmo->IEnumDMO_iface); else { TRACE("returning %p\n", lpedmo); @@ -489,7 +471,7 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface(IEnumDMO* iface, REFIID riid, vo IsEqualIID(riid, &IID_IUnknown)) { *ppvObj = iface; - IEnumDMO_fnAddRef(iface); + IEnumDMO_AddRef(iface); } return *ppvObj ? S_OK : E_NOINTERFACE; @@ -507,8 +489,11 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) if (!refCount) { - IEnumDMOImpl_Destructor(This); - HeapFree(GetProcessHeap(),0,This); + if (This->hkey) + RegCloseKey(This->hkey); + HeapFree(GetProcessHeap(), 0, This->pInTypes); + HeapFree(GetProcessHeap(), 0, This->pOutTypes); + HeapFree(GetProcessHeap(), 0, This); } return refCount; }

1 0

Nikolay Sivov : msdmo: Next() method should use CoTaskMemAlloc() for returned names.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 3f7c47118a9f3adc14c28fe728de576e51a76d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7c47118a9f3adc14c28fe72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 09:40:15 2015 +0300 msdmo: Next() method should use CoTaskMemAlloc() for returned names. --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f42bc56..f9bf9b3 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -636,7 +636,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); if (ERROR_SUCCESS == ret) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); + Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) strcpyW(Names[count], szValue); }

1 0

Aric Stewart : server: Do not replace focus and active windows with NULL on thread_attach_input.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: bed7e69a14489998ef943b76022fd9520018cdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed7e69a14489998ef943b760… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 20 13:40:26 2015 -0500 server: Do not replace focus and active windows with NULL on thread_attach_input. --- dlls/user32/tests/input.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/msg.c | 3 +- server/queue.c | 6 +++ 3 files changed, 140 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index faf9c8c..78f4d8b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2025,6 +2025,138 @@ static void test_Input_mouse(void) DestroyWindow(button_win); } + +static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +struct wnd_event +{ + HWND hwnd; + HANDLE start_event; + BOOL setWindows; +}; + +static DWORD WINAPI thread_proc(void *param) +{ + MSG msg; + struct wnd_event *wnd_event = param; + + wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); + + if (wnd_event->setWindows) + { + SetFocus(wnd_event->hwnd); + SetActiveWindow(wnd_event->hwnd); + } + + SetEvent(wnd_event->start_event); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + return 0; +} + +static void test_attach_input(void) +{ + HANDLE hThread; + HWND ourWnd; + DWORD ret, tid; + struct wnd_event wnd_event; + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = MsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestWindowClass"; + if(!RegisterClassA(&cls)) return; + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.setWindows = FALSE; + if (!wnd_event.start_event) + { + win_skip("skipping interthread message test under win9x\n"); + return; + } + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ourWnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok(ourWnd!= 0, "failed to create ourWnd window\n"); + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.setWindows = TRUE; + if (!wnd_event.start_event) + { + win_skip("skipping interthread message test under win9x\n"); + return; + } + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ourWnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(ourWnd!= 0, "failed to create ourWnd window\n"); + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); + ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); +} + START_TEST(input) { init_function_pointers(); @@ -2046,6 +2178,7 @@ START_TEST(input) test_get_async_key_state(); test_keyboard_layout_name(); test_key_names(); + test_attach_input(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 50e1e2b..5ef3840 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14238,10 +14238,9 @@ todo_wine ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); ok(ret, "AttachThreadInput error %d\n", GetLastError()); -todo_wine { ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); -} + flush_events(); flush_sequence(); diff --git a/server/queue.c b/server/queue.c index 912df3a..3c1368a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1063,6 +1063,12 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) } release_object( desktop ); + if (thread_from->queue) + { + if (!input->focus) input->focus = thread_from->queue->input->focus; + if (!input->active) input->active = thread_from->queue->input->active; + } + ret = assign_thread_input( thread_from, input ); if (ret) memset( input->keystate, 0, sizeof(input->keystate) ); release_object( input );

1 0

Francois Gouget : ws2_32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 9561037fe0065f6f7878681ca1d925dd81a373c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9561037fe0065f6f7878681ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 23 10:34:59 2015 +0200 ws2_32/tests: Add a trailing '\n' to an ok() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index aa06a08..f31539f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4300,7 +4300,7 @@ static void test_getsockname(void) strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); trace("testing bind on interface %s\n", ipstr); ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, - "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr)); + "address does not match: %s != %s\n", ipstr, inet_ntoa(sa_set.sin_addr)); closesocket(sock); }

1 0

Francois Gouget : wined3d: Make glsl_vertex_pipe_view() static.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 6f6dfe91d6d04e9a0ba11070b1def3e583ff84c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6dfe91d6d04e9a0ba11070b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 23 10:35:04 2015 +0200 wined3d: Make glsl_vertex_pipe_view() static. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 655bb33..f1bf0a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7195,7 +7195,7 @@ static void glsl_vertex_pipe_world(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; } -void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_light_info *light = NULL;

1 0

Jianqiu Zhang : ntdll/tests: Add test for FileFsFullSizeInformation.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 4c41f2bb52b848135ceee6631702d721a082f19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41f2bb52b848135ceee6631… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Apr 7 18:35:56 2015 +0800 ntdll/tests: Add test for FileFsFullSizeInformation. --- dlls/ntdll/tests/file.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d70ed6b..c02c926 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -84,6 +84,16 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } +static const char* debugstr_longlong(ULONGLONG ll) +{ + static char str[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(str, "%lx", (unsigned long)ll); + return str; +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" #define TEST_BUF_LEN 3 @@ -1205,6 +1215,68 @@ static void test_iocp_fileio(HANDLE h) CloseHandle( hPipeClt ); } +static void test_file_full_size_information(void) +{ + IO_STATUS_BLOCK io; + FILE_FS_FULL_SIZE_INFORMATION ffsi; + FILE_FS_SIZE_INFORMATION fsi; + HANDLE h; + NTSTATUS res; + + if(!(h = create_temp_file(0))) return ; + + memset(&ffsi,0,sizeof(ffsi)); + memset(&fsi,0,sizeof(fsi)); + + /* Assume No Quota Settings configured on Wine Testbot */ + res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); + todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + + /* Test for FileFsSizeInformation */ + ok(fsi.TotalAllocationUnits.QuadPart > 0, + "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + ok(fsi.AvailableAllocationUnits.QuadPart > 0, + "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + + /* Assume file system is NTFS */ + ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); + ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); + + todo_wine + { + ok(ffsi.TotalAllocationUnits.QuadPart > 0, + "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, + "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, + "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, + "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, + "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + } + + /* Assume file system is NTFS */ + todo_wine + { + ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); + ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); + } + + CloseHandle( h ); +} + static void test_file_basic_information(void) { IO_STATUS_BLOCK io; @@ -2732,6 +2804,7 @@ START_TEST(file) test_file_all_information(); test_file_both_information(); test_file_name_information(); + test_file_full_size_information(); test_file_all_name_information(); test_file_disposition_information(); test_query_volume_information_file();

1 0

Jacek Caban : inseng.idl: Added new IDL.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: 4d7b7b71e106f9913fed90c8e28612c240708f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7b7b71e106f9913fed90c8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:47:59 2015 +0200 inseng.idl: Added new IDL. --- dlls/inseng/Makefile.in | 2 +- dlls/inseng/inseng_classes.idl | 23 +++++++++++++++++++++++ dlls/inseng/inseng_main.c | 4 ++-- include/Makefile.in | 1 + {dlls/inseng => include}/inseng.idl | 12 ++++++------ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index a4b09de..652e06b 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -3,4 +3,4 @@ IMPORTS = uuid ole32 advapi32 C_SRCS = inseng_main.c -IDL_SRCS = inseng.idl +IDL_SRCS = inseng_classes.idl diff --git a/dlls/inseng/inseng_classes.idl b/dlls/inseng/inseng_classes.idl new file mode 100644 index 0000000..edb7c4d --- /dev/null +++ b/dlls/inseng/inseng_classes.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for inseng + * + * Copyright 2010 Alexandre Julliard + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "inseng.idl" diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index d264b99..e76c6e1 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -110,8 +110,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - if(IsEqualGUID(rclsid, &CLSID_ActiveSetupEng)) { - TRACE("(CLSID_ActiveSetupEng %s %p)\n", debugstr_guid(iid), ppv); + if(IsEqualGUID(rclsid, &CLSID_InstallEngine)) { + TRACE("(CLSID_InstallEngine %s %p)\n", debugstr_guid(iid), ppv); return IClassFactory_QueryInterface(&ActiveSetupEngCF, iid, ppv); } diff --git a/include/Makefile.in b/include/Makefile.in index e114f9f..ad87f47 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,6 +59,7 @@ PUBLIC_IDL_H_SRCS = \ imnxport.idl \ indexsrv.idl \ inputscope.idl \ + inseng.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/dlls/inseng/inseng.idl b/include/inseng.idl similarity index 86% rename from dlls/inseng/inseng.idl rename to include/inseng.idl index ba7a0f9..7b9d0e7 100644 --- a/dlls/inseng/inseng.idl +++ b/include/inseng.idl @@ -1,7 +1,5 @@ /* - * COM Classes for inseng - * - * Copyright 2010 Alexandre Julliard + * Copyright 2015 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,18 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep register +#ifndef __WIDL__ +#define threading(model) +#endif [ helpstring("Microsoft Active Setup Engine"), threading(apartment), uuid(6e449686-c509-11cf-aafa-00aa00b6015c) ] -coclass ActiveSetupEng { } +coclass InstallEngine { } [ helpstring("Download Site Manager"), threading(apartment), uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) ] -coclass DLManager { } +coclass DownloadSiteMgr { }

1 0