March 2015 - Wine-Commits - list.winehq.org

Thomas Faber : gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC).
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 8a390c8661ad3975d13aeae1f9953822d4c42461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a390c8661ad3975d13aeae1f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 28 13:29:06 2015 +0100 gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC). --- dlls/gdi32/enhmetafile.c | 123 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 61f541f..7fb0b34 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2288,6 +2288,7 @@ BOOL WINAPI EnumEnhMetaFile( SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + info->state.mode = MM_TEXT; info->state.wndOrgX = 0; info->state.wndOrgY = 0; info->state.wndExtX = 1; @@ -2338,71 +2339,69 @@ BOOL WINAPI EnumEnhMetaFile( old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE); old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); - } - - info->state.mode = MM_TEXT; - if ( IS_WIN9X() ) - { - /* Win95 leaves the vp/win ext/org info alone */ - info->init_transform.eM11 = 1.0; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = 1.0; - info->init_transform.eDx = 0.0; - info->init_transform.eDy = 0.0; - } - else - { - /* WinNT combines the vp/win ext/org info into a transform */ - double xscale, yscale; - xscale = (double)vp_size.cx / (double)win_size.cx; - yscale = (double)vp_size.cy / (double)win_size.cy; - info->init_transform.eM11 = xscale; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = yscale; - info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; - info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; - - CombineTransform(&info->init_transform, &savedXform, &info->init_transform); - } + if ( IS_WIN9X() ) + { + /* Win95 leaves the vp/win ext/org info alone */ + info->init_transform.eM11 = 1.0; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = 1.0; + info->init_transform.eDx = 0.0; + info->init_transform.eDy = 0.0; + } + else + { + /* WinNT combines the vp/win ext/org info into a transform */ + double xscale, yscale; + xscale = (double)vp_size.cx / (double)win_size.cx; + yscale = (double)vp_size.cy / (double)win_size.cy; + info->init_transform.eM11 = xscale; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = yscale; + info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; + info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; + + CombineTransform(&info->init_transform, &savedXform, &info->init_transform); + } - if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) - { - double xSrcPixSize, ySrcPixSize, xscale, yscale; - XFORM xform; - - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, - emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, - emh->rclFrame.bottom); - - xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; - ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; - xscale = (double) WIDTH(*lpRect) * 100.0 / - WIDTH(emh->rclFrame) * xSrcPixSize; - yscale = (double) HEIGHT(*lpRect) * 100.0 / - HEIGHT(emh->rclFrame) * ySrcPixSize; - TRACE("xscale = %f, yscale = %f\n", xscale, yscale); - - xform.eM11 = xscale; - xform.eM12 = 0; - xform.eM21 = 0; - xform.eM22 = yscale; - xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; - xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; - - CombineTransform(&info->init_transform, &xform, &info->init_transform); - } + if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) + { + double xSrcPixSize, ySrcPixSize, xscale, yscale; + XFORM xform; + + TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", + lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, + emh->rclFrame.bottom); + + xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; + ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; + xscale = (double) WIDTH(*lpRect) * 100.0 / + WIDTH(emh->rclFrame) * xSrcPixSize; + yscale = (double) HEIGHT(*lpRect) * 100.0 / + HEIGHT(emh->rclFrame) * ySrcPixSize; + TRACE("xscale = %f, yscale = %f\n", xscale, yscale); + + xform.eM11 = xscale; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = yscale; + xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; + xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; + + CombineTransform(&info->init_transform, &xform, &info->init_transform); + } - /* WinNT resets the current vp/win org/ext */ - if ( !IS_WIN9X() && hdc ) - { - SetMapMode(hdc, MM_TEXT); - SetWindowOrgEx(hdc, 0, 0, NULL); - SetViewportOrgEx(hdc, 0, 0, NULL); - EMF_Update_MF_Xform(hdc, info); + /* WinNT resets the current vp/win org/ext */ + if ( !IS_WIN9X() ) + { + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); + EMF_Update_MF_Xform(hdc, info); + } } ret = TRUE;

1 0

Andrew Cook : kernel32/tests: Add tests for IsProcessInJob.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: f40bffaf67735f0f2db61361140424c89cb9bcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40bffaf67735f0f2db613611… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:25:45 2015 +1100 kernel32/tests: Add tests for IsProcessInJob. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b8323b4..a8c8654 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -66,6 +66,9 @@ 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 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); /* ############################### */ static char base[MAX_PATH]; @@ -209,6 +212,9 @@ static BOOL init(void) pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); + pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); + pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); return TRUE; } @@ -2119,19 +2125,87 @@ static void test_DuplicateHandle(void) CloseHandle(out); } +#define create_process(cmd, pi) _create_process(__LINE__, cmd, pi) +static void _create_process(int line, const char *command, LPPROCESS_INFORMATION pi) +{ + BOOL ret; + char buffer[MAX_PATH]; + STARTUPINFOA si = {0}; + + snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, command); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, pi); + ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError()); +} + + +static void test_IsProcessInJob(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret, out; + DWORD dwret; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + START_TEST(process) { BOOL b = init(); ok(b, "Basic init of CreateProcess test\n"); if (!b) return; - if (myARGC >= 4) + if (myARGC >= 3) { - if (!strcmp(myARGV[2], "dump")) + if (!strcmp(myARGV[2], "dump") && myARGC >= 4) { doChild(myARGV[3], (myARGC >= 5) ? myARGV[4] : NULL); return; } + else if (!strcmp(myARGV[2], "wait")) + { + Sleep(30000); + ok(0, "Child process not killed\n"); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -2160,4 +2234,12 @@ START_TEST(process) * handles: check the handle inheritance stuff (+sec options) * console: check if console creation parameters work */ + + if (!pCreateJobObjectW) + { + win_skip("No job object support\n"); + return; + } + + test_IsProcessInJob(); }

1 0

Sebastian Lackner : kernel32/tests: Allow multiple subprocess commands in process tests.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 978597e8ab26302f442f601edff6b34073071442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978597e8ab26302f442f601ed… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 26 05:18:09 2015 +0100 kernel32/tests: Allow multiple subprocess commands in process tests. --- dlls/kernel32/tests/process.c | 72 +++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=978597e8ab26302f442f6…

1 0

Mark Harmstone : ntdll: Treat strings as case-insensitive in find_window_class.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 104161cfd29b20d3720cb9e88d3398511e21b794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104161cfd29b20d3720cb9e88… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Mar 28 21:24:49 2015 +0000 ntdll: Treat strings as case-insensitive in find_window_class. --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4552e40..715a760 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3332,7 +3332,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI { const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break;

1 0

Aaryaman Vasishta : d3drm: Fix hard-coded HRESULT return in Direct3DRMFrame_create.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: bb83e30635790ae1a209f81e06b12f1f276fc0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83e30635790ae1a209f81e0… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 29 01:00:47 2015 +0530 d3drm: Fix hard-coded HRESULT return in Direct3DRMFrame_create. --- dlls/d3drm/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d66e9bf..20acf56 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2301,5 +2301,5 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void **)out); IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface); - return S_OK; + return hr; }

1 0

Piotr Caban : server: Fix DACL to permissions conversion.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 00b3f055be5dbf54bc56ab6b6609e0cac50b61e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b3f055be5dbf54bc56ab6b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 15:17:38 2015 +0100 server: Fix DACL to permissions conversion. --- dlls/advapi32/tests/security.c | 3 ++- server/file.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0e9cf8c..a3690e8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3484,7 +3484,8 @@ static void test_GetNamedSecurityInfoA(void) h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); diff --git a/server/file.c b/server/file.c index f565f5a..aa5ff01 100644 --- a/server/file.c +++ b/server/file.c @@ -473,7 +473,7 @@ static mode_t file_access_to_mode( unsigned int access ) mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { mode_t new_mode = 0; - mode_t denied_mode = 0; + mode_t bits_to_set = ~0; mode_t mode; int present; const ACL *dacl = sd_get_dacl( sd, &present ); @@ -498,16 +498,16 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode = file_access_to_mode( ad_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - denied_mode |= (mode << 6) | (mode << 3) | mode; /* all */ + bits_to_set &= ~((mode << 6) | (mode << 3) | mode); /* all */ } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, TRUE ))) { - denied_mode |= (mode << 6) | (mode << 3); /* user + group */ + bits_to_set &= ~((mode << 6) | (mode << 3)); /* user + group */ } else if (security_equal_sid( sid, owner )) { - denied_mode |= (mode << 6); /* user only */ + bits_to_set &= ~(mode << 6); /* user only */ } break; case ACCESS_ALLOWED_ACE_TYPE: @@ -516,16 +516,22 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode = file_access_to_mode( aa_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - new_mode |= (mode << 6) | (mode << 3) | mode; /* all */ + mode = (mode << 6) | (mode << 3) | mode; /* all */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, FALSE ))) { - new_mode |= (mode << 6) | (mode << 3); /* user + group */ + mode = (mode << 6) | (mode << 3); /* user + group */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } else if (security_equal_sid( sid, owner )) { - new_mode |= (mode << 6); /* user only */ + mode = (mode << 6); /* user only */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } break; } @@ -535,7 +541,7 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) /* no ACL means full access rights to anyone */ new_mode = S_IRWXU | S_IRWXG | S_IRWXO; - return new_mode & ~denied_mode; + return new_mode; } static int file_set_sd( struct object *obj, const struct security_descriptor *sd,

1 0

Andrew Cook : kernel32/tests: Add tests for job inheritance.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 6cd34c900262f7636b484476da182daad7a60a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd34c900262f7636b484476d… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:26:30 2015 +1100 kernel32/tests: Add tests for job inheritance. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3395f0f..b8413f6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2425,6 +2425,38 @@ static HANDLE test_AddSelfToJob(void) return job; } +static void test_jobInheritance(HANDLE job) +{ + char buffer[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + DWORD dwret; + BOOL ret, out; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + static void test_BreakawayOk(HANDLE job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; @@ -2565,6 +2597,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); job = test_AddSelfToJob(); + test_jobInheritance(job); test_BreakawayOk(job); CloseHandle(job); }

1 0

Andrew Cook : kernel32/tests: Add tests for TerminateJobObject.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: ad04b7305b308193ea936efc69a39ddaf8abd459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad04b7305b308193ea936efc6… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:23:28 2015 +1100 kernel32/tests: Add tests for TerminateJobObject. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a8c8654..85de14a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -69,6 +69,7 @@ static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); 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); +static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); /* ############################### */ static char base[MAX_PATH]; @@ -215,6 +216,7 @@ static BOOL init(void) pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); + pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); return TRUE; } @@ -2187,6 +2189,40 @@ static void test_IsProcessInJob(void) CloseHandle(job); } +static void test_TerminateJobObject(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD dwret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + todo_wine + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); + + ret = GetExitCodeProcess(pi.hProcess, &dwret); + ok(ret, "GetExitCodeProcess error %u\n", GetLastError()); + todo_wine + ok(dwret == 123 || broken(dwret == 0) /* randomly fails on Win 2000 / XP */, + "wrong exitcode %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + START_TEST(process) { BOOL b = init(); @@ -2242,4 +2278,5 @@ START_TEST(process) } test_IsProcessInJob(); + test_TerminateJobObject(); }

1 0

Alexandre Julliard : winmm: Print full flag values in traces.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 6c3aac3e4af280746e45b8269ded2dce2ac5f80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3aac3e4af280746e45b8269… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:31 2015 +0900 winmm: Print full flag values in traces. --- dlls/winmm/mci.c | 2 +- dlls/winmm/waveform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index a77514c..b3c1882 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1731,7 +1731,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) MCI_OPEN_ALIAS|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID| \ MCI_NOTIFY|MCI_WAIT) if ((dwParam & ~WINE_MCIDRIVER_SUPP) != 0) - FIXME("Unsupported yet dwFlags=%08X\n", dwParam & ~WINE_MCIDRIVER_SUPP); + FIXME("Unsupported yet dwFlags=%08X\n", dwParam); #undef WINE_MCIDRIVER_SUPP strDevTyp[0] = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ba74e02..c010c39 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4314,7 +4314,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo return MIXERR_INVALLINE; } - TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo & MIXER_GETLINEINFOF_QUERYMASK); + TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo); return MMSYSERR_INVALFLAG; }

1 0

Alexandre Julliard : user32/tests: Print full flag values in traces.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 13700585b1267ec94cb907f2e592635bba4d961f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13700585b1267ec94cb907f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:20 2015 +0900 user32/tests: Print full flag values in traces. --- dlls/user32/tests/win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d71e92a..6869a20 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3797,7 +3797,7 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - (lpss->styleOld & ~WS_EX_WINDOWEDGE), (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE)); + lpss->styleOld, lpcs->dwExStyle); ok(lpss->styleNew == lpcs->style, "Style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", @@ -3985,14 +3985,14 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out | DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); /* try setting the styles explicitly */ SetWindowLongA(hwnd, GWL_EXSTYLE, ex_style_in); style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out|DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;

1 0