August 2018 - Wine-Commits - list.winehq.org

Jacek Caban : server: Allow pipe server fd caching throughout its whole lifetime.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 32169eafe23db1f8cbd65ec94d05c865bca0355e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32169eafe23db1f8cbd65ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:20 2018 +0200 server: Allow pipe server fd caching throughout its whole lifetime. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 10 ---------- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b39e931..932dc7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1693,16 +1693,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); return status; - case FSCTL_PIPE_DISCONNECT: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - if (!status) - { - int fd = server_remove_fd_from_cache( handle ); - if (fd != -1) close( fd ); - } - return status; - case FSCTL_PIPE_IMPERSONATE: FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 66e3607..768567f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1126,6 +1126,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned release_object( server ); return NULL; } + allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; @@ -1218,7 +1219,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE;

1 0

Jacek Caban : server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 8e5bc0daf730e4ee9fa1d43fb35d0a342d826548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5bc0daf730e4ee9fa1d43f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:32 2018 +0200 server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 7a722fe..816ec3e 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1290,7 +1290,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) - todo_wine ok(peek_buf.NamedPipeState == state, "NamedPipeState = %u, expected %u\n", peek_buf.NamedPipeState, state); diff --git a/server/named_pipe.c b/server/named_pipe.c index a1f3723..1ee17b6 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -66,6 +66,7 @@ struct pipe_end struct object obj; /* object header */ struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ + unsigned int state; /* pipe state */ struct pipe_end *connection; /* the other end of the pipe */ process_id_t client_pid; /* process that created the client */ process_id_t server_pid; /* process that created the server */ @@ -394,6 +395,8 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status pipe_end->connection = NULL; + pipe_end->state = status == STATUS_PIPE_DISCONNECTED + ? FILE_PIPE_DISCONNECTED_STATE : FILE_PIPE_CLOSING_STATE; fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); async_wake_up( &pipe_end->read_q, status ); LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) @@ -883,7 +886,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return 0; - buffer->NamedPipeState = 0; /* FIXME */ + buffer->NamedPipeState = pipe_end->state; buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ buffer->MessageLength = message_length; @@ -1005,6 +1008,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_idle_server: case ps_wait_connect: fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -1100,6 +1104,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); @@ -1126,6 +1131,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + client->pipe_end.state = FILE_PIPE_CONNECTED_STATE; client->pipe_end.client_pid = get_process_id( current->process ); client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); @@ -1204,6 +1210,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Jacek Caban : ntdll/tests: Add pipe state tests.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 5efd706c22051fd2d33fd71e4b7cce319f5407fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5efd706c22051fd2d33fd71e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:18 2018 +0200 ntdll/tests: Add pipe state tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 5 + 2 files changed, 295 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5efd706c22051fd2d33f…

1 0

Zhiyi Zhang : iphlpapi: Don't use the client buffer in IcmpSendEcho().
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 417e996e97ebc3ff47d986e322dbaf3b3a83b91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=417e996e97ebc3ff47d986e3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:04:43 2018 +0800 iphlpapi: Don't use the client buffer in IcmpSendEcho(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43252 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 48 +++++++++++++++++++++++++----------------- dlls/iphlpapi/tests/iphlpapi.c | 21 ++++++++++++++---- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ebc2f2b..0d80248 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -113,6 +113,9 @@ typedef struct { #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 +#define MAXIPLEN 60 +#define MAXICMPLEN 76 + /* The sequence number is unique process wide, so that all threads * have a distinct sequence number. */ @@ -268,15 +271,14 @@ DWORD WINAPI IcmpSendEcho( ) { icmp_t* icp=(icmp_t*)IcmpHandle; - unsigned char* reqbuf; - int reqsize; + unsigned char *buffer; + int reqsize, repsize; struct icmp_echo_reply* ier; struct ip* ip_header; struct icmp* icmp_header; char* endbuf; int ip_header_len; - int maxlen; struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; @@ -306,20 +308,23 @@ DWORD WINAPI IcmpSendEcho( seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; reqsize=ICMP_MINLEN+RequestSize; - reqbuf=HeapAlloc(GetProcessHeap(), 0, reqsize); - if (reqbuf==NULL) { + /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ + /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ + repsize = MAXIPLEN + MAXICMPLEN + min( 65535, ReplySize ); + buffer = HeapAlloc(GetProcessHeap(), 0, max( repsize, reqsize )); + if (buffer == NULL) { SetLastError(ERROR_OUTOFMEMORY); return 0; } - icmp_header=(struct icmp*)reqbuf; + icmp_header=(struct icmp*)buffer; icmp_header->icmp_type=ICMP_ECHO; icmp_header->icmp_code=0; icmp_header->icmp_cksum=0; icmp_header->icmp_id=id; icmp_header->icmp_seq=seq; - memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize); - icmp_header->icmp_cksum=cksum=in_cksum((u_short*)reqbuf,reqsize); + memcpy(buffer+ICMP_MINLEN, RequestData, RequestSize); + icmp_header->icmp_cksum=cksum=in_cksum((u_short*)buffer,reqsize); addr.sin_family=AF_INET; addr.sin_addr.s_addr=DestinationAddress; @@ -367,26 +372,22 @@ DWORD WINAPI IcmpSendEcho( fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; - ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); endbuf=(char *) ReplyBuffer+ReplySize; - maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); #if 0 if (TRACE_ON(icmp)){ - unsigned char* buf=(unsigned char*)reqbuf; int i; printf("Output buffer:\n"); for (i=0;i<reqsize;i++) - printf("%2x,", buf[i]); + printf("%2x,", buffer[i]); printf("\n"); } #endif send_time = GetTickCount(); - res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); - HeapFree(GetProcessHeap (), 0, reqbuf); + res=sendto(icp->sid, buffer, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); if (res<0) { if (errno==EMSGSIZE) SetLastError(IP_PACKET_TOO_BIG); @@ -403,14 +404,16 @@ DWORD WINAPI IcmpSendEcho( SetLastError(IP_GENERAL_FAILURE); } } + HeapFree(GetProcessHeap(), 0, buffer); return 0; } /* Get the reply */ + ip_header=(struct ip*)buffer; ip_header_len=0; /* because gcc was complaining */ while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, buffer, repsize, 0, (struct sockaddr*)&addr, &addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; @@ -508,6 +511,12 @@ DWORD WINAPI IcmpSendEcho( else Timeout = 0; continue; } else { + /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ + if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { + res=ier-(ICMP_ECHO_REPLY *)ReplyBuffer; + SetLastError(IP_GENERAL_FAILURE); + goto done; + } /* This is a reply to our packet */ memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); /* Status is already set */ @@ -515,7 +524,7 @@ DWORD WINAPI IcmpSendEcho( ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->Reserved=0; ier->Data=endbuf-ier->DataSize; - memmove(ier->Data,((char*)ip_header)+ip_header_len+ICMP_MINLEN,ier->DataSize); + memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); ier->Options.Ttl=ip_header->ip_ttl; ier->Options.Tos=ip_header->ip_tos; ier->Options.Flags=ip_header->ip_off >> 13; @@ -523,7 +532,7 @@ DWORD WINAPI IcmpSendEcho( if (ier->Options.OptionsSize!=0) { ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->Options.OptionsSize); + memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; @@ -531,9 +540,8 @@ DWORD WINAPI IcmpSendEcho( } /* Prepare for the next packet */ + endbuf-=ier->DataSize; ier++; - ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); - maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ Timeout=0; @@ -542,6 +550,8 @@ DWORD WINAPI IcmpSendEcho( res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); +done: + HeapFree(GetProcessHeap(), 0, buffer); TRACE("received %d replies\n",res); return res; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5613d7..8d71c74 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -951,6 +951,8 @@ static void testIcmpSendEcho(void) char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; + ICMP_ECHO_REPLY *reply; + INT i; if (!pIcmpSendEcho || !pIcmpCreateFile) { @@ -1038,12 +1040,10 @@ todo_wine replysz = sizeof(replydata) - 1; ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); - } SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); @@ -1056,7 +1056,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1064,7 +1063,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); @@ -1111,6 +1109,21 @@ todo_wine { skip ("Failed to ping with error %d, is lo interface down?.\n", error); } + + /* check reply data */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY *)replydata; + ok(ret, "IcmpSendEcho failed unexpectedly\n"); + todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size:%d\n", reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); } /*

1 0

Daniel Lehman : oleaut32/tests: Add test for VarBstrFromI4.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 7198499dd06bd3f39ba71ab63101a65ebe3d5c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7198499dd06bd3f39ba71ab6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 24 15:41:18 2018 -0700 oleaut32/tests: Add test for VarBstrFromI4. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e93a6e6..8c454e2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4540,6 +4540,36 @@ static void test_VarBoolChangeTypeEx(void) * BSTR */ +static void test_VarBstrFromI4(void) +{ + static const WCHAR int_min[] = { '-','2','1','4','7','4','8','3','6','4','8','\0' }; + static const WCHAR minus_42[] = { '-','4','2','\0' }; + BSTR bstr = NULL; + HRESULT hres; + LONG value; + LCID lcid; + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + + value = -2147483648; + hres = VarBstrFromI4(value, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + ok(hres == S_OK, "got hres 0x%08x\n", hres); + if (bstr) + { + todo_wine ok(memcmp(bstr, int_min, sizeof(int_min)) == 0, "string different\n"); + SysFreeString(bstr); + } + + value = -42; + hres = VarBstrFromI4(value, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + ok(hres == S_OK, "got hres 0x%08x\n", hres); + if (bstr) + { + ok(memcmp(bstr, minus_42, sizeof(minus_42)) == 0, "string different\n"); + SysFreeString(bstr); + } +} + static void test_VarBstrFromR4(void) { static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' }; @@ -6347,6 +6377,7 @@ START_TEST(vartype) test_VarBoolCopy(); test_VarBoolChangeTypeEx(); + test_VarBstrFromI4(); test_VarBstrFromR4(); test_VarBstrFromDate(); test_VarBstrFromCy();

1 0

Michael Stefaniuc : imm32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 32c6e823bcd24ea6ac14602c30a67025302c6938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c6e823bcd24ea6ac14602c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Aug 4 22:45:42 2018 +0200 imm32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 685eb01..f235e22 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -308,7 +308,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0; @@ -769,7 +769,7 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); - for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++) new_context->IMC.cfCandForm[i].dwIndex = ~0u; /* Initialize the IME Private */ @@ -1013,8 +1013,7 @@ DWORD WINAPI ImmGetCandidateListA( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1117,8 +1116,7 @@ DWORD WINAPI ImmGetCandidateListW( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1152,7 +1150,7 @@ BOOL WINAPI ImmGetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) @@ -1624,8 +1622,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, sizeof(classW)/sizeof(classW[0])) && - !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1844,7 +1841,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) HKEY hkey; DWORD length; DWORD rc; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); @@ -2062,7 +2059,7 @@ HKL WINAPI ImmInstallIMEW( HKL hkl; DWORD rc; HKEY hkey; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); @@ -2314,7 +2311,7 @@ BOOL WINAPI ImmSetCandidateWindow( wine_dbgstr_point(&lpCandidate->ptCurrentPos), wine_dbgstr_rect(&lpCandidate->rcArea)); - if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate;

1 0

Michael Stefaniuc : shdocvw: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: f22d727e45005ae1cf7f89d5de9be980f6b1e6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f22d727e45005ae1cf7f89d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 8 11:30:15 2018 +0200 shdocvw: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 52c622c..2657dfa 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -386,7 +386,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { - len = sizeof(buffer_in) / sizeof(buffer_in[0]); + len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); @@ -400,7 +400,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L } } - len = sizeof(buffer_out) / sizeof(buffer_out[0]); + len = ARRAY_SIZE(buffer_out); buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; @@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW);

1 0

Alexandre Julliard : quartz: Remove some unnecessary casts.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: fc79250ff7f89b8918d7cecfeb62123a5c4b5de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc79250ff7f89b8918d7cecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 08:38:53 2018 +0200 quartz: Remove some unnecessary casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0a41c71..1a5f76d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -140,7 +140,7 @@ struct Vector }; /* returns the position it was added at */ -static int add_data(struct Vector * v, const BYTE * pData, int size) +static int add_data(struct Vector *v, const void *pData, int size) { int index = v->current; if (v->current + size > v->capacity) @@ -156,7 +156,7 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) return index; } -static int find_data(const struct Vector * v, const BYTE * pData, int size) +static int find_data(const struct Vector *v, const void *pData, int size) { int index; for (index = 0; index < v->current; index++) @@ -404,7 +404,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrf.dwPins = prf2->u.s2.cPins2; rrf.dwUnused = 0; - add_data(&mainStore, (LPBYTE)&rrf, sizeof(rrf)); + add_data(&mainStore, &rrf, sizeof(rrf)); for (i = 0; i < prf2->u.s2.cPins2; i++) { @@ -432,15 +432,15 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrfp.dwMediums = rgPin2.nMediums; rrfp.bCategory = rgPin2.clsPinCategory ? 1 : 0; - add_data(&mainStore, (LPBYTE)&rrfp, sizeof(rrfp)); + add_data(&mainStore, &rrfp, sizeof(rrfp)); if (rrfp.bCategory) { - DWORD index = find_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + DWORD index = find_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + index = add_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } for (j = 0; j < rgPin2.nMediaTypes; j++) @@ -453,26 +453,26 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rt.signature[3] = '3'; rt.signature[0] += j; rt.dwUnused = 0; - rt.dwOffsetMajor = find_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) - rt.dwOffsetMajor = add_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = add_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); rt.dwOffsetMajor += size; - rt.dwOffsetMinor = find_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = find_data(&clsidStore, clsMinorType, sizeof(CLSID)); if (rt.dwOffsetMinor == -1) - rt.dwOffsetMinor = add_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = add_data(&clsidStore, clsMinorType, sizeof(CLSID)); rt.dwOffsetMinor += size; - add_data(&mainStore, (LPBYTE)&rt, sizeof(rt)); + add_data(&mainStore, &rt, sizeof(rt)); } for (j = 0; j < rgPin2.nMediums; j++) { - DWORD index = find_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + DWORD index = find_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + index = add_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } } @@ -1036,7 +1036,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( { struct MONIKER_MERIT mm = {pMoniker, rf2.dwMerit}; IMoniker_AddRef(pMoniker); - add_data(&monikers, (LPBYTE)&mm, sizeof(mm)); + add_data(&monikers, &mm, sizeof(mm)); } }

1 0

Michael Stefaniuc : urlmon: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: a2201e8add64e7592a498e4085a3292f22e0009c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2201e8add64e7592a498e40… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 26 00:05:55 2018 +0200 urlmon: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5968a6c..06f0698 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -409,7 +409,7 @@ static void init_session(void) { unsigned int i; - for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { + for(i = 0; i < ARRAY_SIZE(object_creation); i++) { if(object_creation[i].protocol) register_namespace(object_creation[i].cf, object_creation[i].clsid, object_creation[i].protocol, TRUE); @@ -438,10 +438,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { unsigned int i; HRESULT hr; - + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) return IClassFactory_QueryInterface(object_creation[i].cf, riid, ppv);

1 0

Alexandre Julliard : widl: Silence a gcc warning.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 68cfa7fd03a1ef9f65cc700ea50cfba2be09880f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68cfa7fd03a1ef9f65cc700e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 10:48:51 2018 +0200 widl: Silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da9ffd0..5b498bf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3714,7 +3714,7 @@ static unsigned int get_required_buffer_size_type( { case TGT_USER_TYPE: { - const char *uname; + const char *uname = NULL; const type_t *utype = get_user_type(type, &uname); return get_required_buffer_size_type(utype, uname, NULL, FALSE, alignment); }

1 0