November 2018 - Wine-Commits

Alexandre Julliard : winebuild: Pass the -mfpu option to the compiler/ assembler.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 0fd533836b8cdea8b9a6af667bb3c1ffd053b3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd533836b8cdea8b9a6af66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 20:20:25 2018 +0100 winebuild: Pass the -mfpu option to the compiler/assembler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 2 ++ tools/winebuild/winebuild.man.in | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34..fbc2cd9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -361,6 +361,7 @@ extern struct strarray cc_command; extern struct strarray ld_command; extern struct strarray nm_command; extern char *cpu_option; +extern char *fpu_option; extern char *arch_option; extern const char *float_abi_option; extern int thumb_mode; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9..70f381c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -88,6 +88,7 @@ struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; struct strarray nm_command = { 0 }; char *cpu_option = NULL; +char *fpu_option = NULL; char *arch_option = NULL; #ifdef __SOFTFP__ const char *float_abi_option = "soft"; @@ -412,6 +413,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); + else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a..95da175 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -386,6 +386,7 @@ struct strarray get_as_command(void) if (force_pointer_size) strarray_add_one( &args, (force_pointer_size == 8) ? "-m64" : "-m32" ); if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); + if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); return args; } @@ -420,6 +421,7 @@ struct strarray get_as_command(void) } if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); + if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 89865ac..51ad544 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,7 +156,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfloat-abi= option +.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP .BI \-M,\ --main-module= module

1 0

Michael Stefaniuc : winegstreamer: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: b618a6c6a73deb78fa4d823b805fe03b99621cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b618a6c6a73deb78fa4d823b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 5 21:56:21 2018 +0100 winegstreamer: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/winegstreamer/main.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 833464b..0d9ab8d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -794,12 +794,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); - MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); + MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, ARRAY_SIZE(piOutput.achName) - 1); TRACE("Name: %s\n", name); strcpy(my_name, "qz_sink_"); strcat(my_name, name); g_free(name); - piOutput.achName[sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1] = 0; + piOutput.achName[ARRAY_SIZE(piOutput.achName) - 1] = 0; caps = gst_pad_query_caps(pad, NULL); caps = gst_caps_make_writable(caps); @@ -1259,7 +1259,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index dc988cf..b9cddcb 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -223,7 +223,7 @@ FactoryTemplate const g_Templates[] = { }, }; -const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]); +const int g_cTemplates = ARRAY_SIZE(g_Templates); BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -323,7 +323,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_ID(MEDIATYPE_Stream); INF_SET_ID(WINESUBTYPE_Gstreamer); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { + for(i = 0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = HeapAlloc(GetProcessHeap(),0,39); sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], @@ -331,7 +331,7 @@ static HRESULT register_server(BOOL do_register) clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); } - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); @@ -339,7 +339,7 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + for(i = 0; i < ARRAY_SIZE(pse); i++) HeapFree(GetProcessHeap(),0,pse[i].pszValue); if(FAILED(hres)) {

1 0

Piotr Caban : msvcp140: Add _Winerror_map implementation.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 8d0ef952e247e16ff9bbb60e18fc24855b0a789d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0ef952e247e16ff9bbb60e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 5 20:21:27 2018 +0100 msvcp140: Add _Winerror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 296d06c..7c54f80 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1669,7 +1669,7 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub ?_Winerror_map(a)std@@YAHH(a)Z +@ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) _Winerror_map @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 870573e..5705882 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <stdio.h> #include "windef.h" @@ -192,6 +193,7 @@ static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); +static int (__cdecl *p__Winerror_map)(int); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -212,6 +214,7 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); SET(p__Task_impl_base__IsNonBlockingThread, "?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ"); SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ"); + SET(p__Winerror_map, "?_Winerror_map(a)std@@YAHH(a)Z"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); @@ -1303,6 +1306,60 @@ static void test__Winerror_message(void) ok(buf[0] == 'a', "buf = %s\n", buf); } +static void test__Winerror_map(void) +{ + static struct { + int winerr, doserr; + BOOL broken; + } tests[] = { + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP, TRUE}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL, TRUE}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} + }; + int i, ret; + + for(i=0; i<ARRAY_SIZE(tests); i++) + { + ret = p__Winerror_map(tests[i].winerr); + ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), + "_Winerror_map(%d) returned %d, expected %d\n", + tests[i].winerr, ret, tests[i].doserr); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -1325,5 +1382,6 @@ START_TEST(msvcp140) test_Rename(); test_Last_write_time(); test__Winerror_message(); + test__Winerror_map(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c5079d7..aa29fb9 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -198,6 +198,51 @@ static struct { }; #endif +#if _MSVCP_VER >= 140 +static struct { + int winerr; + int doserr; +} winerror_map[] = +{ + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} +}; +#endif + struct __Container_proxy; typedef struct { @@ -2809,4 +2854,24 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } + +/* ?_Winerror_map(a)std@@YAHH(a)Z */ +int __cdecl _Winerror_map(int err) +{ + int low = 0, high = ARRAY_SIZE(winerror_map) - 1, mid; + + while(low <= high) + { + mid = (low + high) / 2; + + if(err == winerror_map[mid].winerr) + return winerror_map[mid].doserr; + if(err > winerror_map[mid].winerr) + low = mid + 1; + else + high = mid - 1; + } + + return 0; +} #endif

1 0

Akihiro Sagawa : windowscodecs: Fix buffer overflow when generating a palette.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: e93495d3f8e1c1e069823c569e3ec58fa5a95ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93495d3f8e1c1e069823c56… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 4 23:17:42 2018 +0900 windowscodecs: Fix buffer overflow when generating a palette. This typically happens when loading 16-bpp color-keyed grayscale PNG image via GDIPlus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 42a1f2f..3f0ab39 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1057,7 +1057,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, png_palette[i].blue); } } - else if (color_type == PNG_COLOR_TYPE_GRAY) { + else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth <= 8) { ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); if (!ret) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 3648a2e..5f4a5e1 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -539,6 +539,15 @@ static const char png_PLTE_tRNS[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +/* grayscale 16 bpp 1x1 pixel PNG image with tRNS chunk */ +static const char png_gray_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x10,0x00,0x00,0x00,0x00,0x6a,0xee,0x47,0x16, + 0x00,0x00,0x00,0x02,'t','R','N','S',0x00,0x00,0x76,0x93,0xcd,0x38, + 0x00,0x00,0x00,0x0b,'I','D','A','T',0x78,0x9c,0x63,0x60,0x60,0x00,0x00,0x00,0x03,0x00,0x01,0xb8,0xad,0x3a,0x63, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + static void test_png_palette(void) { HRESULT hr; @@ -548,6 +557,7 @@ static void test_png_palette(void) GUID format; UINT count, ret; WICColor color[256]; + char *buf; hr = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS), &decoder); ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); @@ -579,6 +589,64 @@ static void test_png_palette(void) IWICPalette_Release(palette); IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder); + + hr = create_decoder(png_gray_tRNS, sizeof(png_gray_tRNS), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat64bppRGBA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "CopyPalette error %#x\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + + /* test 8 bpp grayscale PNG image with tRNS chunk */ + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(png_gray_tRNS)); + memcpy(buf, png_gray_tRNS, sizeof(png_gray_tRNS)); + buf[24] = 8; /* override bit depth */ + + hr = create_decoder(buf, sizeof(png_gray_tRNS), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0x00000000, "expected 0x00000000, got %#x\n", color[0]); + ok(color[1] == 0xff010101, "expected 0xff010101, got %#x\n", color[1]); + + HeapFree(GetProcessHeap(), 0, buf); + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); } /* RGB 24 bpp 1x1 pixel PNG image */

1 0

Akihiro Sagawa : windowscodecs/tests: Introduce PNG_COLOR_TYPE constants.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 495aac5f66ab8f8664205780c4b6c00ed57fab16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=495aac5f66ab8f8664205780… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 4 23:17:40 2018 +0900 windowscodecs/tests: Introduce PNG_COLOR_TYPE constants. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 74 +++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index c798ea4..3648a2e 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -624,23 +624,29 @@ static const char png_1x1_data[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +#define PNG_COLOR_TYPE_GRAY 0 +#define PNG_COLOR_TYPE_RGB 2 +#define PNG_COLOR_TYPE_PALETTE 3 +#define PNG_COLOR_TYPE_GRAY_ALPHA 4 +#define PNG_COLOR_TYPE_RGB_ALPHA 6 + static BOOL is_valid_png_type_depth(int color_type, int bit_depth, BOOL plte) { switch (color_type) { - case 0: /* Grayscale */ + case PNG_COLOR_TYPE_GRAY: return bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8 || bit_depth == 16; - case 2: /* True Color */ + case PNG_COLOR_TYPE_RGB: return bit_depth == 8 || bit_depth == 16; - case 3: /* Indexed Color */ + case PNG_COLOR_TYPE_PALETTE: return (bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8) && plte; - case 4: /* Grayscale with alpha */ + case PNG_COLOR_TYPE_GRAY_ALPHA: return bit_depth == 8 || bit_depth == 16; - case 6: /* True Color with alpha */ + case PNG_COLOR_TYPE_RGB_ALPHA: return bit_depth == 8 || bit_depth == 16; default: @@ -662,33 +668,44 @@ static void test_color_formats(void) } td[] = { /* 2 - PNG_COLOR_TYPE_RGB */ - { 1, 2, NULL, NULL, NULL }, - { 2, 2, NULL, NULL, NULL }, - { 4, 2, NULL, NULL, NULL }, - { 8, 2, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR }, + { 1, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 2, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 4, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 8, PNG_COLOR_TYPE_RGB, + &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR }, /* libpng refuses to load our test image complaining about extra compressed data, * but libpng is still able to load the image with other combination of type/depth * making RGB 16 bpp case special for some reason. Therefore todo = TRUE. */ - { 16, 2, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, TRUE, TRUE }, - { 24, 2, NULL, NULL, NULL }, - { 32, 2, NULL, NULL, NULL }, + { 16, PNG_COLOR_TYPE_RGB, + &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, TRUE, TRUE }, + { 24, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed }, - { 2, 0, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed }, - { 4, 0, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed }, - { 8, 0, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed }, - { 16, 0, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat64bppRGBA }, - { 24, 0, NULL, NULL, NULL }, - { 32, 0, NULL, NULL, NULL }, + { 1, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed }, + { 2, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed }, + { 4, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed }, + { 8, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed }, + { 16, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat64bppRGBA }, + { 24, PNG_COLOR_TYPE_GRAY, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_GRAY, NULL, NULL, NULL }, /* 3 - PNG_COLOR_TYPE_PALETTE */ - { 1, 3, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed }, - { 2, 3, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed }, - { 4, 3, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed }, - { 8, 3, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed }, - { 16, 3, NULL, NULL, NULL }, - { 24, 3, NULL, NULL, NULL }, - { 32, 3, NULL, NULL, NULL }, + { 1, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed }, + { 2, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed }, + { 4, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed }, + { 8, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed }, + { 16, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, + { 24, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, }; char buf[sizeof(png_1x1_data)]; HRESULT hr; @@ -833,6 +850,11 @@ todo_wine_if(td[i].todo) IWICBitmapDecoder_Release(decoder); } } +#undef PNG_COLOR_TYPE_GRAY +#undef PNG_COLOR_TYPE_RGB +#undef PNG_COLOR_TYPE_PALETTE +#undef PNG_COLOR_TYPE_GRAY_ALPHA +#undef PNG_COLOR_TYPE_RGB_ALPHA START_TEST(pngformat) {

1 0

Andrey Gusev : api-ms-win-ntuser-sysparams-l1-1-0: Add dll.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 03fd289bedfa920e7e4cb763d81ff41d787fe9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fd289bedfa920e7e4cb763… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 5 17:33:28 2018 +0200 api-ms-win-ntuser-sysparams-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in | 1 + .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 9787693..7f9786f 100755 --- a/configure +++ b/configure @@ -1075,6 +1075,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_ntuser_sysparams_l1_1_0 enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -19181,6 +19182,7 @@ wine_fn_config_makefile dlls/api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l wine_fn_config_makefile dlls/api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-ntuser-sysparams-l1-1-0 enable_api_ms_win_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 39a2310..efec221 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-time-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d1a573 --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-ntuser-sysparams-l1-1-0.dll diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec new file mode 100644 index 0000000..587a495 --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW +@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo +@ stub DisplayConfigSetDeviceInfo +@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW +@ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) user32.GetDisplayConfigBufferSizes +@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW +@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles index aa5aad6..b05afb8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-3-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", + "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1",

1 0

Alexandre Julliard : user32: Add stub for GetCurrentInputMessageSource().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 771123afb696eecb50d3f0253d433811311130d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771123afb696eecb50d3f025… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:58:33 2018 +0100 user32: Add stub for GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/message.c | 10 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 25 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 3a043dc..93ecc1b 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall EnableMouseInPointer(long) user32.EnableMouseInPointer -@ stub GetCurrentInputMessageSource +@ stdcall GetCurrentInputMessageSource(ptr) user32.GetCurrentInputMessageSource @ stub GetPointerCursorId @ stub GetPointerDevice @ stub GetPointerDeviceProperties diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1554fbf..9bfeb16 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4132,6 +4132,16 @@ LPARAM WINAPI SetMessageExtraInfo(LPARAM lParam) /*********************************************************************** + * GetCurrentInputMessageSource (USER32.@) + */ +BOOL WINAPI GetCurrentInputMessageSource( INPUT_MESSAGE_SOURCE *source ) +{ + FIXME( "stub\n" ); + return FALSE; +} + + +/*********************************************************************** * WaitMessage (USER.112) Suspend thread pending messages * WaitMessage (USER32.@) Suspend thread pending messages * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a340e02..d5b8597 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -280,6 +280,7 @@ @ stdcall GetClipboardSequenceNumber () @ stdcall GetClipboardViewer() @ stdcall GetComboBoxInfo(long ptr) +@ stdcall GetCurrentInputMessageSource(ptr) @ stdcall GetCursor() @ stdcall GetCursorFrameInfo(long long long ptr ptr) @ stdcall GetCursorInfo(ptr) diff --git a/include/winuser.h b/include/winuser.h index d09f8cd..693965a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -674,6 +674,30 @@ typedef struct tagGUITHREADINFO #define GUI_POPUPMENUMODE 0x00000010 #define GUI_16BITTASK 0x00000020 +typedef enum tagINPUT_MESSAGE_DEVICE_TYPE +{ + IMDT_UNAVAILABLE = 0x00, + IMDT_KEYBOARD = 0x01, + IMDT_MOUSE = 0x02, + IMDT_TOUCH = 0x04, + IMDT_PEN = 0x08, + IMDT_TOUCHPAD = 0x10, +} INPUT_MESSAGE_DEVICE_TYPE; + +typedef enum tagINPUT_MESSAGE_ORIGIN_ID +{ + IMO_UNAVAILABLE = 0x00, + IMO_HARDWARE = 0x01, + IMO_INJECTED = 0x02, + IMO_SYSTEM = 0x04, +} INPUT_MESSAGE_ORIGIN_ID; + +typedef struct tagINPUT_MESSAGE_SOURCE +{ + INPUT_MESSAGE_DEVICE_TYPE deviceType; + INPUT_MESSAGE_ORIGIN_ID originId; +} INPUT_MESSAGE_SOURCE; + /***** Dialogs *****/ @@ -3718,6 +3742,7 @@ WINUSERAPI DWORD WINAPI GetClipboardSequenceNumber(VOID); WINUSERAPI HWND WINAPI GetClipboardViewer(void); WINUSERAPI BOOL WINAPI GetClipCursor(LPRECT); WINUSERAPI BOOL WINAPI GetComboBoxInfo(HWND,PCOMBOBOXINFO); +WINUSERAPI BOOL WINAPI GetCurrentInputMessageSource(INPUT_MESSAGE_SOURCE*); WINUSERAPI HCURSOR WINAPI GetCursor(void); WINUSERAPI BOOL WINAPI GetCursorInfo(PCURSORINFO); WINUSERAPI HCURSOR WINAPI GetCursorFrameInfo(HCURSOR,DWORD,DWORD,DWORD*,DWORD*);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reset the enumerator when the text is empty even when auto-suggest is disabled.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 9a41584c4948a36cdc4b52f8d1746d579b63562b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a41584c4948a36cdc4b52f8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:40 2018 +0200 shell32/autocomplete: Reset the enumerator when the text is empty even when auto-suggest is disabled. This is needed for auto-append only AutoComplete controls. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 3e55202..a6404ca 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -454,7 +454,8 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (flag != autoappend_flag_displayempty && len == 0) { if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox, TRUE); + hide_listbox(ac, ac->hwndListBox, FALSE); + free_enum_strs(ac); return; }

1 0

Gabriel Ivăncescu : shell32/tests: Test the amount of enumerator resets for AutoComplete.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: d5e765555587514b3565536634383be878f3f550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e765555587514b35655366… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:41 2018 +0200 shell32/tests: Test the amount of enumerator resets for AutoComplete. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 66bd472..8265bf9 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -274,6 +274,7 @@ struct string_enumerator WCHAR **data; int data_len; int cur; + UINT num_resets; UINT num_expand; WCHAR last_expand[32]; }; @@ -349,6 +350,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) struct string_enumerator *this = impl_from_IEnumString(iface); this->cur = 0; + this->num_resets++; return S_OK; } @@ -456,6 +458,7 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) static WCHAR str2[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a',0}; static WCHAR str2a[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\',0}; static WCHAR str2b[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a','z','_','b','b','q','\\',0}; + obj->num_resets = 0; ok(obj->num_expand == 0, "Expected 0 expansions, got %u\n", obj->num_expand); SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str1); @@ -464,12 +467,14 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) dispatch_messages(); ok(obj->num_expand == 1, "Expected 1 expansion, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str2); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str2) - 1, ARRAY_SIZE(str2) - 1); SendMessageW(hwnd_edit, WM_CHAR, 'z', 1); dispatch_messages(); ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str2a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); SetFocus(hwnd_edit); SendMessageW(hwnd_edit, WM_CHAR, '_', 1); SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); @@ -479,20 +484,24 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) SendMessageW(hwnd_edit, WM_CHAR, 'q', 1); dispatch_messages(); ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, WM_CHAR, '\\', 1); dispatch_messages(); ok(obj->num_expand == 3, "Expected 3 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str2b) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2b), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 3, "Expected 3 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1a) - 1, -1); SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); SendMessageW(hwnd_edit, WM_CHAR, 'y', 1); dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 4, "Expected 4 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1) - 1, -1); SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); + ok(obj->num_resets == 5, "Expected 5 resets, got %u\n", obj->num_resets); } static void test_custom_source(void) @@ -502,6 +511,7 @@ static void test_custom_source(void) static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; static WCHAR str_au[] = {'a','u',0}; static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + struct string_enumerator *obj; IUnknown *enumerator; IAutoComplete2 *autocomplete; HWND hwnd_edit; @@ -516,6 +526,7 @@ static void test_custom_source(void) ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); string_enumerator_create((void**)&enumerator, suggestions, ARRAY_SIZE(suggestions)); + obj = (struct string_enumerator*)enumerator; hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); @@ -528,11 +539,14 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + obj->num_resets = 0; /* hijack the window procedure */ HijackerWndProc_prev = (WNDPROC)SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc); @@ -545,6 +559,7 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_au, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_au), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); dispatch_messages(); @@ -558,6 +573,7 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); /* end of hijacks */ test_aclist_expand(hwnd_edit, enumerator);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reset the enumerator when losing focus if the edit control is not visible anymore.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 4f85424d58a4df3e9bf4fa36880b889231caa7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f85424d58a4df3e9bf4fa36… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:39 2018 +0200 shell32/autocomplete: Reset the enumerator when losing focus if the edit control is not visible anymore. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 69d9cc8..3e55202 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -601,10 +601,14 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, hide_listbox(This, This->hwndListBox, TRUE); return 0; case WM_KILLFOCUS: - if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) + if (This->options & ACO_AUTOSUGGEST) { + if ((HWND)wParam == This->hwndListBox) break; hide_listbox(This, This->hwndListBox, FALSE); } + + /* Reset the enumerator if it's not visible anymore */ + if (!IsWindowVisible(hwnd)) free_enum_strs(This); break; case WM_KEYDOWN: return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam);

1 0