October 2016 - Wine-Commits

Ken Thomases : winemac: Run a single clipboard manager thread per window station, inside the explorer process.
by Alexandre Julliard Oct. 24, 2016

Oct. 24, 2016

Module: wine Branch: master Commit: fa573553bc52154487396d9d0009a5d8a36bbbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa573553bc52154487396d9d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:32 2016 -0500 winemac: Run a single clipboard manager thread per window station, inside the explorer process. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 377 +++++++++++++++++++++++++++++++++++------ dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 - dlls/winemac.drv/window.c | 2 + 4 files changed, 325 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa573553bc52154487396…

1 0

Hans Leidekker : wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
by Alexandre Julliard Oct. 24, 2016

Oct. 24, 2016

Module: wine Branch: master Commit: c8598a7309ae0c6bebdb5fcaa96c8142b8687340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8598a7309ae0c6bebdb5fcaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:20 2016 +0200 wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f411898..e6dc995 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DUSE_WS_PREFIX MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b344a12..c8c2f4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e int physical; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2111,11 +2111,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) { const SOCKET_ADDRESS *sa = &addr->Address; - WCHAR buf[NI_MAXHOST]; + WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, - 0, NI_NAMEREQD )) return NULL; + 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) @@ -2203,11 +2203,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED;

1 0

Ken Thomases : winemac: Clamp the number of colors to <= 256 in bitmap_info_size().
by Alexandre Julliard Oct. 24, 2016

Oct. 24, 2016

Module: wine Branch: master Commit: 12ea83acb501dc7a9641b7f8d2f5419a2637c5fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ea83acb501dc7a9641b7f8d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:26 2016 -0500 winemac: Clamp the number of colors to <= 256 in bitmap_info_size(). … as is done in user32's and gdi32's version of the same function. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 15f0992..4c66b9f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -395,7 +395,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse) } else /* assume BITMAPINFOHEADER */ { - colors = info->bmiHeader.biClrUsed; + colors = MIN(info->bmiHeader.biClrUsed, 256); if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;

1 0

Ken Thomases : winemac: Remove no-longer-called clipboard entry points.
by Alexandre Julliard Oct. 24, 2016

Oct. 24, 2016

Module: wine Branch: master Commit: 9cedf37205a1e0f1d36f00cd9a4f4e3521b2293f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cedf37205a1e0f1d36f00cd9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:28 2016 -0500 winemac: Remove no-longer-called clipboard entry points. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 294 -------------------------------------- dlls/winemac.drv/winemac.drv.spec | 7 - 2 files changed, 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cedf37205a1e0f1d36f0…

1 0

Ken Thomases : winemac: Remove support for owner-displayed clipboard formats.
by Alexandre Julliard Oct. 24, 2016

Oct. 24, 2016

Module: wine Branch: master Commit: b47183812a857bd85f23fa2700a9a7866d5851a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47183812a857bd85f23fa270… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:22 2016 -0500 winemac: Remove support for owner-displayed clipboard formats. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index bdbd62e..9b5490e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -161,12 +161,7 @@ static const struct } builtin_format_ids[] = { { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPMETAFILEPICT, CFSTR("org.winehq.builtin.dspmetafilepict"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPTEXT, CFSTR("org.winehq.builtin.dsptext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_OWNERDISPLAY, CFSTR("org.winehq.builtin.ownerdisplay"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_RIFF, CFSTR("org.winehq.builtin.riff"), import_clipboard_data, export_clipboard_data, FALSE },

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.21
by Jeremy Newman Oct. 24, 2016

Oct. 24, 2016

Module: website Branch: master Commit: 2da94add40af21d950dec6924a7ee50e11fa52a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2da94add40af21d950dec6… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 22 07:32:39 2016 +0200 Polish translation for release 1.9.21 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016101401.xml b/news/pl/2016101401.xml new file mode 100644 index 0000000..bd68ea2 --- /dev/null +++ b/news/pl/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 14, 2016</date> +<title>Wydano Wine 1.9.21</title> +<body> + Wydanie rozwojowe Wine 1.9.21 jest już dostępne. + <a href="{$root}/announce/1.9.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Początkowa wersja mini sterownika HID.</li> + <li>Obsługa list w elemenie RichEdit.</li> + <li>Ulepszenia do tacki systemowej.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Michael Stefaniuc : mshtml/tests: Use EqualRect() to compare RECTs.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: d930b57ded7b80c2a77d546ae2959bd1e918a60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d930b57ded7b80c2a77d546ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 20 10:19:08 2016 +0200 mshtml/tests: Use EqualRect() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/activex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index bd1a0cd..78602b7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1149,8 +1149,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ok(ip_frame != NULL, "ip_frame == NULL\n"); ok(ip_uiwindow != NULL, "ip_uiwindow == NULL\n"); ok((IOleInPlaceUIWindow*)ip_frame != ip_uiwindow, "ip_frame == ip_uiwindow\n"); - ok(!memcmp(&pos_rect, lprcPosRect, sizeof(RECT)), "pos_rect != lpecPosRect\n"); - ok(!memcmp(&clip_rect, lprcPosRect, sizeof(RECT)), "clip_rect != lpecPosRect\n"); + ok(EqualRect(&pos_rect, lprcPosRect), "pos_rect != lpecPosRect\n"); + ok(EqualRect(&clip_rect, lprcPosRect), "clip_rect != lpecPosRect\n"); ok(frame_info.cb == sizeof(frame_info), "frame_info.cb = %d\n", frame_info.cb); ok(!frame_info.fMDIApp, "frame_info.fMDIApp = %x\n", frame_info.fMDIApp); ok(frame_info.hwndFrame != NULL, "frame_info.hwnd == NULL\n");

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class strstream.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 4df13fff82a75eb59105e61cafb3a0961379a5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df13fff82a75eb59105e61ca… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:01 2016 +0200 msvcirt: Add a partial implementation of class strstream. 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> --- dlls/msvcirt/msvcirt.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 46 +++++++++++++++--------------- dlls/msvcrt20/msvcrt20.spec | 46 +++++++++++++++--------------- dlls/msvcrt40/msvcrt40.spec | 46 +++++++++++++++--------------- 4 files changed, 138 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df13fff82a75eb59105e…

1 0

Aric Stewart : hidclass.sys: Watch return for STATUS_PENDING not IRP status.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: b53846b60b0d94000741e96fc4f24fd04344d54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53846b60b0d94000741e96fc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 05:58:47 2016 +0200 hidclass.sys: Watch return for STATUS_PENDING not IRP status. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/main.c | 4 ++-- dlls/hidclass.sys/pnp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index b9b5a3a..f5a60e9 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -112,9 +112,9 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG buffer, out_size, TRUE, NULL, &irp_status); IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - IoCallDriver(device, irp); + status = IoCallDriver(device, irp); - if (irp->IoStatus.u.Status == STATUS_PENDING) + if (status == STATUS_PENDING) WaitForSingleObject(event, INFINITE); memcpy(out_buff, buffer, out_size); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1e607df..5df7692 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -61,8 +61,8 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH irpsp->Parameters.QueryId.IdType = type; IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - IoCallDriver(device, irp); - if (irp->IoStatus.u.Status == STATUS_PENDING) + status = IoCallDriver(device, irp); + if (status == STATUS_PENDING) WaitForSingleObject(event, INFINITE); *id = (WCHAR*)irp->IoStatus.Information;

1 0

Iván Matellanes : msvcirt: Implement stdiostream constructors.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 6d1901f88564ac1ef1bd96c21a123b09654fc80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1901f88564ac1ef1bd96c21… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:04 2016 +0200 msvcirt: Implement stdiostream constructors. 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> --- dlls/msvcirt/msvcirt.c | 15 +++- dlls/msvcirt/tests/msvcirt.c | 177 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d1901f88564ac1ef1bd9…

1 0