May 2015 - Wine-commits - list.winehq.org

Huw Davies : ntdll/tests: Wait for pending file operations to complete.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 14c53a58632f89a4d3a6ae449f339806b4c094a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c53a58632f89a4d3a6ae449… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:02:02 2015 +0100 ntdll/tests: Wait for pending file operations to complete. --- dlls/ntdll/tests/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19a886a..fb31b3a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2699,6 +2699,8 @@ static void test_read_write(void) { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 4, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); @@ -2730,6 +2732,8 @@ static void test_read_write(void) { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 14, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);

1 0

Nikolay Sivov : wininet: Make sure we pass strictly 0/ 1 to a helper as BOOL value.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: b2cb6b3e262babec45365198708f99e911d33d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2cb6b3e262babec453651987… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 17:55:27 2015 +0300 wininet: Make sure we pass strictly 0/1 to a helper as BOOL value. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f91fd21..cd2cdcf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3565,7 +3565,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex) { LPHTTPHEADERW lphttpHdr = NULL; - BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; + BOOL request_only = !!(dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS); INT requested_index = lpdwIndex ? *lpdwIndex : 0; DWORD level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); INT index = -1; @@ -6102,7 +6102,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { LPHTTPHEADERW lphttpHdr = NULL; INT index; - BOOL request_only = dwModifier & HTTP_ADDHDR_FLAG_REQ; + BOOL request_only = !!(dwModifier & HTTP_ADDHDR_FLAG_REQ); DWORD res = ERROR_HTTP_INVALID_HEADER; TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier);

1 0

Andrew Eikum : kernel32: Implement CheckNameLegalDOS8Dot3.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: d9a27e9ca0d1dc0425032da788f5326f1f5ff737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a27e9ca0d1dc0425032da78… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 12 13:31:01 2015 -0500 kernel32: Implement CheckNameLegalDOS8Dot3. --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/path.c | 49 ++++++++++++++++++++++++++++++ dlls/kernel32/tests/path.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ 4 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0809761..1261738 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -218,8 +218,8 @@ # @ stub CheckElevation # @ stub CheckElevationEnabled # @ stub CheckForReadOnlyResource -# @ stub CheckNameLegalDOS8Dot3A -# @ stub CheckNameLegalDOS8Dot3W +@ stdcall CheckNameLegalDOS8Dot3A(str ptr long ptr ptr) +@ stdcall CheckNameLegalDOS8Dot3W(wstr ptr long ptr ptr) @ stdcall CheckRemoteDebuggerPresent(long ptr) @ stdcall ClearCommBreak(long) @ stdcall ClearCommError(long ptr ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 179c8e0..eae2ca9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2012,3 +2012,52 @@ BOOL WINAPI CreateHardLinkTransactedW(LPCWSTR link, LPCWSTR target, LPSECURITY_A SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/************************************************************************* + * CheckNameLegalDOS8Dot3A (KERNEL32.@) + */ +BOOL WINAPI CheckNameLegalDOS8Dot3A(const char *name, char *oemname, DWORD oemname_len, + BOOL *contains_spaces, BOOL *is_legal) +{ + WCHAR *nameW; + + TRACE("(%s %p %u %p %p)\n", name, oemname, + oemname_len, contains_spaces, is_legal); + + if (!name || !is_legal) + return FALSE; + + if (!(nameW = FILE_name_AtoW( name, FALSE ))) return FALSE; + + return CheckNameLegalDOS8Dot3W( nameW, oemname, oemname_len, contains_spaces, is_legal ); +} + +/************************************************************************* + * CheckNameLegalDOS8Dot3W (KERNEL32.@) + */ +BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemname_len, + BOOL *contains_spaces_ret, BOOL *is_legal) +{ + OEM_STRING oem_str; + UNICODE_STRING nameW; + BOOLEAN contains_spaces; + + TRACE("(%s %p %u %p %p)\n", wine_dbgstr_w(name), oemname, + oemname_len, contains_spaces_ret, is_legal); + + if (!name || !is_legal) + return FALSE; + + RtlInitUnicodeString( &nameW, name ); + + if (oemname) { + oem_str.Length = oemname_len; + oem_str.MaximumLength = oemname_len; + oem_str.Buffer = oemname; + } + + *is_legal = RtlIsNameLegalDOS8Dot3( &nameW, oemname ? &oem_str : NULL, &contains_spaces ); + if (contains_spaces_ret) *contains_spaces_ret = contains_spaces; + + return TRUE; +} diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index de6d92a..3bf82fe 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -75,6 +75,9 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static void (WINAPI *pReleaseActCtx)(HANDLE); +static BOOL (WINAPI *pCheckNameLegalDOS8Dot3W)(const WCHAR *, char *, DWORD, BOOL *, BOOL *); +static BOOL (WINAPI *pCheckNameLegalDOS8Dot3A)(const char *, char *, DWORD, BOOL *, BOOL *); + /* a structure to deal with wine todos somewhat cleanly */ typedef struct { DWORD shortlen; @@ -2058,6 +2061,8 @@ static void init_pointers(void) MAKEFUNC(DeactivateActCtx); MAKEFUNC(GetCurrentActCtx); MAKEFUNC(ReleaseActCtx); + MAKEFUNC(CheckNameLegalDOS8Dot3W); + MAKEFUNC(CheckNameLegalDOS8Dot3A); #undef MAKEFUNC } @@ -2119,6 +2124,73 @@ static void test_relative_path(void) RemoveDirectoryA("bar"); } +static void test_CheckNameLegalDOS8Dot3(void) +{ + static const WCHAR has_driveW[] = {'C',':','\\','a','.','t','x','t',0}; + static const WCHAR has_pathW[] = {'b','\\','a','.','t','x','t',0}; + static const WCHAR too_longW[] = {'a','l','o','n','g','f','i','l','e','n','a','m','e','.','t','x','t',0}; + static const WCHAR twodotsW[] = {'t','e','s','t','.','e','s','t','.','t','x','t',0}; + static const WCHAR longextW[] = {'t','e','s','t','.','t','x','t','t','x','t',0}; + static const WCHAR emptyW[] = {0}; + static const WCHAR funnycharsW[] = {'!','#','$','%','&','\'','(',')','.','-','@','^',0}; + static const WCHAR length8W[] = {'t','e','s','t','t','e','s','t','.','t','x','t',0}; + static const WCHAR length1W[] = {'t',0}; + static const WCHAR withspaceW[] = {'t','e','s','t',' ','e','s','t','.','t','x','t',0}; + + static const struct { + const WCHAR *name; + BOOL should_be_legal, has_space; + } cases[] = { + {has_driveW, FALSE, FALSE}, + {has_pathW, FALSE, FALSE}, + {too_longW, FALSE, FALSE}, + {twodotsW, FALSE, FALSE}, + {longextW, FALSE, FALSE}, + {emptyW, TRUE /* ! */, FALSE}, + {funnycharsW, TRUE, FALSE}, + {length8W, TRUE, FALSE}, + {length1W, TRUE, FALSE}, + {withspaceW, TRUE, TRUE}, + }; + + BOOL br, is_legal, has_space; + char astr[64]; + DWORD i; + + if(!pCheckNameLegalDOS8Dot3W){ + win_skip("Missing CheckNameLegalDOS8Dot3, skipping tests\n"); + return; + } + + br = pCheckNameLegalDOS8Dot3W(NULL, NULL, 0, NULL, &is_legal); + ok(br == FALSE, "CheckNameLegalDOS8Dot3W should have failed\n"); + + br = pCheckNameLegalDOS8Dot3A(NULL, NULL, 0, NULL, &is_legal); + ok(br == FALSE, "CheckNameLegalDOS8Dot3A should have failed\n"); + + br = pCheckNameLegalDOS8Dot3W(length8W, NULL, 0, NULL, NULL); + ok(br == FALSE, "CheckNameLegalDOS8Dot3W should have failed\n"); + + br = pCheckNameLegalDOS8Dot3A("testtest.txt", NULL, 0, NULL, NULL); + ok(br == FALSE, "CheckNameLegalDOS8Dot3A should have failed\n"); + + for(i = 0; i < sizeof(cases)/sizeof(*cases); ++i){ + br = pCheckNameLegalDOS8Dot3W(cases[i].name, NULL, 0, &has_space, &is_legal); + ok(br == TRUE, "CheckNameLegalDOS8Dot3W failed for %s\n", wine_dbgstr_w(cases[i].name)); + ok(is_legal == cases[i].should_be_legal, "Got wrong legality for %s\n", wine_dbgstr_w(cases[i].name)); + if(is_legal) + ok(has_space == cases[i].has_space, "Got wrong space for %s\n", wine_dbgstr_w(cases[i].name)); + + WideCharToMultiByte(CP_ACP, 0, cases[i].name, -1, astr, sizeof(astr), NULL, NULL); + + br = pCheckNameLegalDOS8Dot3A(astr, NULL, 0, &has_space, &is_legal); + ok(br == TRUE, "CheckNameLegalDOS8Dot3W failed for %s\n", astr); + ok(is_legal == cases[i].should_be_legal, "Got wrong legality for %s\n", astr); + if(is_legal) + ok(has_space == cases[i].has_space, "Got wrong space for %s\n", wine_dbgstr_w(cases[i].name)); + } +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -2151,4 +2223,5 @@ START_TEST(path) test_SearchPathW(); test_GetFullPathNameA(); test_GetFullPathNameW(); + test_CheckNameLegalDOS8Dot3(); } diff --git a/include/winbase.h b/include/winbase.h index f845082..a8f3fb6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1614,6 +1614,8 @@ WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); +WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3A(const char*,char*,DWORD,BOOL*,BOOL*); +WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR*, char*,DWORD,BOOL*,BOOL*); WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); WINBASEAPI BOOL WINAPI ClearCommBreak(HANDLE);

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: b41c0c184bd04ca4400dcb4f277566a783f3b5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41c0c184bd04ca4400dcb4f2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 12 23:36:53 2015 -0600 po: Update Catalan translation. --- po/ca.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/ca.po b/po/ca.po index c1be9ae..0d02d0f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,13 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-07 23:52-0700\n" +"PO-Revision-Date: 2015-05-12 12:16-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.7.5\n" #: appwiz.rc:58 @@ -533,7 +534,7 @@ msgstr "&Font" #: comdlg32.rc:249 wineconsole.rc:84 msgid "Font" -msgstr "Tipus de Lletra" +msgstr "Tipus de lletra" #: comdlg32.rc:252 msgid "&Font:" @@ -8598,10 +8599,8 @@ msgid "Duplex:" msgstr "Dúplex:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Configuració" +msgstr "Configuració" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -10318,7 +10317,7 @@ msgstr "No es pot trucar a una etiqueta de batch fora d'un script batch\n" #: cmd.rc:340 xcopy.rc:45 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "T" #: cmd.rc:341 msgid "Delete %1?"

1 0

Hans Leidekker : rpcrt4: Use the Unicode version of InternetReadFileEx.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: 900278001533fd570a20315183ebd5ae7d6836d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900278001533fd570a2031518… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 12:12:47 2015 +0200 rpcrt4: Use the Unicode version of InternetReadFileEx. --- dlls/rpcrt4/rpc_transport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 3016d83..79ed196 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1855,7 +1855,7 @@ typedef struct _RpcHttpAsyncData LONG refs; HANDLE completion_event; WORD async_result; - INTERNET_BUFFERSA inet_buffers; + INTERNET_BUFFERSW inet_buffers; CRITICAL_SECTION cs; } RpcHttpAsyncData; @@ -1962,7 +1962,7 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) TRACE("async data = %p\n", httpc->async_data); httpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); httpc->async_data->refs = 1; - httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSA); + httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSW); httpc->async_data->inet_buffers.lpvBuffer = NULL; InitializeCriticalSection(&httpc->async_data->cs); httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); @@ -3027,7 +3027,7 @@ static int rpcrt4_ncacn_http_read(RpcConnection *Connection, { httpc->async_data->inet_buffers.dwBufferLength = bytes_left; prepare_async_request(httpc->async_data); - ret = InternetReadFileExA(httpc->out_request, &httpc->async_data->inet_buffers, IRF_ASYNC, 0); + ret = InternetReadFileExW(httpc->out_request, &httpc->async_data->inet_buffers, IRF_ASYNC, 0); status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); if(status != RPC_S_OK) { if(status == RPC_S_CALL_CANCELLED)

1 0

Hans Leidekker : rpcrt4: Also set the Content-Length header explicitly on the in pipe request.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: e34cb91399b0119ff0885b7c675184df2c5e28c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34cb91399b0119ff0885b7c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 12:13:20 2015 +0200 rpcrt4: Also set the Content-Length header explicitly on the in pipe request. --- dlls/rpcrt4/rpc_transport.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 79ed196..337e63d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2230,6 +2230,17 @@ static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data, return RPC_S_OK; } +static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) +{ + static const WCHAR fmtW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; + WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; + + sprintfW(header, fmtW, len); + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE))) return RPC_S_OK; + return RPC_S_SERVER_UNAVAILABLE; +} + /* prepare the in pipe for use by RPC packets */ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, const UUID *connection_uuid, const UUID *in_pipe_uuid, @@ -2251,6 +2262,9 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync buffers_in.dwStructSize = sizeof(buffers_in); /* FIXME: get this from the registry */ buffers_in.dwBufferTotal = 1024 * 1024 * 1024; /* 1Gb */ + status = insert_content_length_header(in_request, buffers_in.dwBufferTotal); + if (status != RPC_S_OK) return status; + prepare_async_request(async_data); ret = HttpSendRequestExW(in_request, &buffers_in, NULL, 0, 0); status = wait_async_request(async_data, ret, cancel_event); @@ -2321,17 +2335,14 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy const UUID *out_pipe_uuid, ULONG *flow_control_increment, BOOL authorized) { - static const WCHAR fmtW[] = - {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - DWORD bytes_read, len; + DWORD bytes_read; BYTE buf[20]; - WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; if (!authorized) { @@ -2345,10 +2356,16 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; + status = insert_content_length_header(out_request, hdr->common.frag_len); + if (status != RPC_S_OK) + { + RPCRT4_FreeHeader(hdr); + return status; + } + TRACE("sending HTTP connect header to server\n"); prepare_async_request(async_data); - len = sprintfW(header, fmtW, hdr->common.frag_len); - ret = HttpSendRequestW(out_request, header, len, hdr, hdr->common.frag_len); + ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); status = wait_async_request(async_data, ret, cancel_event); RPCRT4_FreeHeader(hdr); if (status != RPC_S_OK) return status;

1 0

Hans Leidekker : rpcrt4: Allow all HTTP read requests to be cancelled.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: f4c59406566839c8c8cc239e80076a0c8eb62491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c59406566839c8c8cc239e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 12:13:47 2015 +0200 rpcrt4: Allow all HTTP read requests to be cancelled. --- dlls/rpcrt4/rpc_transport.c | 111 +++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 337e63d..34f434d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2207,9 +2207,47 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) return RPC_S_OK; } +static int rpcrt4_http_async_read(HINTERNET req, RpcHttpAsyncData *async_data, HANDLE cancel_event, + void *buffer, unsigned int count) +{ + char *buf = buffer; + BOOL ret; + unsigned int bytes_left = count; + RPC_STATUS status = RPC_S_OK; + + async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, count); + + while (bytes_left) + { + async_data->inet_buffers.dwBufferLength = bytes_left; + prepare_async_request(async_data); + ret = InternetReadFileExW(req, &async_data->inet_buffers, IRF_ASYNC, 0); + status = wait_async_request(async_data, ret, cancel_event); + if (status != RPC_S_OK) + { + if (status == RPC_S_CALL_CANCELLED) + TRACE("call cancelled\n"); + break; + } + + if (!async_data->inet_buffers.dwBufferLength) + break; + memcpy(buf, async_data->inet_buffers.lpvBuffer, + async_data->inet_buffers.dwBufferLength); + + bytes_left -= async_data->inet_buffers.dwBufferLength; + buf += async_data->inet_buffers.dwBufferLength; + } + + HeapFree(GetProcessHeap(), 0, async_data->inet_buffers.lpvBuffer); + async_data->inet_buffers.lpvBuffer = NULL; + + TRACE("%p %p %u -> %u\n", req, buffer, count, status); + return status == RPC_S_OK ? count : -1; +} + static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data, HANDLE cancel_event) { - DWORD bytes_read; BYTE buf[20]; BOOL ret; RPC_STATUS status; @@ -2224,7 +2262,7 @@ static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data, status = rpcrt4_http_check_response(req); if (status != RPC_S_OK) return status; - InternetReadFile(req, buf, sizeof(buf), &bytes_read); + rpcrt4_http_async_read(req, async_data, cancel_event, buf, sizeof(buf)); /* FIXME: do something with retrieved data */ return RPC_S_OK; @@ -2284,14 +2322,13 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync return RPC_S_OK; } -static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcPktHdr *hdr, BYTE **data) +static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcHttpAsyncData *async_data, + HANDLE cancel_event, RpcPktHdr *hdr, BYTE **data) { - BOOL ret; - DWORD bytes_read; unsigned short data_len; + unsigned int size; - ret = InternetReadFile(request, hdr, sizeof(hdr->common), &bytes_read); - if (!ret) + if (rpcrt4_http_async_read(request, async_data, cancel_event, hdr, sizeof(hdr->common)) < 0) return RPC_S_SERVER_UNAVAILABLE; if (hdr->common.ptype != PKT_HTTP || hdr->common.frag_len < sizeof(hdr->http)) { @@ -2300,8 +2337,8 @@ static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcPktHdr *hdr return RPC_S_PROTOCOL_ERROR; } - ret = InternetReadFile(request, &hdr->common + 1, sizeof(hdr->http) - sizeof(hdr->common), &bytes_read); - if (!ret) + size = sizeof(hdr->http) - sizeof(hdr->common); + if (rpcrt4_http_async_read(request, async_data, cancel_event, &hdr->common + 1, size) < 0) return RPC_S_SERVER_UNAVAILABLE; data_len = hdr->common.frag_len - sizeof(hdr->http); @@ -2310,8 +2347,7 @@ static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcPktHdr *hdr *data = HeapAlloc(GetProcessHeap(), 0, data_len); if (!*data) return RPC_S_OUT_OF_RESOURCES; - ret = InternetReadFile(request, *data, data_len, &bytes_read); - if (!ret) + if (rpcrt4_http_async_read(request, async_data, cancel_event, *data, data_len) < 0) { HeapFree(GetProcessHeap(), 0, *data); return RPC_S_SERVER_UNAVAILABLE; @@ -2341,7 +2377,6 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - DWORD bytes_read; BYTE buf[20]; if (!authorized) @@ -2351,7 +2386,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy if (status != RPC_S_OK) return status; } else - InternetReadFile(out_request, buf, sizeof(buf), &bytes_read); + rpcrt4_http_async_read(out_request, async_data, cancel_event, buf, sizeof(buf)); hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; @@ -2373,8 +2408,8 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy status = rpcrt4_http_check_response(out_request); if (status != RPC_S_OK) return status; - status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, - &data_from_server); + status = rpcrt4_http_read_http_packet(out_request, async_data, cancel_event, + &pkt_from_server, &data_from_server); if (status != RPC_S_OK) return status; status = RPCRT4_ParseHttpPrepareHeader1(&pkt_from_server, data_from_server, &field1); @@ -2384,8 +2419,8 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy for (;;) { - status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, - &data_from_server); + status = rpcrt4_http_read_http_packet(out_request, async_data, cancel_event, + &pkt_from_server, &data_from_server); if (status != RPC_S_OK) return status; if (pkt_from_server.http.flags != 0x0001) break; @@ -2790,7 +2825,7 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c return status; } -static void drain_content(HINTERNET request) +static void drain_content(HINTERNET request, RpcHttpAsyncData *async_data, HANDLE cancel_event) { DWORD count, len = 0, size = sizeof(len); char buf[2048]; @@ -2800,7 +2835,7 @@ static void drain_content(HINTERNET request) for (;;) { count = min(sizeof(buf), len); - if (!InternetReadFile(request, buf, count, &count) || !count) return; + if (rpcrt4_http_async_read(request, async_data, cancel_event, buf, count) <= 0) return; len -= count; } } @@ -2827,7 +2862,7 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request status = rpcrt4_http_check_response(request); if (status != RPC_S_OK && status != ERROR_ACCESS_DENIED) break; - drain_content(request); + drain_content(request, httpc->async_data, httpc->cancel_event); } if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) @@ -2967,7 +3002,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) HeapFree(GetProcessHeap(), 0, url); return status; } - drain_content(httpc->in_request); + drain_content(httpc->in_request, httpc->async_data, httpc->cancel_event); } httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, @@ -3033,39 +3068,7 @@ static int rpcrt4_ncacn_http_read(RpcConnection *Connection, void *buffer, unsigned int count) { RpcConnection_http *httpc = (RpcConnection_http *) Connection; - char *buf = buffer; - BOOL ret; - unsigned int bytes_left = count; - RPC_STATUS status = RPC_S_OK; - - httpc->async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, count); - - while (bytes_left) - { - httpc->async_data->inet_buffers.dwBufferLength = bytes_left; - prepare_async_request(httpc->async_data); - ret = InternetReadFileExW(httpc->out_request, &httpc->async_data->inet_buffers, IRF_ASYNC, 0); - status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); - if(status != RPC_S_OK) { - if(status == RPC_S_CALL_CANCELLED) - TRACE("call cancelled\n"); - break; - } - - if(!httpc->async_data->inet_buffers.dwBufferLength) - break; - memcpy(buf, httpc->async_data->inet_buffers.lpvBuffer, - httpc->async_data->inet_buffers.dwBufferLength); - - bytes_left -= httpc->async_data->inet_buffers.dwBufferLength; - buf += httpc->async_data->inet_buffers.dwBufferLength; - } - - HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); - httpc->async_data->inet_buffers.lpvBuffer = NULL; - - TRACE("%p %p %u -> %u\n", httpc->out_request, buffer, count, status); - return status == RPC_S_OK ? count : -1; + return rpcrt4_http_async_read(httpc->out_request, httpc->async_data, httpc->cancel_event, buffer, count); } static RPC_STATUS rpcrt4_ncacn_http_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload)

1 0

Alex Henrie : user32: Do not return the class icon when ICON_SMALL2 is requested.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: f2bf0227a25859f3dfabc80c53f33cd94b732471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2bf0227a25859f3dfabc80c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 13 00:33:11 2015 -0600 user32: Do not return the class icon when ICON_SMALL2 is requested. --- dlls/user32/defwnd.c | 2 -- dlls/user32/tests/class.c | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index bcd6f91..fa6b0fa 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -640,8 +640,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case ICON_SMALL2: ret = wndPtr->hIconSmall; - if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); - /* FIXME: should have a default here if class icon is null */ break; default: ret = 0; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index b5adac4..14f0aa3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1002,6 +1002,13 @@ static void test_icons(void) hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + ok(SendMessageA(hwnd, WM_GETICON, ICON_BIG, 0) == 0, + "WM_GETICON with ICON_BIG should not return the class icon\n"); + ok(SendMessageA(hwnd, WM_GETICON, ICON_SMALL, 0) == 0, + "WM_GETICON with ICON_SMALL should not return the class icon\n"); + ok(SendMessageA(hwnd, WM_GETICON, ICON_SMALL2, 0) == 0, + "WM_GETICON with ICON_SMALL2 should not return the class icon\n"); + hsmallnew = CopyImage(wcex.hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0); ok(!SetClassLongPtrW(hwnd, GCLP_HICONSM, (LONG_PTR)hsmallnew),

1 0

Alex Henrie : user32: Use the window class icon if the MDI child doesn' t have its own.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: 5579967c537255bb17c0e0630da9e902675dfedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5579967c537255bb17c0e0630… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 13 00:33:12 2015 -0600 user32: Use the window class icon if the MDI child doesn't have its own. --- dlls/user32/mdi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 11d5679..41b5077 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -864,8 +864,12 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) /* The system menu is replaced by the child icon */ hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0); if (!hIcon) + hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM); + if (!hIcon) hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) + hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); + if (!hIcon) hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon)

1 0

Alex Henrie : user32: Load hIconSmIntern from the best-matching resource.
by Alexandre Julliard 13 May '15

13 May '15

Module: wine Branch: master Commit: f920dfd6984ca9227900d0f0406afb3ceb892cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f920dfd6984ca9227900d0f04… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 13 00:33:13 2015 -0600 user32: Load hIconSmIntern from the best-matching resource. --- dlls/user32/class.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 531c2e3..2c94367 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -599,7 +599,8 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) classPtr->hIconSmIntern = wc->hIcon && !wc->hIconSm ? CopyImage( wc->hIcon, IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + GetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ) : NULL; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, FALSE ); @@ -643,7 +644,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) classPtr->hIconSmIntern = wc->hIcon && !wc->hIconSm ? CopyImage( wc->hIcon, IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + GetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ) : NULL; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, TRUE ); @@ -981,7 +983,8 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, } if (newval && !class->hIconSm) class->hIconSmIntern = CopyImage( (HICON)newval, IMAGE_ICON, - GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), 0 ); + GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); class->hIcon = (HICON)newval; break; case GCLP_HICONSM: @@ -989,7 +992,8 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, if (retval && !newval) class->hIconSmIntern = class->hIcon ? CopyImage( class->hIcon, IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + GetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ) : NULL; else if (!retval && newval && class->hIconSmIntern) { DestroyIcon(class->hIconSmIntern);

1 0