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

Dmitry Timoshkov : oleaut32/tests: Add tests for IPicture::get_hPal() and IPicture::set_hPal().
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: bab5a703da91c106aadb43349fd9f742cd9c84e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab5a703da91c106aadb4334… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 6 16:10:37 2018 +0800 oleaut32/tests: Add tests for IPicture::get_hPal() and IPicture::set_hPal(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 105 ++++++++++++++++++++++++++++++++++----- 1 file changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 50ba765..c06cec1 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -539,12 +539,61 @@ static void test_Invoke(void) IPictureDisp_Release(picdisp); } +static HRESULT create_picture(short type, IPicture **pict) +{ + PICTDESC desc; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = type; + + switch (type) + { + case PICTYPE_UNINITIALIZED: + return OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)pict); + + case PICTYPE_NONE: + break; + + case PICTYPE_BITMAP: + desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + desc.u.bmp.hpal = (HPALETTE)0xbeefdead; + break; + + case PICTYPE_ICON: + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + break; + + case PICTYPE_METAFILE: + { + HDC hdc = CreateMetaFileA(NULL); + desc.u.wmf.hmeta = CloseMetaFile(hdc); + desc.u.wmf.xExt = 1; + desc.u.wmf.yExt = 1; + break; + } + + case PICTYPE_ENHMETAFILE: + { + HDC hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + desc.u.emf.hemf = CloseEnhMetaFile(hdc); + break; + } + + default: + ok(0, "picture type %d is not supported\n", type); + return E_NOTIMPL; + } + + return OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)pict); +} + static void test_OleCreatePictureIndirect(void) { + PICTDESC desc; OLE_HANDLE handle; IPicture *pict; HRESULT hr; - short type; + short type, i; if (0) { @@ -552,20 +601,52 @@ if (0) OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } - hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); - ok(hr == S_OK, "hr %08x\n", hr); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_UNINITIALIZED; + pict = (void *)0xdeadbeef; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pict); + ok(hr == E_UNEXPECTED, "got %#x\n", hr); + ok(pict == NULL, "got %p\n", pict); - type = PICTYPE_NONE; - hr = IPicture_get_Type(pict, &type); - ok(hr == S_OK, "hr %08x\n", hr); - ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type); + for (i = PICTYPE_UNINITIALIZED; i <= PICTYPE_ENHMETAFILE; i++) + { + hr = create_picture(i, &pict); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + + type = 0xdead; + hr = IPicture_get_Type(pict, &type); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(type == i, "%d: got %d\n", i, type); + + handle = 0xdeadbeef; + hr = IPicture_get_Handle(pict, &handle); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + if (type == PICTYPE_UNINITIALIZED || type == PICTYPE_NONE) + ok(handle == 0, "%d: got %#x\n", i, handle); + else + ok(handle != 0 && handle != 0xdeadbeef, "%d: got %#x\n", i, handle); + + handle = 0xdeadbeef; + hr = IPicture_get_hPal(pict, &handle); + if (type == PICTYPE_BITMAP) + { + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(handle == 0xbeefdead, "%d: got %#x\n", i, handle); + } + else + { + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); + ok(handle == 0xdeadbeef || handle == 0 /* win64 */, "%d: got %#x\n", i, handle); + } - handle = 0xdeadbeef; - hr = IPicture_get_Handle(pict, &handle); - ok(hr == S_OK, "hr %08x\n", hr); - ok(handle == 0, "handle %08x\n", handle); + hr = IPicture_set_hPal(pict, HandleToUlong(GetStockObject(DEFAULT_PALETTE))); + if (type == PICTYPE_BITMAP) + ok(hr == S_OK, "%d: got %#x\n", i, hr); + else + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); - IPicture_Release(pict); + IPicture_Release(pict); + } } static void test_apm(void)

1 0

Michael Stefaniuc : ole32: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: 9cad95d198a5d90a3b10b6a4f5dce15b1b608c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cad95d198a5d90a3b10b6a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:24 2018 +0200 ole32: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fb69a66..3487cca 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - /**************************************************************************** * This section defines variables internal to the COM module. */ @@ -1477,7 +1475,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(&params->regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(&params->regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2356,7 +2354,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1]; LONG res; HKEY key; @@ -2391,7 +2389,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; DWORD res; WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID]; + WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; DWORD size; HKEY hkey; DWORD type; @@ -2599,7 +2597,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) { static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; + WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)]; APARTMENT *apt; struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; @@ -2642,8 +2640,8 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); - StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); - strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); + StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); + strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); hr = get_ps_clsid_from_registry(path, 0, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || @@ -2971,7 +2969,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -3829,7 +3827,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) if(IsEqualGUID(clsidNew, &CLSID_NULL)){ RegDeleteKeyW(hkey, wszTreatAs); }else{ - if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){ WARN("StringFromGUID2 failed\n"); res = E_FAIL; goto done; @@ -5087,7 +5085,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) regdata.u.hkey = hkey; regdata.hkey = TRUE; - if (COM_RegReadPath(&regdata, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(&regdata, dllpath, ARRAY_SIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

Michael Stefaniuc : shell32: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: 1e469c95e63a02df701342fc8eb8b7d252a00fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e469c95e63a02df701342fc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jul 7 23:39:07 2018 +0200 shell32: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 8 +++----- dlls/shell32/shfldr_printers.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b5b9ff2..60f32f1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -87,8 +87,6 @@ static const shvheader mycomputer_header[] = { NULL, 0, IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 }, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS sizeof(mycomputer_header)/sizeof(shvheader) - /************************************************************************** * ISF_MyComputer_Constructor */ @@ -799,7 +797,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; *pcsFlags = mycomputer_header[iColumn].pcsFlags; @@ -826,7 +824,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 *iface, TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; if (!pidl) @@ -871,7 +869,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 *iface, UI TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(mycomputer_header, column, scid); diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 66260ac..8e25e58 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -63,8 +63,6 @@ static const shvheader printers_header[] = { { NULL, 0, IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 } }; -#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader) - static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -283,7 +281,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState ( TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; *pcsFlags = printers_header[iColumn].pcsFlags; @@ -306,7 +304,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_NOTIMPL; if (!pidl) @@ -323,7 +321,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnMapColumnToSCID (IShellFolder2 *if TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= PRINTERS_FOLDER_COL_NUM) + if (column >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(printers_header, column, scid);

1 0

Michael Stefaniuc : winex11.drv: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: 3e9ce1c26fdeaf5bfef48f4630251e280e7cf718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9ce1c26fdeaf5bfef48f46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jul 7 23:39:08 2018 +0200 winex11.drv: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 10 +++++----- dlls/winex11.drv/desktop.c | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c55a266..296c00c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -187,7 +187,6 @@ static const struct static struct list format_list = LIST_INIT( format_list ); -#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) static DWORD clipboard_thread_id; @@ -295,9 +294,9 @@ static void register_builtin_formats(void) struct clipboard_format *formats; unsigned int i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(builtin_formats) * sizeof(*formats)))) return; - for (i = 0; i < NB_BUILTIN_FORMATS; i++) + for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -983,7 +982,7 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) register_x11_formats( properties, count ); /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*formats )))) + if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + ARRAY_SIZE(builtin_formats)) * sizeof(*formats )))) return 0; pos = 0; @@ -1454,7 +1453,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target if (!(formats = get_clipboard_formats( &count ))) return FALSE; /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + if (!(targets = HeapAlloc( GetProcessHeap(), 0, + (count + ARRAY_SIZE(builtin_formats)) * sizeof(*targets) ))) { HeapFree( GetProcessHeap(), 0, formats ); return FALSE; diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4df8784..559efe2 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -73,7 +73,6 @@ static struct screen_size { {1920, 1200}, {2560, 1600} }; -#define NUM_DESKTOP_MODES (sizeof(screen_sizes) / sizeof(struct screen_size)) #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 @@ -88,7 +87,7 @@ static void make_modes(void) /* original specified desktop size */ X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<NUM_DESKTOP_MODES; i++) + for (i=0; i<ARRAY_SIZE(screen_sizes); i++) { if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) { @@ -160,7 +159,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, X11DRV_desktop_SetCurrentMode, - NUM_DESKTOP_MODES+2, 1); + ARRAY_SIZE(screen_sizes)+2, 1); make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount();

1 0

Sebastian Lackner : kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround.
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: 61d92d1317272c4528872b091a5308905dd00429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d92d1317272c4528872b09… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 8 21:19:56 2018 +0200 kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ff56e9a..7787a32 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1042,7 +1042,9 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "subl $12,%esp\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ + "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" "call *12(%ebp)\n\t" "leave\n\t"

1 0

Huw Davies : ntdll/tests: Skip the map protect tests if we can' t disable no-exec.
by Alexandre Julliard 09 Jul '18

09 Jul '18

Module: wine Branch: master Commit: 986d5a9958ee767ee3c358fe676dde95dc0a3279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=986d5a9958ee767ee3c358fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 9 11:12:56 2018 +0100 ntdll/tests: Skip the map protect tests if we can't disable no-exec. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4a2d9e6..7d60b94 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1776,20 +1776,30 @@ static void test_mapprotection(void) NTSTATUS status; SIZE_T retlen, count; void (*f)(void); + BOOL reset_flags = FALSE; - if (!pNtClose) { - skip("No NtClose ... Win98\n"); - return; - } /* Switch to being a noexec unaware process */ status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize); - if (status == STATUS_INVALID_PARAMETER) { - skip("Invalid Parameter on ProcessExecuteFlags query?\n"); + if (status == STATUS_INVALID_PARAMETER) + { + skip("Unable to query process execute flags on this platform\n"); return; } - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + trace("Process execute flags %08x\n", oldflags); + + if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + { + if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) + { + skip("Unable to turn off noexec\n"); + return; + } + + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + reset_flags = TRUE; + } size.u.LowPart = 0x2000; size.u.HighPart = 0; @@ -1832,8 +1842,8 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); - /* Switch back */ - pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); + if (reset_flags) + pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); } static void test_queryvirtualmemory(void)

1 0

Julian Rüger : German translation for release 3.9
by Jeremy Newman 09 Jul '18

09 Jul '18

Module: website Branch: master Commit: 726eb1d5105bfb4572a556be0b8f96c5b2807ac2 URL: https://source.winehq.org/git/website.git/?a=commit;h=726eb1d5105bfb4572a55… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:17:41 2018 +0200 German translation for release 3.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018052501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018052501.xml b/news/de/2018052501.xml new file mode 100644 index 0000000..cc5e4c5 --- /dev/null +++ b/news/de/2018052501.xml @@ -0,0 +1,17 @@ +<news> +<date>25. Mai 2018</date> +<title>Wine 3.9 freigegeben</title> +<body> + Die Entwicklungsversion 3.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>OpenGL-Kernkontexte sind nun standardmäßig aktiviert in Direct 3D.</li> + <li>Anfänge der Direct3D-12-Implementierung durch vkd3d.</li> + <li>Weitere Unterstützung des Taskplaners.</li> + <li>Fortschritte der Taskdialog-Unterstützung.</li> + <li>Bessere Pfeilunterstützung in GdiPlus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.9.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.10
by Jeremy Newman 09 Jul '18

09 Jul '18

Module: website Branch: master Commit: 1d62a1fe8c6164739f0f851ef8f8174da14b0243 URL: https://source.winehq.org/git/website.git/?a=commit;h=1d62a1fe8c6164739f0f8… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:20:09 2018 +0200 German translation for release 3.10 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018061101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018061101.xml b/news/de/2018061101.xml new file mode 100644 index 0000000..6fe5db0 --- /dev/null +++ b/news/de/2018061101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. Juni 2018</date> +<title>Wine 3.10 freigegeben</title> +<body> + Die Entwicklungsversion 3.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Swapchain-Unterstützung in Direct3D 12.</li> + <li>Vulkan-Unterstützung wurde auf die aktuelle Spezifikation aktualisiert.</li> + <li>Debugger-Unterstützung von Wow64-Prozessen.</li> + <li>Noch weitere Unterstützung des Taskplaners.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.11
by Jeremy Newman 09 Jul '18

09 Jul '18

Module: website Branch: master Commit: 01ecc521a4a21d1106b41639baa36d5f876e1d58 URL: https://source.winehq.org/git/website.git/?a=commit;h=01ecc521a4a21d1106b41… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:23:25 2018 +0200 German translation for release 3.11 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018062301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018062301.xml b/news/de/2018062301.xml new file mode 100644 index 0000000..2bcbef2 --- /dev/null +++ b/news/de/2018062301.xml @@ -0,0 +1,16 @@ +<news> +<date>23. Juni 2018</date> +<title>Wine 3.11 freigegeben</title> +<body> + Die Entwicklungsversion 3.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Debugger-Unterstützung von Wow64-Prozessen.</li> + <li>Unterstützung von sha256/sha384-Hashes in ECDSA-Signaturen.</li> + <li>Bessere Erkennung von CPUs mit Hyperthreading.</li> + <li>Verbesserungen am Standard-Taskdialog.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for vkd3d release 1.0
by Jeremy Newman 09 Jul '18

09 Jul '18

Module: website Branch: master Commit: 741c6a45ed95c89e741c9605a50ef64308b4a00b URL: https://source.winehq.org/git/website.git/?a=commit;h=741c6a45ed95c89e741c9… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 9 12:41:53 2018 +0200 German translation for vkd3d release 1.0 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018052301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018052301.xml b/news/de/2018052301.xml new file mode 100644 index 0000000..92e95df --- /dev/null +++ b/news/de/2018052301.xml @@ -0,0 +1,16 @@ +<news> +<date>23. Mai 2018</date> +<title>Vkd3d 1.0 freigegeben</title> +<body> +Das Wine-Team ist stolz verkünden zu können, dass Release 1.0 von vkd3d, +der Übersetzungsbibliothek von Direct3D 12 zu Vulkan, jetzt verfügbar ist. + +Dies ist das erste Release von vkd3d. Viele Direct3D-12-Funktionen fehlen +noch und Fehler sind zu erwarten. Die aktuelle Version wurde hauptsächlich mit +Demo-Anwendungen getestet. Eine Menge Funktionen, an denen noch gearbeitet wird, +wurden auf den nächsten Entwicklungszyklus verschoben. Das betrifft insbesondere +die Unterstützung von Geometrie- und Tessellationsshadern, diverse Verbesserungen +der Shader-Übersetzung, sowie der Direct3D-12-Kernmethoden. + +Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz">hier verfügbar</a>. +</body></news>

1 0