Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WIN32SS][FREETYPE] Update copyright text
by Katayama Hirofumi MZ 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=994a5f457fdec69e04707… commit 994a5f457fdec69e047078c0204f1fe1d6b63a04 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 28 23:30:48 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 29 15:23:58 2018 +0200 [WIN32SS][FREETYPE] Update copyright text --- win32ss/gdi/ntgdi/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index efc3ad316a..c201b3d698 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5,7 +5,7 @@ * PURPOSE: FreeType font engine interface * PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers. * Copyright 2006 Dmitry Timoshkov for CodeWeavers. - * Copyright 2016-2017 Katayama Hirofumi MZ. + * Copyright 2016-2018 Katayama Hirofumi MZ. */ /** Includes ******************************************************************/

1 0

01/01: [NTOSKNRL] Only allocate a MDL if we have an output length
by Pierre Schweitzer 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf3b9d5b56e1b0cf43513… commit cf3b9d5b56e1b0cf435139736e44711c752ad621 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jul 29 13:58:30 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jul 29 13:58:30 2018 +0200 [NTOSKNRL] Only allocate a MDL if we have an output length For user mode, when probing output buffer, if it's null, length will also be set to 0. This avoids user mode applications being able to trigger various asserts in ReactOS (and thus BSOD when no debugger is plugged ;-)). --- ntoskrnl/io/iomgr/iofunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index fa4886976d..d119f851e1 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -580,7 +580,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, } /* Check if we got an output buffer */ - if (OutputBuffer) + if (OutputBufferLength) { /* Allocate the System Buffer */ Irp->MdlAddress = IoAllocateMdl(OutputBuffer,

1 0

01/01: [WIN32SS] Add 5 members to FONTGDI structure
by Katayama Hirofumi MZ 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30830ca96399724915aa2… commit 30830ca96399724915aa20a43a42fb8d850a1aff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 28 23:24:26 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 29 13:11:48 2018 +0200 [WIN32SS] Add 5 members to FONTGDI structure --- win32ss/gdi/eng/engobjects.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index 348774bba5..c79832aff9 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -153,6 +153,13 @@ typedef struct _FONTGDI { BYTE OriginalItalic; LONG OriginalWeight; BYTE CharSet; + + /* Precomputed font metrics (supplements FreeType metrics) */ + LONG tmHeight; + LONG tmAscent; + LONG tmDescent; + LONG tmInternalLeading; + LONG EmHeight; } FONTGDI, *PFONTGDI; typedef struct _PATHGDI {

1 0

01/01: [WIN32SS][FONT] Change the type of 2nd argument of IntRequestFontSize
by Katayama Hirofumi MZ 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e1a099cd109e6c54d795… commit 5e1a099cd109e6c54d795ecdd377a9450d3f1721 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 28 23:37:03 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 29 13:11:18 2018 +0200 [WIN32SS][FONT] Change the type of 2nd argument of IntRequestFontSize --- win32ss/gdi/ntgdi/freetype.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 4ae74fced1..efc3ad316a 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2995,9 +2995,10 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b } static INT -IntRequestFontSize(PDC dc, FT_Face face, LONG Width, LONG Height) +IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG Width, LONG Height) { FT_Size_RequestRec req; + FT_Face face = FontGDI->SharedFace->Face; if (Width < 0) Width = -Width; @@ -3079,7 +3080,7 @@ TextIntUpdateSize(PDC dc, plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - error = IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); + error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); if (bDoLock) IntUnLockFreeType(); @@ -3918,7 +3919,7 @@ ftGdiGetTextMetricsW( Face = FontGDI->SharedFace->Face; IntLockFreeType(); - Error = IntRequestFontSize(dc, Face, plf->lfWidth, plf->lfHeight); + Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc)); IntUnLockFreeType(); if (0 != Error) @@ -6085,7 +6086,7 @@ NtGdiGetCharABCWidthsW( plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; IntLockFreeType(); - IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); + IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++) @@ -6281,7 +6282,7 @@ NtGdiGetCharWidthW( plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; IntLockFreeType(); - IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); + IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++)

1 0

01/01: [RPCRT4] Update the support for remote pipes which was dropped by the sync to Wine Staging 2.9 and update rpcrt4_ros.diff accordingly
by Eric Kohl 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24cd7bbe0bca5d4b1e87e… commit 24cd7bbe0bca5d4b1e87e8ed5cfd9d53a0cbc660 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 29 07:30:43 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 29 07:30:43 2018 +0200 [RPCRT4] Update the support for remote pipes which was dropped by the sync to Wine Staging 2.9 and update rpcrt4_ros.diff accordingly --- dll/win32/rpcrt4/rpc_transport.c | 24 ++- dll/win32/rpcrt4/rpcrt4_ros.diff | 427 +++++++++++++-------------------------- 2 files changed, 161 insertions(+), 290 deletions(-) diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c index 8d8a7be3af..7672ce3ef5 100644 --- a/dll/win32/rpcrt4/rpc_transport.c +++ b/dll/win32/rpcrt4/rpc_transport.c @@ -258,14 +258,24 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq return r; } -static char *ncacn_pipe_name(const char *endpoint) +static char *ncacn_pipe_name(const char *server, const char *endpoint) { - static const char prefix[] = "\\\\."; + static const char prefix[] = "\\\\"; + static const char local[] = "."; + char ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; char *pipe_name; + DWORD bufLen = ARRAYSIZE(ComputerName); + + GetComputerNameA(ComputerName, &bufLen); + + if (server == NULL || *server == 0 || stricmp(ComputerName, server) == 0) + server = local; /* protseq=ncacn_np: named pipes */ - pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); - strcat(strcpy(pipe_name, prefix), endpoint); + pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(server) + strlen(endpoint)); + strcpy(pipe_name, prefix); + strcat(pipe_name, server); + strcat(pipe_name, endpoint); return pipe_name; } @@ -279,7 +289,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) if (npc->pipe) return RPC_S_OK; - pname = ncacn_pipe_name(Connection->Endpoint); + pname = ncacn_pipe_name(Connection->NetworkAddr, Connection->Endpoint); r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); I_RpcFree(pname); @@ -307,7 +317,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse if (r != RPC_S_OK) return r; - ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(Connection->Endpoint); + ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(NULL, Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection); EnterCriticalSection(&protseq->cs); @@ -358,7 +368,7 @@ static RPC_STATUS rpcrt4_ncacn_np_is_server_listening(const char *endpoint) char *pipe_name; RPC_STATUS status; - pipe_name = ncacn_pipe_name(endpoint); + pipe_name = ncacn_pipe_name(NULL, endpoint); status = is_pipe_listening(pipe_name); I_RpcFree(pipe_name); return status; diff --git a/dll/win32/rpcrt4/rpcrt4_ros.diff b/dll/win32/rpcrt4/rpcrt4_ros.diff index 6441791035..ea7412c191 100644 --- a/dll/win32/rpcrt4/rpcrt4_ros.diff +++ b/dll/win32/rpcrt4/rpcrt4_ros.diff @@ -63,9 +63,35 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_epmap.c e:\reactos\dll\win32\rpcrt4/rpc_epmap case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_transport.c ---- e:\wine\dlls\rpcrt4/rpc_transport.c 2016-11-16 17:33:13 +0100 -+++ e:\reactos\dll\win32\rpcrt4/rpc_transport.c 2016-11-17 00:00:46 +0100 -@@ -82,6 +79,7 @@ +--- e:\wine\dlls\rpcrt4/rpc_transport.c 2018-07-28 18:12:19 +0000 ++++ e:\reactos\dll\win32\rpcrt4/rpc_transport.c 2018-07-28 18:28:54 +0000 +@@ -25,6 +25,9 @@ + + #include "ntstatus.h" + #define WIN32_NO_STATUS ++#ifdef __REACTOS__ ++#define NONAMELESSUNION ++#endif + #include "ws2tcpip.h" + + #include <stdarg.h> +@@ -32,12 +35,14 @@ + #include <string.h> + #include <assert.h> + ++ ++ + #include "windef.h" + #include "winbase.h" + #include "winnls.h" + #include "winerror.h" + #include "wininet.h" +-#include "winternl.h" ++#include "wine/winternl.h" + #include "winioctl.h" + #include "wine/unicode.h" + +@@ -54,10 +59,26 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) @@ -73,302 +99,137 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_t #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) WINE_DEFAULT_DEBUG_CHANNEL(rpc); -@@ -94,31 +92,41 @@ typedef struct _RpcConnection_np - { - RpcConnection common; - HANDLE pipe; -- HANDLE listen_thread; -+ OVERLAPPED ovl; - BOOL listening; - } RpcConnection_np; - static RpcConnection *rpcrt4_conn_np_alloc(void) - { - RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_np)); -+ if (npc) -+ { -+ npc->pipe = NULL; -+ memset(&npc->ovl, 0, sizeof(npc->ovl)); -+ npc->listening = FALSE; -+ } - return &npc->common; - } - --static DWORD CALLBACK listen_thread(void *arg) -+static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) - { -- RpcConnection_np *npc = arg; -+ if (npc->listening) -+ return RPC_S_OK; ++#ifdef __REACTOS__ /* FIXME: Inspect */ ++BOOL WINAPI CancelIoEx(HANDLE handle, LPOVERLAPPED lpOverlapped) ++{ ++ IO_STATUS_BLOCK io_status; + -+ npc->listening = TRUE; - for (;;) - { -- if (ConnectNamedPipe(npc->pipe, NULL)) -+ if (ConnectNamedPipe(npc->pipe, &npc->ovl)) - return RPC_S_OK; - - switch(GetLastError()) - { - case ERROR_PIPE_CONNECTED: -+ SetEvent(npc->ovl.hEvent); -+ return RPC_S_OK; -+ case ERROR_IO_PENDING: -+ /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; -- case ERROR_HANDLES_CLOSED: -- /* connection closed during listen */ -- return RPC_S_NO_CONTEXT_AVAILABLE; - case ERROR_NO_DATA_DETECTED: - /* client has disconnected, retry */ - DisconnectNamedPipe( npc->pipe ); -@@ -131,6 +139,7 @@ static DWORD CALLBACK listen_thread(void - } - } - -+#ifndef __REACTOS__ - static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) - { - if (npc->listening) -@@ -146,13 +155,14 @@ static RPC_STATUS rpcrt4_conn_listen_pip - } - return RPC_S_OK; - } ++ NtCancelIoFile(handle, &io_status); ++ if (io_status.u.Status) ++ { ++ SetLastError( RtlNtStatusToDosError( io_status.u.Status ) ); ++ return FALSE; ++ } ++ return TRUE; ++} +#endif - - static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) - { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - TRACE("listening on %s\n", pname); - -- npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, -+ npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, - PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); -@@ -164,6 +174,9 @@ static RPC_STATUS rpcrt4_conn_create_pip - return RPC_S_CANT_CREATE_ENDPOINT; - } - -+ memset(&npc->ovl, 0, sizeof(npc->ovl)); -+ npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + - /* Note: we don't call ConnectNamedPipe here because it must be done in the - * server thread as the thread must be alertable */ - return RPC_S_OK; -@@ -210,6 +223,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( - if (err == ERROR_PIPE_BUSY) { - TRACE("connection failed, error=%x\n", err); - return RPC_S_SERVER_TOO_BUSY; -+ } else if (err == ERROR_BAD_NETPATH) { -+ TRACE("connection failed, error=%x\n", err); -+ return RPC_S_SERVER_UNAVAILABLE; - } - if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { - err = GetLastError(); -@@ -219,9 +235,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( - } + static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); - /* success */ -+ memset(&npc->ovl, 0, sizeof(npc->ovl)); - /* pipe is connected; change to message-read mode. */ - dwMode = PIPE_READMODE_MESSAGE; - SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); -+ npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->pipe = pipe; + /**** ncacn_np support ****/ +@@ -237,14 +258,24 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc + return r; + } - return RPC_S_OK; -@@ -304,15 +322,64 @@ static char *ncacn_pipe_name(const char - static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) +-static char *ncacn_pipe_name(const char *endpoint) ++static char *ncacn_pipe_name(const char *server, const char *endpoint) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; +- static const char prefix[] = "\\\\."; + static const char prefix[] = "\\\\"; + static const char local[] = "."; -+ BOOL bUseLocalName = TRUE; -+ CHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; -+ DWORD bufLen = sizeof(ComputerName)/sizeof(ComputerName[0]); - RPC_STATUS r; - LPSTR pname; -+ LPSTR NetworkAddr; -+ INT size; ++ char ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + char *pipe_name; ++ DWORD bufLen = ARRAYSIZE(ComputerName); ++ ++ GetComputerNameA(ComputerName, &bufLen); ++ ++ if (server == NULL || *server == 0 || stricmp(ComputerName, server) == 0) ++ server = local; + + /* protseq=ncacn_np: named pipes */ +- pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); +- strcat(strcpy(pipe_name, prefix), endpoint); ++ pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(server) + strlen(endpoint)); ++ strcpy(pipe_name, prefix); ++ strcat(pipe_name, server); ++ strcat(pipe_name, endpoint); + return pipe_name; + } - /* already connected? */ +@@ -258,7 +289,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R if (npc->pipe) return RPC_S_OK; - pname = ncacn_pipe_name(Connection->Endpoint); -- r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); -+ /* protseq=ncacn_np: named pipes */ -+ size = strlen(prefix); -+ -+ if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) -+ { -+ bUseLocalName = TRUE; -+ size += strlen(local); -+ } -+ else -+ { -+ NetworkAddr = Connection->NetworkAddr; -+ if (NetworkAddr[0] == '\\' && NetworkAddr[1] == '\\') -+ NetworkAddr += 2; -+ -+ if (GetComputerNameA(ComputerName, &bufLen)) -+ { -+ if (stricmp(ComputerName, NetworkAddr) == 0) -+ { -+ bUseLocalName = TRUE; -+ size += strlen(local); -+ } -+ else -+ { -+ bUseLocalName = FALSE; -+ size += strlen(NetworkAddr); -+ } -+ } -+ else -+ { -+ bUseLocalName = FALSE; -+ size += strlen(NetworkAddr); -+ } -+ } -+ -+ size += strlen(Connection->Endpoint) + 1; -+ -+ pname = I_RpcAllocate(size); -+ strcpy(pname, prefix); -+ if (bUseLocalName) -+ strcat(pname, local); -+ else -+ strcat(pname, NetworkAddr); -+ strcat(pname, Connection->Endpoint); -+ r = rpcrt4_conn_open_pipe(Connection, pname, TRUE); ++ pname = ncacn_pipe_name(Connection->NetworkAddr, Connection->Endpoint); + r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); I_RpcFree(pname); - return r; -@@ -358,9 +425,9 @@ static void rpcrt4_conn_np_handoff(RpcCo - * to the child, then reopen the server binding to continue listening */ - - new_npc->pipe = old_npc->pipe; -- new_npc->listen_thread = old_npc->listen_thread; -+ new_npc->ovl = old_npc->ovl; - old_npc->pipe = 0; -- old_npc->listen_thread = 0; -+ memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); - old_npc->listening = FALSE; - } - -@@ -444,20 +511,29 @@ static int rpcrt4_conn_np_read(RpcConnec - void *buffer, unsigned int count) - { - RpcConnection_np *npc = (RpcConnection_np *) Connection; -- IO_STATUS_BLOCK io_status; - char *buf = buffer; -+ BOOL ret = TRUE; - unsigned int bytes_left = count; -- NTSTATUS status; -+ OVERLAPPED ovl; -+ -+ ZeroMemory(&ovl, sizeof(ovl)); -+ ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - - while (bytes_left) - { -- status = NtReadFile(npc->pipe, NULL, NULL, NULL, &io_status, buf, bytes_left, NULL, NULL); -- if (status && status != STATUS_BUFFER_OVERFLOW) -- return -1; -- bytes_left -= io_status.Information; -- buf += io_status.Information; -+ DWORD bytes_read; -+ ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl); -+ if (!ret && GetLastError() == ERROR_IO_PENDING) -+ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); -+ if (!ret && GetLastError() == ERROR_MORE_DATA) -+ ret = TRUE; -+ if (!ret || !bytes_read) -+ break; -+ bytes_left -= bytes_read; -+ buf += bytes_read; - } -- return count; -+ CloseHandle(ovl.hEvent); -+ return ret ? count : -1; - } - - static int rpcrt4_conn_np_write(RpcConnection *Connection, -@@ -467,16 +543,23 @@ static int rpcrt4_conn_np_write(RpcConne - const char *buf = buffer; - BOOL ret = TRUE; - unsigned int bytes_left = count; -+ OVERLAPPED ovl; -+ -+ ZeroMemory(&ovl, sizeof(ovl)); -+ ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - - while (bytes_left) - { - DWORD bytes_written; -- ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); -+ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl); -+ if (!ret && GetLastError() == ERROR_IO_PENDING) -+ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); - if (!ret || !bytes_written) - break; - bytes_left -= bytes_written; - buf += bytes_written; - } -+ CloseHandle(ovl.hEvent); - return ret ? count : -1; - } - -@@ -488,9 +571,9 @@ static int rpcrt4_conn_np_close(RpcConne - CloseHandle(npc->pipe); - npc->pipe = 0; - } -- if (npc->listen_thread) { -- CloseHandle(npc->listen_thread); -- npc->listen_thread = 0; -+ if (npc->ovl.hEvent) { -+ CloseHandle(npc->ovl.hEvent); -+ npc->ovl.hEvent = 0; - } - return 0; - } -@@ -694,7 +777,7 @@ static void *rpcrt4_protseq_np_get_wait_ - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { - rpcrt4_conn_listen_pipe(conn); -- if (conn->listen_thread) -+ if (conn->ovl.hEvent) - (*count)++; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); +@@ -286,7 +317,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_n + if (r != RPC_S_OK) + return r; + +- ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(Connection->Endpoint); ++ ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(NULL, Connection->Endpoint); + r = rpcrt4_conn_create_pipe(Connection); + + EnterCriticalSection(&protseq->cs); +@@ -337,7 +368,7 @@ static RPC_STATUS rpcrt4_ncacn_np_is_ser + char *pipe_name; + RPC_STATUS status; + +- pipe_name = ncacn_pipe_name(endpoint); ++ pipe_name = ncacn_pipe_name(NULL, endpoint); + status = is_pipe_listening(pipe_name); + I_RpcFree(pipe_name); + return status; +@@ -395,10 +426,14 @@ static int rpcrt4_conn_np_read(RpcConnec + if (connection->read_closed) + { + IO_STATUS_BLOCK io_status; ++#ifdef __REACTOS__ /* FIXME: We should also cancel I/O for other threads */ ++ NtCancelIoFile(connection->pipe, &io_status); ++#else + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); ++#endif + } + WaitForSingleObject(event, INFINITE); +- status = connection->io_status.Status; ++ status = connection->io_status.u.Status; } -@@ -715,7 +798,7 @@ static void *rpcrt4_protseq_np_get_wait_ - *count = 1; - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { -- if ((objs[*count] = conn->listen_thread)) -+ if ((objs[*count] = conn->ovl.hEvent)) - (*count)++; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + release_np_event(connection, event); + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : connection->io_status.Information; +@@ -419,7 +454,7 @@ static int rpcrt4_conn_np_write(RpcConne + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); +- status = io_status.Status; ++ status = io_status.u.Status; } -@@ -762,18 +845,12 @@ static int rpcrt4_protseq_np_wait_for_ne - EnterCriticalSection(&protseq->cs); - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { -- if (b_handle == conn->listen_thread) break; -+ if (b_handle == conn->ovl.hEvent) break; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + release_np_event(connection, event); + if (status) +@@ -457,7 +492,11 @@ static void rpcrt4_conn_np_close_read(Rp + IO_STATUS_BLOCK io_status; + + connection->read_closed = TRUE; ++#ifdef __REACTOS__ /* FIXME: We should also cancel I/O for other threads */ ++ NtCancelIoFile(connection->pipe, &io_status); ++#else + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); ++#endif + } + + static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) +@@ -675,7 +714,7 @@ static void *rpcrt4_protseq_np_get_wait_ + { + case STATUS_SUCCESS: + case STATUS_PIPE_CONNECTED: +- conn->io_status.Status = status; ++ conn->io_status.u.Status = status; + SetEvent(event); + break; + case STATUS_PENDING: +@@ -756,10 +795,10 @@ static int rpcrt4_protseq_np_wait_for_ne + { + release_np_event(conn, conn->listen_event); + conn->listen_event = NULL; +- if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) ++ if (conn->io_status.u.Status == STATUS_SUCCESS || conn->io_status.u.Status == STATUS_PIPE_CONNECTED) + cconn = rpcrt4_spawn_connection(&conn->common); + else +- ERR("listen failed %x\n", conn->io_status.Status); ++ ERR("listen failed %x\n", conn->io_status.u.Status); + break; + } } - cconn = NULL; - if (conn) -- { -- DWORD exit_code; -- if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) -- RPCRT4_SpawnConnection(&cconn, &conn->common); -- CloseHandle(conn->listen_thread); -- conn->listen_thread = 0; -- } -+ RPCRT4_SpawnConnection(&cconn, &conn->common); - else - ERR("failed to locate connection for handle %p\n", b_handle); - LeaveCriticalSection(&protseq->cs);

1 0

01/01: [ROSDDT] do_update_base(): Fix assignment to f (#702)
by Serge Gautherie 27 Jul '18

27 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f440355da10c594bcc1f… commit 8f440355da10c594bcc1fbae6331ad9da8fcbb99 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Jul 27 21:54:12 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 21:54:12 2018 +0200 [ROSDDT] do_update_base(): Fix assignment to f (#702) Thanks to "devpao" for reporting this. ROSAPPS-343 --- modules/rosapps/applications/sysutils/rosddt/rosddt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/sysutils/rosddt/rosddt.c b/modules/rosapps/applications/sysutils/rosddt/rosddt.c index 7e06fc9834..d64fdd23b0 100644 --- a/modules/rosapps/applications/sysutils/rosddt/rosddt.c +++ b/modules/rosapps/applications/sysutils/rosddt/rosddt.c @@ -146,7 +146,7 @@ static void do_update_base() wchar_t up_url[MAX_PATH]; void *data = NULL; u_long size; - FILE *f = NULL; + FILE *f; if (GetPrivateProfileString(L"URL", L"udpate", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { wprintf(L"Update URL not found in rosddt.ini\n"); return; @@ -156,7 +156,8 @@ static void do_update_base() if (data == http_get(up_url, &size)) { - if (f == _wfopen(gl_ini_file, L"wb")) { + f = _wfopen(gl_ini_file, L"wb"); + if (f) { fwrite(data, 1, size, f); fclose(f); wprintf(L"Update completed\n");

1 0

01/01: [MAN] AnalyzeArgv(): Fix 2 overruns related to element (#703)
by Serge Gautherie 27 Jul '18

27 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d69d40132555772a1f229… commit d69d40132555772a1f229bb3cb9f066e4890d3a3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Jul 27 21:53:50 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 21:53:50 2018 +0200 [MAN] AnalyzeArgv(): Fix 2 overruns related to element (#703) - Also use _countof(). - Also add braces. - Also enforce consistent "no spaces" style. Thanks to "devpao" for pointing to this function. ROSAPPS-344 --- modules/rosapps/applications/sysutils/man/man.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/rosapps/applications/sysutils/man/man.c b/modules/rosapps/applications/sysutils/man/man.c index edc12d2365..3c54eb346a 100644 --- a/modules/rosapps/applications/sysutils/man/man.c +++ b/modules/rosapps/applications/sysutils/man/man.c @@ -88,7 +88,7 @@ Usage() int AnalyzeArgv(char *argument) { - int element=0; + int element; char HelpFlag=0; char *keys[]={"--help","/h","/?","-h"}; char *sections[]={".1",".2",".3",".4",".5",".6",".7",".8",".9"}; @@ -96,25 +96,32 @@ AnalyzeArgv(char *argument) strcpy(filename,argument); //save argument value - for(element=0; element < 5;element++) + for(element=0;element<_countof(keys);element++) + { if(!strcmp(keys[element],argument)) { Usage(); HelpFlag=1; } + } element = 0; if(!HelpFlag) + { if(OpenF(filename)) - while(OpenF(strcat(filename,sections[element])) && (element<9)) + { + while(element<_countof(sections)&&OpenF(strcat(filename,sections[element]))) { strcpy(filename,argument); element++; } - if(element>8) printf("No manual for %s\n",argument); + if(element>=_countof(sections)) printf("No manual for %s\n",argument); + } + + } return element; }

1 0

04/04: [LPK] Changes (#622).
by Baruch Rutman 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65a5a989c587ecbf52197… commit 65a5a989c587ecbf52197346ab1eff8ba0e5e192 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Thu Jul 26 22:08:29 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 00:47:48 2018 +0200 [LPK] Changes (#622). - Changed how the ScriptIsComplex check is made to account direction, most noticeble on dxdiag, https://docs.microsoft.com/en-us/windows/desktop/api/usp10/nf-usp10-scripti… However commented out the ScriptIsComplex flag change because of a bug. - Added a check and debug print if BIDI_Reorder fails. --- dll/win32/lpk/lpk.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index 03ed3268ef..a31d9787a0 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -7,6 +7,7 @@ */ #include "ros_lpk.h" +#include <debug.h> LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMouseToIch, EditCchInWidth, EditGetLineWidth, EditDrawText, EditHScroll, EditMoveSelection, @@ -66,28 +67,32 @@ LpkExtTextOut( LPWORD glyphs = NULL; LPWSTR reordered_str = NULL; INT cGlyphs; - BOOL bResult; + DWORD dwSICFlags = SIC_COMPLEX; + BOOL bResult, bReorder; UNREFERENCED_PARAMETER(unknown); - if (!(fuOptions & ETO_IGNORELANGUAGE)) - fuOptions |= ETO_IGNORELANGUAGE; + fuOptions |= ETO_IGNORELANGUAGE; /* Check text direction */ if ((GetLayout(hdc) & LAYOUT_RTL) || (GetTextAlign(hdc) & TA_RTLREADING)) - { - if (!(fuOptions & ETO_RTLREADING)) - fuOptions |= ETO_RTLREADING; - } + fuOptions |= ETO_RTLREADING; + + /* If text direction is RTL change flag to account neutral characters + BUG: disables reordering of propsheet titles */ + /* if (fuOptions & ETO_RTLREADING) + dwSICFlags = SIC_NEUTRAL; */ /* Check if the string requires complex script processing and not a "glyph indices" array */ - if (ScriptIsComplex(lpString, uCount, SIC_COMPLEX) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) + if (ScriptIsComplex(lpString, uCount, dwSICFlags) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) { + /* reordered_str is used as fallback in case the glyphs array fails to generate, + BIDI_Reorder doesn't attempt to write into reordered_str if memory allocation fails */ reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR)); - BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, - (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, - reordered_str, uCount, NULL, &glyphs, &cGlyphs); + bReorder = BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, + (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, + reordered_str, uCount, NULL, &glyphs, &cGlyphs); if (glyphs) { @@ -95,14 +100,17 @@ LpkExtTextOut( uCount = cGlyphs; } - if (glyphs || reordered_str) + /* Now display the reordered text if any of the arrays is valid and if BIDI_Reorder succeeded */ + if ((glyphs || reordered_str) && bReorder) { bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx); } - else + { + DPRINT1("BIDI_Reorder failed, falling back to original string.\n"); bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, uCount, lpDx); + } HeapFree(GetProcessHeap(), 0, glyphs); HeapFree(GetProcessHeap(), 0, reordered_str); @@ -152,18 +160,17 @@ LpkGetCharacterPlacement( { if (lpGlyphs) StringCchCopyW(lpResults->lpGlyphs, cGlyphs, lpGlyphs); - else if (lpResults->lpOutString) GetGlyphIndicesW(hdc, lpResults->lpOutString, nSet, lpResults->lpGlyphs, 0); } if (lpResults->lpDx) { + int c; + /* If glyph shaping was requested */ if (dwFlags & GCP_GLYPHSHAPE) { - int c; - if (lpResults->lpGlyphs) { for (i = 0; i < lpResults->nGlyphs; i++) @@ -176,8 +183,6 @@ LpkGetCharacterPlacement( else { - int c; - for (i = 0; i < nSet; i++) { if (GetCharWidth32W(hdc, lpResults->lpOutString[i], lpResults->lpOutString[i], &c))

1 0

03/04: [LPK] Added more error handling code (#622).
by Baruch Rutman 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e054a053ffcfada7afa1f… commit e054a053ffcfada7afa1ff438805e530146ebb70 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Mon Jun 18 17:54:15 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 00:47:28 2018 +0200 [LPK] Added more error handling code (#622). - Added a codepath if both glyphs and reordered_str arrays are NULL. - Move variables back to the beginning of function. CORE-14732 --- dll/win32/lpk/lpk.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index 85e2e8faf4..03ed3268ef 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -63,6 +63,11 @@ LpkExtTextOut( const INT *lpDx, INT unknown) { + LPWORD glyphs = NULL; + LPWSTR reordered_str = NULL; + INT cGlyphs; + BOOL bResult; + UNREFERENCED_PARAMETER(unknown); if (!(fuOptions & ETO_IGNORELANGUAGE)) @@ -78,10 +83,7 @@ LpkExtTextOut( /* Check if the string requires complex script processing and not a "glyph indices" array */ if (ScriptIsComplex(lpString, uCount, SIC_COMPLEX) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) { - LPWORD glyphs = NULL; - LPWSTR reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR)); - INT cGlyphs; - BOOL bResult; + reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR)); BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, @@ -90,13 +92,17 @@ LpkExtTextOut( if (glyphs) { fuOptions |= ETO_GLYPH_INDEX; + uCount = cGlyphs; + } - if (uCount != cGlyphs) - uCount = cGlyphs; + if (glyphs || reordered_str) + { + bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, + glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx); } - bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, - glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx); + else + bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, uCount, lpDx); HeapFree(GetProcessHeap(), 0, glyphs); HeapFree(GetProcessHeap(), 0, reordered_str);

1 0

02/04: [LPK] Diverse fixes (#622).
by Baruch Rutman 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fe6a14ede49276cd934b… commit 7fe6a14ede49276cd934bca9f36bad314689ad09 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Mon Jun 18 14:52:57 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 00:47:14 2018 +0200 [LPK] Diverse fixes (#622). - Changed wcspy to strsafe function. - Use GetCharWidthI instead of GetCharWidth32W if dealing with glyph indices. --- dll/win32/lpk/lpk.c | 6 +++--- dll/win32/lpk/ros_lpk.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index 656808ea5b..85e2e8faf4 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -145,7 +145,7 @@ LpkGetCharacterPlacement( if (lpResults->lpGlyphs) { if (lpGlyphs) - wcscpy(lpResults->lpGlyphs, lpGlyphs); + StringCchCopyW(lpResults->lpGlyphs, cGlyphs, lpGlyphs); else if (lpResults->lpOutString) GetGlyphIndicesW(hdc, lpResults->lpOutString, nSet, lpResults->lpGlyphs, 0); @@ -154,7 +154,7 @@ LpkGetCharacterPlacement( if (lpResults->lpDx) { /* If glyph shaping was requested */ - if(dwFlags & GCP_GLYPHSHAPE) + if (dwFlags & GCP_GLYPHSHAPE) { int c; @@ -162,7 +162,7 @@ LpkGetCharacterPlacement( { for (i = 0; i < lpResults->nGlyphs; i++) { - if (GetCharWidth32W(hdc, lpResults->lpGlyphs[i], lpResults->lpGlyphs[i], &c)) + if (GetCharWidthI(hdc, 0, 1, (WORD *)&lpResults->lpGlyphs[i], &c)) lpResults->lpDx[i] = c; } } diff --git a/dll/win32/lpk/ros_lpk.h b/dll/win32/lpk/ros_lpk.h index d82a4498bc..0fb1fe341d 100644 --- a/dll/win32/lpk/ros_lpk.h +++ b/dll/win32/lpk/ros_lpk.h @@ -17,6 +17,7 @@ #include <wingdi.h> #include <winnls.h> #include <usp10.h> +#include <strsafe.h> /* FIXME USP10 api that does not have prototype in any include file */ VOID WINAPI LpkPresent(VOID);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs