January 2018 - Wine-Devel - list.winehq.org

[PATCH] msvcrt: Don't include MSVC 7.0+ miscellaneous functions in SOs for older DLLs
by Alex Henrie Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/except.c | 2 ++ dlls/msvcrt/mbcs.c | 2 ++ dlls/msvcrt/misc.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/msvcrt/process.c | 2 ++ dlls/msvcrt/thread.c | 2 ++ dlls/msvcrt/wcs.c | 4 ++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 18c2f15348..8d13e7fbef 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -321,6 +321,7 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) */ @@ -328,6 +329,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } +#endif /********************************************************************* * _CreateFrameInfo (MSVCR80.@) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6e46b84335..7ca1906dbe 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -185,6 +185,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } +#if _MSVCR_VER>=80 /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ @@ -199,6 +200,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) return &locinfo->mb_cur_max; } +#endif /********************************************************************* * INTERNAL: _setmbcp_l diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index b9dadac907..d784dec18e 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,8 +426,10 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } +#if _MSVCR_VER>=80 + /********************************************************************* - * _decode_pointer (MSVCR90.@) + * _decode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_decode_pointer(void * ptr) { @@ -435,7 +437,7 @@ void * CDECL MSVCRT_decode_pointer(void * ptr) } /********************************************************************* - * _encode_pointer (MSVCR90.@) + * _encode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_encode_pointer(void * ptr) { @@ -443,7 +445,7 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) } /********************************************************************* - * _encoded_null (MSVCR100.@) + * _encoded_null (MSVCR80.@) */ void * CDECL _encoded_null(void) { @@ -452,8 +454,12 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=70 + /********************************************************************* - * _CRT_RTC_INIT (MSVCR100.@) + * _CRT_RTC_INIT (MSVCR70.@) */ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -462,7 +468,7 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) } /********************************************************************* - * _CRT_RTC_INITW (MSVCR100.@) + * _CRT_RTC_INITW (MSVCR70.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -470,8 +476,12 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } +#endif /* _MSVCR_VER>=70 */ + +#if _MSVCR_VER>=80 + /********************************************************************* - * _byteswap_ushort (MSVCR100.@) + * _byteswap_ushort (MSVCR80.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) { @@ -479,7 +489,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) } /********************************************************************* - * _byteswap_ulong (MSVCR100.@) + * _byteswap_ulong (MSVCR80.@) */ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) { @@ -487,7 +497,7 @@ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) } /********************************************************************* - * _byteswap_uint64 (MSVCR100.@) + * _byteswap_uint64 (MSVCR80.@) */ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) { @@ -495,6 +505,10 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=110 + /********************************************************************* * __crtGetShowWindowMode (MSVCR110.@) */ @@ -517,6 +531,9 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +#endif /* _MSVCR_VER>=110 */ + +#if _MSVCR_VER>=120 /********************************************************************* * _vacopy (MSVCR120.@) */ @@ -524,7 +541,9 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* * _crt_debugger_hook (MSVCR80.@) */ @@ -532,7 +551,9 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { WARN("(%x)\n", reserved); } +#endif +#if _MSVCR_VER>=110 /********************************************************************* * __crtUnhandledException (MSVCR110.@) */ @@ -542,7 +563,9 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } +#endif +#if _MSVCR_VER>=120 /********************************************************************* * __crtSleep (MSVCR120.@) */ @@ -551,3 +574,4 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } +#endif diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 1a183bc19b..fac3bd4d20 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1325,6 +1325,7 @@ int CDECL _getpid(void) return GetCurrentProcessId(); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtTerminateProcess (MSVCR110.@) */ @@ -1332,3 +1333,4 @@ int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) { return TerminateProcess(GetCurrentProcess(), exit_code); } +#endif diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index da1f8bf2c1..af31534adb 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,6 +164,7 @@ MSVCRT_uintptr_t CDECL _beginthreadex( initflag, thrdaddr); } +#if _MSVCR_VER>=80 /********************************************************************* * _getptd (MSVCR80.@) */ @@ -172,3 +173,4 @@ thread_data_t* CDECL _getptd(void) FIXME("returns undocumented/not fully filled data\n"); return msvcrt_get_thread_data(); } +#endif diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1aa8d98b12..098e0d5ba8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,6 +40,8 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE +#if _MSVCR_VER>=80 + /********************************************************************* * _get_printf_count_output (MSVCR80.@) */ @@ -58,6 +60,8 @@ int CDECL MSVCRT__set_printf_count_output( int enable ) return old ? 1 : 0; } +#endif /* _MSVCR_VER>=80 */ + /********************************************************************* * _wcsdup (MSVCRT.@) */ -- 2.15.1

2 1

[PATCH] msxml3/tests: Simplify test error path
by Nikolay Sivov Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This also removes a line with a typo, that Coverity complains about - cache2 released twice. dlls/msxml3/tests/schema.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ee84b92158..48d1c5bce4 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -666,26 +666,26 @@ static void test_collection_refs(void) LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); - schema2 = create_document(&IID_IXMLDOMDocument2); - schema3 = create_document(&IID_IXMLDOMDocument2); + ok(schema1 != NULL, "Failed to create a document.\n"); cache1 = create_cache(&IID_IXMLDOMSchemaCollection); - cache2 = create_cache(&IID_IXMLDOMSchemaCollection); - cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ok(cache1 != NULL, "Failed to create schema collection.\n"); - if (!schema1 || !schema2 || !schema3 || !cache1 || !cache2 || !cache3) + if (!schema1 || !cache1) { - if (schema1) IXMLDOMDocument2_Release(schema1); - if (schema2) IXMLDOMDocument2_Release(schema2); - if (schema3) IXMLDOMDocument2_Release(schema3); - - if (cache1) IXMLDOMSchemaCollection_Release(cache1); - if (cache2) IXMLDOMSchemaCollection_Release(cache2); - if (cache3) IXMLDOMSchemaCollection_Release(cache2); - + if (schema1) + IXMLDOMDocument2_Release(schema1); + if (cache1) + IXMLDOMSchemaCollection_Release(cache1); return; } + schema2 = create_document(&IID_IXMLDOMDocument2); + schema3 = create_document(&IID_IXMLDOMDocument2); + + cache2 = create_cache(&IID_IXMLDOMSchemaCollection); + cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); ok(b == VARIANT_TRUE, "failed to load XML\n"); -- 2.15.1

1 0

[PATCH] wininet/tests: Fix off-by-one errors in HTTP tests (Coverity)
by Alex Henrie Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index efc73e039f..1c2aadb5f5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -720,7 +720,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer)-1; + length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); @@ -744,7 +744,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(wbuffer)-sizeof(WCHAR); + length = sizeof(wbuffer)-2*sizeof(WCHAR); memset(wbuffer, 0x77, sizeof(wbuffer)); res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); -- 2.15.1

2 1

[PATCH] dwrite/tests: Add missing return value test (Coverity)
by Nikolay Sivov Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a14180979..24e8e73b2c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -650,7 +650,8 @@ static HRESULT WINAPI resourcecollectionloader_CreateEnumeratorFromKey(IDWriteFo IDWriteFontFile *font_file; HRESULT hr; - IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + ok(hr == S_OK, "Failed to create custom file reference, hr %#x.\n", hr); hr = create_enumerator(font_file, fontFileEnumerator); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.15.1

1 0

[PATCH] user32/tests: Add some more tests for message data conversion in dialog procedures
by Nikolay Sivov Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 80 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index afc3473df3..cbe4b2b1d8 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1239,44 +1239,65 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; todo_wine ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; todo_wine ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } - } + break; + }; return DefWindowProcW(hdlg, msg, wparam, lparam); } static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } + break; } return DefWindowProcA(hdlg, msg, wparam, lparam); } +static void dlg_test_aw_message(HWND hdlg, UINT msg) +{ + LRESULT ret; + + ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); +} + static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { ULONG_PTR dlgproc, originalproc; @@ -1290,6 +1311,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w case WM_INITDIALOG: ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + /* WM_SETTEXT/WM_GETTEXT */ originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc); @@ -1320,6 +1342,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w todo_wine ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); @@ -1343,6 +1372,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE; @@ -1391,6 +1427,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); @@ -1415,6 +1458,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE; -- 2.15.1

1 0

[PATCH] msctf/tests: Fix a typo in sink_check_ok().
by Andrey Gusev Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 34a27098d8..c7ec1e567b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1901,7 +1901,7 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); ok(fetched == 1,"fetched incorrect\n"); ok(selection.range != NULL,"NULL range\n"); - sink_check_ok(&test_ACP_GetSelection,"ACP_GetSepection"); + sink_check_ok(&test_ACP_GetSelection,"GetSelection"); ITfRange_Release(selection.range); test_InsertAtSelection(ec, cxt); -- 2.13.6

2 1

[PATCH] ddraw: Fix typos in comments.
by Andrey Gusev Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ddraw/device.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 542f23a0ef..28bb2fb52c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI d3d_device3_EnumTextureFormats(IDirect3DDevice3 *iface, * IDirect3DDevice2::EnumTextureformats * * EnumTextureFormats for Version 1 and 2, see - * IDirect3DDevice7::EnumTexureFormats for a more detailed description. + * IDirect3DDevice7::EnumTextureFormats for a more detailed description. * * This version has a different callback and does not enumerate FourCC * formats diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index cc676f3985..83f3078c04 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) * SrcIndex: Index of the first vertex in the src buffer to process * D3DDevice: Device to use for transformation * Flags: 0 for default, D3DPV_DONOTCOPYDATA to prevent copying - * unchaned vertices + * unchained vertices * * Returns: * D3D_OK on success -- 2.13.6

2 1

[PATCH] kernel32/tests: Fix a typo in comment.
by Andrey Gusev Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2af4946f2f..ce2f13b6dc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2480,7 +2480,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret2, ret); /* test LCMAP_FULLWIDTH | LCMAP_HIRAGANA - (half-width katakana is converted into full-wdith hiragana) */ + (half-width katakana is converted into full-width hiragana) */ ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, -- 2.13.6

1 0

[PATCH] comctl32: Fix a typo in comment.
by Andrey Gusev Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d700b9cec..589d5c4a7e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1017,7 +1017,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP return ret; } - /* if dipsinfo holder changed notification code then convert */ + /* if dispinfo holder changed notification code then convert */ if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); -- 2.13.6

1 0

[PATCH] kernel32/tests: Test CreateFileMapping with a foreign architecture dll
by André Hentschel Jan. 8, 2018

Jan. 8, 2018

This was written with project Hangover in mind, we hoped that we can get rid of https://github.com/AndreRH/wine/commit/8935bdf941f5f2866c2fa4695eb15d94337f… Sadly this seems not to be the case, as Wine already behaves like modern Windows here Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/virtual.c | 96 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4a449fd..56eb456 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1608,10 +1608,79 @@ static void test_NtAreMappedFilesTheSame(void) DeleteFileA( testfile ); } +static BOOL create_foreign_dll( LPCSTR filename ) +{ + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + IMAGE_SECTION_HEADER *sec; + BYTE *buffer; + DWORD lfanew = sizeof(*dos); + DWORD size = lfanew + sizeof(*nt) + sizeof(*sec); + DWORD written; + BOOL ret; + + HANDLE file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + buffer = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + + dos = (IMAGE_DOS_HEADER *)buffer; + dos->e_magic = IMAGE_DOS_SIGNATURE; + dos->e_cblp = sizeof(*dos); + dos->e_cp = 1; + dos->e_cparhdr = lfanew / 16; + dos->e_minalloc = 0; + dos->e_maxalloc = 0xffff; + dos->e_ss = 0x0000; + dos->e_sp = 0x00b8; + dos->e_lfarlc = lfanew; + dos->e_lfanew = lfanew; + + nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); + nt->Signature = IMAGE_NT_SIGNATURE; +#if defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#else + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#endif + nt->FileHeader.NumberOfSections = 1; + nt->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; + nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.ImageBase = 0x10000000; + nt->OptionalHeader.SectionAlignment = 0x1000; + nt->OptionalHeader.FileAlignment = 0x1000; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.SizeOfImage = 0x2000; + nt->OptionalHeader.SizeOfHeaders = size; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + + sec = (IMAGE_SECTION_HEADER *)(nt + 1); + memcpy( sec->Name, ".rodata", sizeof(".rodata") ); + sec->Misc.VirtualSize = 0x1000; + sec->VirtualAddress = 0x1000; + sec->SizeOfRawData = 0; + sec->PointerToRawData = 0; + sec->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + + ret = WriteFile( file, buffer, size, &written, NULL ) && written == size; + HeapFree( GetProcessHeap(), 0, buffer ); + CloseHandle( file ); + return ret; +} + static void test_CreateFileMapping(void) { - HANDLE handle, handle2, file[3]; - char path[MAX_PATH], filename[MAX_PATH]; + HANDLE handle, handle2, file[4]; + char path[MAX_PATH], filename[MAX_PATH], filename2[MAX_PATH]; unsigned int i; NTSTATUS status; @@ -1664,6 +1733,14 @@ static void test_CreateFileMapping(void) { 2, SEC_IMAGE | SEC_WRITECOMBINE, ERROR_INVALID_PARAMETER }, { 2, SEC_IMAGE | SEC_RESERVE, ERROR_INVALID_PARAMETER }, { 2, SEC_IMAGE | SEC_COMMIT, ERROR_INVALID_PARAMETER }, + /* foreign PE image file */ + { 3, SEC_IMAGE, ERROR_BAD_EXE_FORMAT, SEC_FILE | SEC_IMAGE }, + { 3, SEC_IMAGE | SEC_FILE, ERROR_INVALID_PARAMETER }, /* 45 */ + { 3, SEC_IMAGE | SEC_NOCACHE, ERROR_BAD_EXE_FORMAT, SEC_FILE | SEC_IMAGE }, + { 3, SEC_IMAGE | SEC_LARGE_PAGES, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_WRITECOMBINE, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_RESERVE, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_COMMIT, ERROR_INVALID_PARAMETER }, /* 50 */ }; /* test case sensitivity */ @@ -1716,17 +1793,26 @@ static void test_CreateFileMapping(void) file[2] = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); ok( file[2] != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foreign", 0, filename2 ); + ok(create_foreign_dll(filename2), "Creation of foreign dll failed\n"); + file[3] = CreateFileA( filename2, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + for (i = 0; i < sizeof(sec_flag_tests) / sizeof(sec_flag_tests[0]); i++) { DWORD flags = sec_flag_tests[i].flags; - DWORD perm = sec_flag_tests[i].file == 2 ? PAGE_READONLY : PAGE_READWRITE; + DWORD perm = sec_flag_tests[i].file >= 2 ? PAGE_READONLY : PAGE_READWRITE; SetLastError( 0xdeadbeef ); handle = CreateFileMappingA( file[sec_flag_tests[i].file], NULL, flags | perm, 0, 0x1000, "Wine Test Mapping" ); if (sec_flag_tests[i].error) { + /* SEC_IMAGE_NO_EXECUTE produces ERROR_INVALID_PARAMETER on older Windows */ + BOOL wrong_err = ((flags & SEC_IMAGE_NO_EXECUTE) == SEC_IMAGE_NO_EXECUTE) && + (GetLastError() == ERROR_INVALID_PARAMETER); ok( !handle, "%u: CreateFileMapping succeeded\n", i ); - ok( GetLastError() == sec_flag_tests[i].error, "%u: wrong error %u\n", i, GetLastError()); + ok( GetLastError() == sec_flag_tests[i].error || broken(wrong_err), + "%u: wrong error %u\n", i, GetLastError()); } else { @@ -1754,7 +1840,9 @@ static void test_CreateFileMapping(void) } CloseHandle( file[1] ); CloseHandle( file[2] ); + CloseHandle( file[3] ); DeleteFileA( filename ); + DeleteFileA( filename2 ); } static void test_IsBadReadPtr(void) -- 2.7.4

3 3