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

Henri Verbeet : wined3d: Get rid of the "Multisampling" setting.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: c09bb22c81cd391998cae632380d3a50504d0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09bb22c81cd391998cae6323… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:27 2017 +0200 wined3d: Get rid of the "Multisampling" setting. There should be no reason to set this anymore. Note that "SampleCount" can be used to force a specific sample count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/wined3d_main.c | 9 --------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b5a8e47..e89cd6d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3710,8 +3710,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) else gl_info->limits.shininess = 128.0f; - if ((gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) - && wined3d_settings.allow_multisampling) + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_SAMPLES, &gl_max); gl_info->limits.samples = gl_max; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f662c3a..1a4e2f2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,7 +80,6 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - TRUE, /* Multisampling enabled by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -289,14 +288,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); else memcpy(wined3d_settings.logo, buffer, len); } - if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) - { - if (!strcmp(buffer, "disabled")) - { - TRACE("Multisampling disabled.\n"); - wined3d_settings.allow_multisampling = FALSE; - } - } if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bab0fea..829360c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,7 +388,6 @@ struct wined3d_settings /* Memory tracking and object counting. */ UINT64 emulated_textureram; char *logo; - int allow_multisampling; unsigned int sample_count; BOOL strict_draw_ordering; BOOL check_float_constants;

1 0

Henri Verbeet : wined3d: Avoid touching the output value on failure in get_config_key_dword(); .
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 449308ec5d2025058d46b17352c9fa05dbe0889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=449308ec5d2025058d46b1735… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:28 2017 +0200 wined3d: Avoid touching the output value on failure in get_config_key_dword();. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1a4e2f2..8f5da3c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -127,13 +127,20 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *bu return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *data) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) { - DWORD type; - DWORD size = sizeof(DWORD); - if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; - if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; + DWORD type, data, size; + + size = sizeof(data); + if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + size = sizeof(data); + if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + return ERROR_FILE_NOT_FOUND; + +success: + *value = data; + return 0; } static BOOL wined3d_dll_init(HINSTANCE hInstDLL)

1 0

Henri Verbeet : ddraw/tests: Introduce a helper function to create windows.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: a86af72270e61cafb37454bbdc8020681dd49b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86af72270e61cafb37454bbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:29 2017 +0200 ddraw/tests: Introduce a helper function to create windows. Mostly for consistency with other D3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 151 ++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 173 +++++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 216 +++++++++++++++--------------------------- dlls/ddraw/tests/ddraw7.c | 232 ++++++++++++++++------------------------------ 4 files changed, 273 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a86af72270e61cafb3745…

1 0

Nikolay Sivov : uxtheme: Fix buffer bitmap leak.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: e015928a8583024ba4a69c3c9c37659c5226c10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e015928a8583024ba4a69c3c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 23:09:16 2017 +0300 uxtheme: Fix buffer bitmap leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 17bdf3d..bbf4c9d 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -39,12 +39,14 @@ struct paintbuffer { HDC targetdc; HDC memorydc; + HBITMAP bitmap; RECT rect; void *bits; }; static void free_paintbuffer(struct paintbuffer *buffer) { + DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); HeapFree(GetProcessHeap(), 0, buffer); } @@ -83,7 +85,6 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; struct paintbuffer *buffer; - HBITMAP hbm; TRACE("(%p %s %d %p %p)\n", targetdc, wine_dbgstr_rect(rect), format, params, retdc); @@ -105,7 +106,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, switch (format) { case BPBF_COMPATIBLEBITMAP: - hbm = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); + buffer->bitmap = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); buffer->bits = NULL; break; case BPBF_DIB: @@ -120,22 +121,23 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, bmi->bmiHeader.biBitCount = format == BPBF_TOPDOWNMONODIB ? 1 : 32; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); + buffer->bitmap = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); break; default: WARN("Unknown buffer format %d\n", format); + buffer->bitmap = NULL; free_paintbuffer(buffer); return NULL; } - if (!hbm) + if (!buffer->bitmap) { WARN("Failed to create buffer bitmap\n"); free_paintbuffer(buffer); return NULL; } - DeleteObject(SelectObject(buffer->memorydc, hbm)); + DeleteObject(SelectObject(buffer->memorydc, buffer->bitmap)); *retdc = buffer->memorydc;

1 0

Nikolay Sivov : shell32: Fix string leak.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: f74e1b1fb1d9033385375b93152484734753dc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74e1b1fb1d9033385375b931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 23 18:29:08 2017 +0300 shell32: Fix string leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 543e012..1a02c83 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -99,7 +99,6 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); - LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; WCHAR *hwndQCText; @@ -222,7 +221,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { + LPOLESTR strs = NULL; ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break; @@ -235,8 +236,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); - if (!(This->options & ACO_AUTOSUGGEST)) + if (!(This->options & ACO_AUTOSUGGEST)) { + CoTaskMemFree(strs); break; + } } if (This->options & ACO_AUTOSUGGEST) { @@ -246,6 +249,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, filled = TRUE; } + + CoTaskMemFree(strs); } if (This->options & ACO_AUTOSUGGEST) {

1 0

Nikolay Sivov : dwrite: Look for 'SVG ' table too when checking supported formats.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 1b1488fda7e3cecae028c1198f00d1dcf2fc40dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1488fda7e3cecae028c1198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:50:46 2017 +0300 dwrite: Look for 'SVG ' table too when checking supported formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 +++++- dlls/dwrite/tests/font.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b7e9d87..99531a6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -2069,6 +2070,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (opentype_has_font_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4d5780c..9fd8258 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -45,6 +45,7 @@ #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -7436,7 +7437,10 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (face_has_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; }

1 0

Nikolay Sivov : include: Fix IShellFolderView method macros.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 16d21d94c182b0a5ce3b9b22a5049e2eb1d425e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d21d94c182b0a5ce3b9b22a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:51:44 2017 +0300 include: Fix IShellFolderView method macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 0f754d0..ccbf008 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -662,11 +662,11 @@ DECLARE_INTERFACE_(IShellFolderView, IUnknown) #define IShellFolderView_GetDropPoint(p,a) (p)->lpVtbl->GetDropPoint(p,a) #define IShellFolderView_MoveIcons(p,a) (p)->lpVtbl->MoveIcons(p,a) #define IShellFolderView_SetItemPos(p,a,b) (p)->lpVtbl->SetItemPos(p,a,b) -#define IShellFolderView_DropTarget(p,a) (p)->lpVtbl->DropTarget(p,a) +#define IShellFolderView_IsBkDropTarget(p,a) (p)->lpVtbl->IsBkDropTarget(p,a) #define IShellFolderView_SetClipboard(p,a) (p)->lpVtbl->SetClipboard(p,a) #define IShellFolderView_SetPoints(p,a) (p)->lpVtbl->SetPoints(p,a) #define IShellFolderView_GetItemSpacing(p,a) (p)->lpVtbl->GetItemSpacing(p,a) -#define IShellFolderView_SetCallback(p,a) (p)->lpVtbl->SetCallback(p,a) +#define IShellFolderView_SetCallback(p,a,b) (p)->lpVtbl->SetCallback(p,a,b) #define IShellFolderView_Select(p,a) (p)->lpVtbl->Select(p,a) #define IShellFolderView_QuerySupport(p,a) (p)->lpVtbl->QuerySupport(p,a) #define IShellFolderView_SetAutomationObject(p,a) (p)->lpVtbl->SetAutomationObject(p,a)

1 0

Michael Müller : ntdll: Mark LDR data as initialized.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: a3452656147cb5cf74d2f7380d83200e001eaffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3452656147cb5cf74d2f7380… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:17:00 2017 +0200 ntdll: Mark LDR data as initialized. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 7 +++++-- dlls/ntdll/thread.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f72c3e..2587a97 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2991,10 +2991,13 @@ static void test_ResolveDelayLoadedAPI(void) static void test_InMemoryOrderModuleList(void) { - LIST_ENTRY *entry1, *mark1 = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - LIST_ENTRY *entry2, *mark2 = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + PEB_LDR_DATA *ldr = NtCurrentTeb()->Peb->LdrData; + LIST_ENTRY *entry1, *mark1 = &ldr->InLoadOrderModuleList; + LIST_ENTRY *entry2, *mark2 = &ldr->InMemoryOrderModuleList; LDR_MODULE *module1, *module2; + ok(ldr->Initialized == TRUE, "expected TRUE, got %u\n", ldr->Initialized); + for (entry1 = mark1->Flink, entry2 = mark2->Flink; entry1 != mark1 && entry2 != mark2; entry1 = entry1->Flink, entry2 = entry2->Flink) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c9a5da6..0506f6b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -259,6 +259,7 @@ HANDLE thread_init(void) params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); + ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 );

1 0

Michael Müller : ntdll: Add stub for JobObjectBasicAccountingInformation and JobObjectBasicProcessIdList.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 62ae2ae1a101f0409b1d2bee26e2dbbb662507ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ae2ae1a101f0409b1d2bee2… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:22:25 2017 +0200 ntdll: Add stub for JobObjectBasicAccountingInformation and JobObjectBasicProcessIdList. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 10 ++++++++-- dlls/ntdll/sync.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 04feb71..c480a27 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2515,7 +2515,6 @@ static void test_QueryInformationJobObject(void) ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList), &ret_len); ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); SetLastError(0xdeadbeef); @@ -2524,18 +2523,20 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); + todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { + todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); + todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } memset(buf, 0, sizeof(buf)); ret = pQueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, sizeof(buf), &ret_len); - todo_wine ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); if(ret) { @@ -2545,12 +2546,17 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; + todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); + todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); + todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); + todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c179760..cfb5cbc 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -645,6 +645,30 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c switch (class) { + case JobObjectBasicAccountingInformation: + { + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *accounting; + if (len < sizeof(*accounting)) + return STATUS_INFO_LENGTH_MISMATCH; + + accounting = (JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *)info; + memset(accounting, 0, sizeof(*accounting)); + if (ret_len) *ret_len = sizeof(*accounting); + return STATUS_SUCCESS; + } + + case JobObjectBasicProcessIdList: + { + JOBOBJECT_BASIC_PROCESS_ID_LIST *process; + if (len < sizeof(*process)) + return STATUS_INFO_LENGTH_MISMATCH; + + process = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)info; + memset(process, 0, sizeof(*process)); + if (ret_len) *ret_len = sizeof(*process); + return STATUS_SUCCESS; + } + case JobObjectExtendedLimitInformation: { JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit;

1 0

Michael Müller : kernel32: Add stub for GetPackageFullName.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2b79436ab96e69359d0b105b939f07b0543cdecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b79436ab96e69359d0b105b9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:36:31 2017 +0200 kernel32: Add stub for GetPackageFullName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 50f8594..4d2edd6 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -10,7 +10,7 @@ @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds @ stub GetPackageFamilyName -@ stub GetPackageFullName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo @ stub GetPackagePath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31ce456..5ef7cb8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -761,6 +761,7 @@ @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) +@ stdcall GetPackageFullName(long ptr ptr) @ stdcall GetPhysicallyInstalledSystemMemory(ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 5a233ef..3cca2ae 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -228,3 +228,12 @@ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name) FIXME("(%p %p): stub\n", length, name); return APPMODEL_ERROR_NO_PACKAGE; } + +/*********************************************************************** + * GetPackageFullName (KERNEL32.@) + */ +LONG WINAPI GetPackageFullName(HANDLE process, UINT32 *length, PWSTR name) +{ + FIXME("(%p %p %p): stub\n", process, length, name); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index cf6ceef..689d587 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -593,7 +593,7 @@ # @ stub GetPackageContext # @ stub GetPackageFamilyName # @ stub GetPackageFamilyNameFromToken -# @ stub GetPackageFullName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName # @ stub GetPackageFullNameFromToken # @ stub GetPackageId # @ stub GetPackageInfo

1 0