October 2016 - Wine-commits

Vincent Povirk : gdiplus: Implement GdipIsOutlineVisiblePathPoint.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 88168d4b3d531da2e707efb8b944365ec22fa0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88168d4b3d531da2e707efb8b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 20 15:21:28 2016 -0500 gdiplus: Implement GdipIsOutlineVisiblePathPoint. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8ba0016..b6ec88d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1581,17 +1581,49 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath* path, INT x, INT y, GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y, GpPen *pen, GpGraphics *graphics, BOOL *result) { - static int calls; + GpStatus stat; + GpPath *wide_path; + GpMatrix *transform = NULL; TRACE("(%p,%0.2f,%0.2f,%p,%p,%p)\n", path, x, y, pen, graphics, result); if(!path || !pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + stat = GdipClonePath(path, &wide_path); - return NotImplemented; + if (stat != Ok) + return stat; + + if (pen->unit == UnitPixel && graphics != NULL) + { + stat = GdipCreateMatrix(&transform); + + if (stat == Ok) + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, transform); + } + + if (stat == Ok) + stat = GdipWidenPath(wide_path, pen, transform, 1.0); + + if (pen->unit == UnitPixel && graphics != NULL) + { + if (stat == Ok) + stat = GdipInvertMatrix(transform); + + if (stat == Ok) + stat = GdipTransformPath(wide_path, transform); + } + + if (stat == Ok) + stat = GdipIsVisiblePathPoint(wide_path, x, y, graphics, result); + + GdipDeleteMatrix(transform); + + GdipDeletePath(wide_path); + + return stat; } GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath* path, INT x, INT y, GpGraphics *graphics, BOOL *result)

1 0

Ken Thomases : server: Make disconnecting a named pipe immediately close the client' s connection and allow the server to initiate a new connection.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 780ede1cdeb17ac9136dc2ae0fea103884596dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=780ede1cdeb17ac9136dc2ae0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 14:31:50 2016 -0500 server: Make disconnecting a named pipe immediately close the client's connection and allow the server to initiate a new connection. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index cfee4d5..b032901 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -60,7 +60,6 @@ enum pipe_state ps_wait_open, ps_connected_server, ps_wait_disconnect, - ps_disconnected_server, ps_wait_connect }; @@ -344,7 +343,6 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state assert( !server->fd ); set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING ); break; - case ps_disconnected_server: case ps_wait_connect: assert( !server->fd ); set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED ); @@ -430,9 +428,6 @@ static void pipe_client_destroy( struct object *obj) do a successful flush without it. */ set_server_state( server, ps_wait_disconnect ); break; - case ps_disconnected_server: - set_server_state( server, ps_wait_connect ); - break; case ps_idle_server: case ps_wait_open: case ps_wait_disconnect: @@ -623,9 +618,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a case ps_connected_server: set_error( STATUS_PIPE_CONNECTED ); break; - case ps_disconnected_server: - set_error( STATUS_PIPE_BUSY ); - break; case ps_wait_disconnect: set_error( STATUS_NO_DATA_DETECTED ); break; @@ -644,10 +636,11 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a notify_empty( server ); - /* dump the client and server fds, but keep the pointers - around - client loses all waiting data */ + /* dump the client and server fds - client loses all waiting data */ do_disconnect( server ); - set_server_state( server, ps_disconnected_server ); + server->client->server = NULL; + server->client = NULL; + set_server_state( server, ps_wait_connect ); break; case ps_wait_disconnect: assert( !server->client ); @@ -658,7 +651,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a case ps_wait_open: set_error( STATUS_PIPE_LISTENING ); break; - case ps_disconnected_server: case ps_wait_connect: set_error( STATUS_PIPE_DISCONNECTED ); break;

1 0

Ken Thomases : kernel32/tests: Test that ConnectNamedPipe() works immediately after DisconnectNamedPipe() without waiting for the client to close.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: e85f0e0c3b5b542a2f9cc527976d470445c96166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85f0e0c3b5b542a2f9cc5279… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 14:31:51 2016 -0500 kernel32/tests: Test that ConnectNamedPipe() works immediately after DisconnectNamedPipe() without waiting for the client to close. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf7e3ba..6c311a4 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2060,6 +2060,20 @@ static DWORD CALLBACK overlapped_server(LPVOID arg) ok(ret == 1, "ret %d\n", ret); DisconnectNamedPipe(pipe); + + ret = ConnectNamedPipe(pipe, &ol); + err = GetLastError(); + ok(ret == 0, "ret %d\n", ret); + ok(err == ERROR_IO_PENDING, "gle %d\n", err); + CancelIo(pipe); + ret = WaitForSingleObjectEx(ol.hEvent, INFINITE, 1); + ok(ret == WAIT_OBJECT_0, "ret %x\n", ret); + + ret = GetOverlappedResult(pipe, &ol, &num, 1); + err = GetLastError(); + ok(ret == 0, "ret %d\n", ret); + ok(err == ERROR_OPERATION_ABORTED, "gle %d\n", err); + CloseHandle(ol.hEvent); CloseHandle(pipe); return 1;

1 0

Jeremy Newman : update for 2016
by Jeremy Newman 21 Oct '16

21 Oct '16

Module: website Branch: master Commit: 51af701cec7f1a555269e689ef0b560a1a718b1a URL: http://source.winehq.org/git/website.git/?a=commit;h=51af701cec7f1a555269e6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 21 11:44:30 2016 -0500 update for 2016 --- templates/en/wineconf/rsvp.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 3b4db57..7df2564 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,4 +1,4 @@ - + <iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe>

1 0

Andrey Gusev : wpc: Fix TRACE for WindowsParentalControls_CreateInstance.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 8a3f1a0754bd9db2c913ed531ccdc47b4f1233de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3f1a0754bd9db2c913ed531… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Oct 16 19:45:42 2016 +0300 wpc: Fix TRACE for WindowsParentalControls_CreateInstance. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/wpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 10468e9..ef2d6dd 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -104,7 +104,7 @@ static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *ifac { static IWindowsParentalControls wpc = { &WindowsParentalControlsVtbl }; - TRACE("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); return IWindowsParentalControls_QueryInterface(&wpc, riid, ppv); }

1 0

Austin English : api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 80aee498f0082f5b346f30c4628348306b5cd7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=80aee498f0082f5b346f30c46… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 01:09:25 2016 -0500 api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 69136d5..d2966f5 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,4 +1,15 @@ +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Alexandre Julliard : rpcrt4: Remove noisy fixme.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 7b0c2cdbcd64cffa2f5c5a37f55799b114132b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c2cdbcd64cffa2f5c5a37f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 15:19:02 2016 -0700 rpcrt4: Remove noisy fixme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4ba17a0..67a0220 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -400,7 +400,6 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ - FIXME("Using local computer name as NetworkAddr\n"); new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) {

1 0

Detlef Riekenberg : winspool: Add our driver for all usable Printer environments.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 686cfe3aaf21467e02118c324cd69ab84eca56f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686cfe3aaf21467e02118c324… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 19 12:53:24 2016 +0200 winspool: Add our driver for all usable Printer environments. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4dea531..2f0ff3d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -583,31 +583,38 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) { DRIVER_INFO_3W di3; + unsigned int i; + BOOL res; ZeroMemory(&di3, sizeof(DRIVER_INFO_3W)); di3.cVersion = 3; di3.pName = (WCHAR*)name; - di3.pEnvironment = envname_x86W; di3.pDriverPath = driver_nt; di3.pDataFile = ppd; di3.pConfigFile = driver_nt; di3.pDefaultDataType = rawW; - if (AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ) || - (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) + for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) { - di3.cVersion = 0; - di3.pEnvironment = envname_win40W; - di3.pDriverPath = driver_9x; - di3.pConfigFile = driver_9x; - if (AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ) || - (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) + di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; + if (all_printenv[i]->envname == envname_win40W) { - return TRUE; + /* We use wineps16.drv as driver for 16 bit */ + di3.pDriverPath = driver_9x; + di3.pConfigFile = driver_9x; + } + res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); + TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); + + if (!res & (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + { + ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), + debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath)); + return FALSE; } } - ERR("failed with %u for %s (%s)\n", GetLastError(), debugstr_w(di3.pDriverPath), debugstr_w(di3.pEnvironment)); - return FALSE; + + return TRUE; } static inline char *expand_env_string( char *str, DWORD type )

1 0

Nikolay Sivov : d2d1: Initial implementation of bitmap render target.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: e9da184bbd32e3e668c098da75730a0a50526bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9da184bbd32e3e668c098da7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 19 20:00:21 2016 +0300 d2d1: Initial implementation of bitmap render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/bitmap_render_target.c | 832 +++++++++++++++++++++++++++++++++++++++ dlls/d2d1/brush.c | 4 +- dlls/d2d1/d2d1_private.h | 18 +- dlls/d2d1/render_target.c | 68 ++-- dlls/d2d1/tests/d2d1.c | 13 +- 6 files changed, 895 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9da184bbd32e3e668c09…

1 0

Alistair Leslie-Hughes : comtrl32/treeview: Display state value as hex.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 6fdf4920227de6ea89319d3cec7697278a2863f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fdf4920227de6ea89319d3ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 20 06:38:56 2016 +0000 comtrl32/treeview: Display state value as hex. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 117b309..70d6362 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4448,7 +4448,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, newSelect)); - TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state %d\n", + TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state 0x%x\n", newSelect, TREEVIEW_ItemName(newSelect), action, cause, newSelect ? newSelect->state : 0); @@ -4523,7 +4523,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, break; } - TRACE("Leaving state %d\n", newSelect ? newSelect->state : 0); + TRACE("Leaving state 0x%x\n", newSelect ? newSelect->state : 0); return TRUE; }

1 0