August 2016 - Wine-commits - list.winehq.org

Sebastian Lackner : configure: Explicitly check for sysinfo function.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 9815806f16441004b87b11e3c0bbc190e9011044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9815806f16441004b87b11e3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 08:34:21 2016 +0200 configure: Explicitly check for sysinfo function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 4 ++-- include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b8eedc5..bf4d1a7 100755 --- a/configure +++ b/configure @@ -15133,6 +15133,7 @@ for ac_func in \ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/configure.ac b/configure.ac index f5dde04..0fad32f 100644 --- a/configure.ac +++ b/configure.ac @@ -2039,6 +2039,7 @@ AC_CHECK_FUNCS(\ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1312c8b..e826fa0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1359,7 +1359,7 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO struct sysinfo sinfo; #endif @@ -1368,7 +1368,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO if (!sysinfo(&sinfo)) { ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; diff --git a/include/config.h.in b/include/config.h.in index 64f56fd..6acafca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1008,6 +1008,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <sys/asoundlib.h> header file. */ #undef HAVE_SYS_ASOUNDLIB_H

1 0

Michael Stefaniuc : avifil32: Avoid a cast from a COM object to an iface.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b7b031aa431076b5e47e834fb4d412628f8ffa61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b031aa431076b5e47e834fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:49:26 2016 +0200 avifil32: Avoid a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/getframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 46b1683..c8580a8 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -504,7 +504,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) IAVIStream_AddRef(pStream); } - return (PGETFRAME)pg; + return &pg->IGetFrame_iface; } /***********************************************************************/

1 0

Michael Stefaniuc : ole32/tests: Avoid casts from COM objects to ifaces.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 11c67756d2374270d0deeeacc23735cae33488f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c67756d2374270d0deeeacc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:50:49 2016 +0200 ole32/tests: Avoid casts from COM objects to ifaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 13e5220..1a8301e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -192,7 +192,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO ret->fmtetc_cnt = fmtetc_cnt; ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; + *lplpformatetc = &ret->IEnumFORMATETC_iface; return S_OK; } @@ -395,7 +395,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; } @@ -451,7 +451,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); obj->fmtetc[7].dwAspect = DVASPECT_ICON; - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; }

1 0

Michael Stefaniuc : fusion: Avoid using the LPASSEMBLYNAME type.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 8b6fa5c9bab54c32a6fb270442b92c90b2290b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6fa5c9bab54c32a6fb27044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:53:25 2016 +0200 fusion: Avoid using the LPASSEMBLYNAME type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 2 +- dlls/fusion/tests/asmenum.c | 2 +- dlls/fusion/tests/asmname.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f7a9452..0baea2f 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -727,7 +727,7 @@ done: /****************************************************************** * CreateAssemblyNameObject (FUSION.@) */ -HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, +HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved) { diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index a060529..1dc34a2 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -33,7 +33,7 @@ static HRESULT (WINAPI *pCreateAssemblyEnum)(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pGetCachePath)(ASM_CACHE_FLAGS dwCacheFlags, diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index e415c3a9..5fb14a4 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -35,7 +35,7 @@ static CHAR string1[MAX_PATH]; if (lstrcmpA(string1, aString) != 0) \ ok(0, "Expected \"%s\", got \"%s\"\n", aString, string1); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion,

1 0

Pierre Schweitzer : mpr: Implement local name automatic redirection for disks.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b452e6285915b1ad46920fc8551335ab28bfb4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b452e6285915b1ad46920fc85… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:43:46 2016 +0200 mpr: Implement local name automatic redirection for disks. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 71 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 0d4209c..50d3d83 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1581,18 +1581,18 @@ struct use_connection_context void *accessname; DWORD *buffer_size; DWORD *result; - DWORD (*pre_set_accessname)(struct use_connection_context*); - void (*set_accessname)(struct use_connection_context*); + DWORD (*pre_set_accessname)(struct use_connection_context*, WCHAR *); + void (*set_accessname)(struct use_connection_context*, WCHAR *); }; -static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resource->lpLocalName) - len = strlenW(ctxt->resource->lpLocalName); + if (local_name) + len = strlenW(local_name); else len = strlenW(ctxt->resource->lpRemoteName); @@ -1608,11 +1608,11 @@ static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameW(struct use_connection_context *ctxt) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { WCHAR *accessname = ctxt->accessname; - if (ctxt->resource->lpLocalName) - strcpyW(accessname, ctxt->resource->lpLocalName); + if (local_name) + strcpyW(accessname, local_name); else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1621,29 +1621,42 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; DWORD index, ret, caps; + BOOL redirect = FALSE; + WCHAR letter[3] = {'Z', ':', 0}; + NETRESOURCEW netres; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; if (!ctxt->resource) return ERROR_INVALID_PARAMETER; + netres = *ctxt->resource; - if (!ctxt->resource->lpProvider) + if (!netres.lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; + if (netres.dwType != RESOURCETYPE_DISK && netres.dwType != RESOURCETYPE_PRINT) + return ERROR_BAD_DEV_TYPE; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Local device selection is not implemented for printers.\n"); + return WN_NO_NETWORK; + } + + redirect = TRUE; + netres.lpLocalName = letter; } - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + if (!netres.lpProvider) { - FIXME("Locale device selection is not implemented.\n"); + FIXME("Networking provider selection is not implemented.\n"); return WN_NO_NETWORK; } if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(ctxt->resource->lpProvider); + index = _findProviderIndexW(netres.lpProvider); if (index == BAD_PROVIDER_INDEX) return ERROR_BAD_PROVIDER; @@ -1652,17 +1665,23 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt))) + if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + + if (ret != NO_ERROR && redirect) + letter[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt); + ctxt->set_accessname(ctxt, netres.lpLocalName); return ret; } @@ -1694,14 +1713,14 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR return wnet_use_connection(&ctxt); } -static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resourceA->lpLocalName) - len = strlen(ctxt->resourceA->lpLocalName); + if (local_name) + len = WideCharToMultiByte(CP_ACP, 0, local_name, -1, NULL, 0, NULL, NULL) - 1; else len = strlen(ctxt->resourceA->lpRemoteName); @@ -1717,11 +1736,11 @@ static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameA(struct use_connection_context *ctxt) +static void use_connection_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { char *accessname = ctxt->accessname; - if (ctxt->resourceA->lpLocalName) - strcpy(accessname, ctxt->resourceA->lpLocalName); + if (local_name) + WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

1 0

Pierre Schweitzer : mpr: Implement provider selection given remote name.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: a65c31e46fa354fc8fbf86c0b9f273f86132a571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65c31e46fa354fc8fbf86c0b… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:50:58 2016 +0200 mpr: Implement provider selection given remote name. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 72 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 50d3d83..c44fec2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1617,10 +1617,36 @@ static void use_connection_set_accessnameW(struct use_connection_context *ctxt, strcpyW(accessname, ctxt->resource->lpRemoteName); } +static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCEW * netres, WNetProvider *provider, BOOLEAN redirect ) +{ + DWORD caps, ret; + + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + ret = WN_ACCESS_DENIED; + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(netres, ctxt->password, ctxt->userid); + + if (ret == WN_ALREADY_CONNECTED && redirect) + netres->lpLocalName[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && netres->lpLocalName[0] >= 'C'); + + if (ret == WN_SUCCESS && ctxt->accessname) + ctxt->set_accessname(ctxt, netres->lpLocalName); + + return ret; +} + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; - DWORD index, ret, caps; + DWORD index, ret = WN_NO_NETWORK; BOOL redirect = FALSE; WCHAR letter[3] = {'Z', ':', 0}; NETRESOURCEW netres; @@ -1647,41 +1673,31 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) netres.lpLocalName = letter; } - if (!netres.lpProvider) - { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; - } - if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(netres.lpProvider); - if (index == BAD_PROVIDER_INDEX) - return ERROR_BAD_PROVIDER; - - provider = &providerTable->table[index]; - caps = provider->getCaps(WNNC_CONNECTION); - if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; - ret = WN_ACCESS_DENIED; - do + if (netres.lpProvider) { - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + index = _findProviderIndexW(netres.lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; - if (ret != NO_ERROR && redirect) - letter[0] -= 1; - } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); - - if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt, netres.lpLocalName); + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + } + else + { + for (index = 0; index < providerTable->numProviders; index++) + { + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + if (ret == WN_SUCCESS || ret == WN_ALREADY_CONNECTED) + break; + } + } return ret; }

1 0

Huw Davies : riched20: Update the auto url detection after a StreamIn.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: adb43b91922404f76a3952d8be1c2608fe2479ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb43b91922404f76a3952d8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 11 11:32:04 2016 +0100 riched20: Update the auto url detection after a StreamIn. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ec72e2..fb77a67 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1559,8 +1559,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { + ME_Cursor start; + from = ME_GetCursorOfs(&editor->pCursors[0]); if (format & SF_RTF) { - from = ME_GetCursorOfs(&editor->pCursors[0]); /* setup the RTF parser */ memset(&parser, 0, sizeof parser); @@ -1662,12 +1663,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre style = parser.style; } else if (format & SF_TEXT) + { num_read = ME_StreamInText(editor, format, &inStream, style); + to = ME_GetCursorOfs(&editor->pCursors[0]); + } else ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) ME_SetSelection(editor, 0, 0); + ME_CursorFromCharOfs(editor, from, &start); + ME_UpdateLinkAttribute(editor, &start, to - from); } /* Restore saved undo mode */

1 0

Hugh McMaster : server: Get and set the console color table.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 2d7c73d802f7a8c09cf8896609c1c8c66acb1bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7c73d802f7a8c09cf889660… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:34 2016 +0000 server: Get and set the console color table. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++++- programs/wineconsole/wineconsole.c | 23 ++++++++++++++++++++++- server/console.c | 9 +++++++++ server/protocol.def | 3 +++ server/trace.c | 20 ++++++++++++++------ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b221570..5a6e277 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1947,6 +1947,7 @@ struct set_console_output_info_request short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_50[6]; }; struct set_console_output_info_reply @@ -1960,6 +1961,7 @@ struct set_console_output_info_reply #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 @@ -1986,6 +1988,7 @@ struct get_console_output_info_reply short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_38[2]; }; @@ -6245,6 +6248,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 507 +#define SERVER_PROTOCOL_VERSION 508 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e5e2823..b9da7b6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -212,6 +212,27 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) } /****************************************************************** + * WINECON_SetColors + * + * + */ +static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) +{ + size_t color_map_size = sizeof(data->curcfg.color_map); + + memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + + SERVER_START_REQ( set_console_output_info ) + { + req->handle = wine_server_obj_handle( data->hConOut ); + req->mask = SET_CONSOLE_OUTPUT_INFO_COLORTABLE; + wine_server_add_data( req, cfg->color_map, color_map_size ); + wine_server_call( req ); + } + SERVER_END_REQ; +} + +/****************************************************************** * WINECON_GrabChanges * * A change occurs, try to figure out which @@ -449,6 +470,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); SetConsoleTextAttribute(data->hConOut, cfg->def_attr); } + WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... * since the server checks that sb is always bigger than window, * we have to take care of doing the operations in the right order @@ -703,7 +725,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* fall through */ case init_success: WINECON_GetServerConfig(data); - memcpy(data->curcfg.color_map, cfg.color_map, sizeof(data->curcfg.color_map)); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); diff --git a/server/console.c b/server/console.c index 93f785a..ab764dc 100644 --- a/server/console.c +++ b/server/console.c @@ -147,6 +147,7 @@ struct screen_buffer int max_height; char_info_t *data; /* the data for each cell - a width x height matrix */ unsigned short attr; /* default attribute for screen buffer */ + unsigned int color_map[16]; /* color table */ rectangle_t win; /* current visible window on the screen buffer * * as seen in wineconsole */ struct font_info font; /* console font information */ @@ -426,6 +427,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->data = NULL; screen_buffer->font.width = 0; screen_buffer->font.height = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd == -1) @@ -1032,6 +1034,11 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, screen_buffer->font.width = req->font_width; screen_buffer->font.height = req->font_height; } + if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, get_req_data(), + min( sizeof(screen_buffer->color_map), get_req_data_size() )); + } return 1; } @@ -1690,6 +1697,8 @@ DECL_HANDLER(get_console_output_info) reply->max_height = screen_buffer->max_height; reply->font_width = screen_buffer->font.width; reply->font_height = screen_buffer->font.height; + set_reply_data( screen_buffer->color_map, + min( sizeof(screen_buffer->color_map), get_reply_max_size() )); release_object( screen_buffer ); } } diff --git a/server/protocol.def b/server/protocol.def index 5917212..c11b679 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1537,6 +1537,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x01 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x02 @@ -1545,6 +1546,7 @@ struct console_renderer_event #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 /* Get info about a console (output only) */ @@ -1566,6 +1568,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END /* Add input records to a console input queue */ diff --git a/server/trace.c b/server/trace.c index 9e64b4c..d17564f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -58,9 +58,9 @@ static inline void remove_data( data_size_t size ) cur_size -= size; } -static void dump_uints( const int *ptr, int len ) +static void dump_uints( const char *prefix, const unsigned int *ptr, int len ) { - fputc( '{', stderr ); + fprintf( stderr, "%s{", prefix ); while (len > 0) { fprintf( stderr, "%08x", *ptr++ ); @@ -407,6 +407,14 @@ static void dump_varargs_ints( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_uints( const char *prefix, data_size_t size ) +{ + const unsigned int *data = cur_data; + + dump_uints( prefix, data, size / sizeof(*data) ); + remove_data( size ); +} + static void dump_varargs_uints64( const char *prefix, data_size_t size ) { const unsigned __int64 *data = cur_data; @@ -574,10 +582,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) - { - fprintf( stderr, ",extended=" ); - dump_uints( (const int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); - } + dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, + sizeof(ctx.ext.i386_regs) / sizeof(int) ); break; case CPU_x86_64: if (ctx.flags & SERVER_CTX_CONTROL) @@ -2035,6 +2041,7 @@ static void dump_set_console_output_info_request( const struct set_console_outpu fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_get_console_output_info_request( const struct get_console_output_info_request *req ) @@ -2059,6 +2066,7 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_write_console_input_request( const struct write_console_input_request *req )

1 0

Hugh McMaster : wineconsole: Add 'PopupColors' support to the registry.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b9a79c095e3410ada90d4f04308d97aa9e4e43cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a79c095e3410ada90d4f043… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:45 2016 +0000 wineconsole: Add 'PopupColors' support to the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 20 +++++++++++++++----- programs/wineconsole/winecon_private.h | 3 ++- programs/wineconsole/wineconsole.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index f5fa433..e537a86 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -44,6 +44,7 @@ static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u' static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; +static const WCHAR wszPopupColors[] = {'P','o','p','u','p','C','o','l','o','r','s',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszScreenColors[] = {'S','c','r','e','e','n','C','o','l','o','r','s',0}; @@ -55,12 +56,13 @@ static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x pop-up=%02x font=%s/%u hist=%u/%d flags=%c%c%c " + "msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, - wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', - cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, - cfg->edition_mode, + cfg->popup_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, + cfg->history_nodup ? 1 : 2, cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', + cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, + cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); } @@ -149,6 +151,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->menu_mask = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszPopupColors, 0, &type, (LPBYTE)&val, &count)) + cfg->popup_attr = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszQuickEdit, 0, &type, (LPBYTE)&val, &count)) cfg->quick_edit = val; @@ -209,6 +215,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->history_nodup = 0; cfg->insert_mode = 1; cfg->menu_mask = 0; + cfg->popup_attr = 0xF5; cfg->quick_edit = 0; cfg->sb_height = 25; cfg->sb_width = 80; @@ -293,6 +300,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->popup_attr; + RegSetValueExW(hConKey, wszPopupColors, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->quick_edit; RegSetValueExW(hConKey, wszQuickEdit, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 7236879..d556299 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -32,7 +32,8 @@ struct config_data { unsigned cell_height; /* height in pixels of a character */ int cursor_size; /* in % of cell height */ int cursor_visible; - DWORD def_attr; + DWORD def_attr; /* default fill attributes (screen colors) */ + DWORD popup_attr; /* pop-up color attributes */ WCHAR face_name[32]; /* name of font (size is LF_FACESIZE) */ DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b9da7b6..babc3ef 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -214,13 +214,14 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) /****************************************************************** * WINECON_SetColors * - * + * Sets ColorTable and Pop-up menu colors */ static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) { size_t color_map_size = sizeof(data->curcfg.color_map); memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + data->curcfg.popup_attr = cfg->popup_attr; SERVER_START_REQ( set_console_output_info ) {

1 0

Iván Matellanes : include/msvcrt: Ensure integer limits are given the correct type.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 4f71f42910e705ba4d5a59d58bb33f8bdc8ffce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f71f42910e705ba4d5a59d58… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 10 15:56:06 2016 +0100 include/msvcrt: Ensure integer limits are given the correct type. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index ece8c68..1eb1561 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -22,11 +22,11 @@ #define SHRT_MAX 0x7fff #define USHRT_MAX 0xffff -#define INT_MIN (-0x80000000) +#define INT_MIN (-0x7fffffff - 1) #define INT_MAX 0x7fffffff -#define UINT_MAX 0xffffffff +#define UINT_MAX 0xffffffffU -#define LONG_MIN (-0x80000000L) +#define LONG_MIN (-0x7fffffffL - 1L) #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL

1 0