September 2013 - Wine-Commits

André Hentschel : include: Don't redefine _GNU_SOURCE.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 128bfdf6daee613aae909ecdfc619d82ecbb4106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128bfdf6daee613aae909ecdf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 19 20:50:55 2013 +0200 include: Don't redefine _GNU_SOURCE. --- include/wine/port.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 09dbf61..c5359dd 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,7 +29,9 @@ # error You must include port.h before all other headers #endif -#define _GNU_SOURCE /* for pread/pwrite */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE /* for pread/pwrite */ +#endif #include <fcntl.h> #include <math.h> #include <sys/types.h>

1 0

Hans Leidekker : wininet: Don' t assume that end of chunk means end of stream.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: c0e1dda04cce1192d477a831ece4b9e2c22353e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e1dda04cce1192d477a831e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 18 13:40:24 2013 +0200 wininet: Don't assume that end of chunk means end of stream. --- dlls/wininet/http.c | 26 ++++++++++++++++++-------- dlls/wininet/tests/http.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1832b4f..2d11040 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -400,6 +400,7 @@ typedef struct { DWORD buf_size; DWORD buf_pos; DWORD chunk_size; + BOOL end_of_data; } chunked_stream_t; static inline void destroy_data_stream(data_stream_t *stream) @@ -2697,6 +2698,8 @@ static DWORD read_more_chunked_data(chunked_stream_t *stream, http_request_t *re DWORD res; int len; + assert(!stream->end_of_data); + if (stream->buf_pos) { /* move existing data to the start of the buffer */ @@ -2744,10 +2747,14 @@ static DWORD discard_chunked_eol(chunked_stream_t *stream, http_request_t *req) /* read the size of the next chunk (the read section must be held) */ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) { - /* TODOO */ DWORD chunk_size = 0, res; - if(stream->chunk_size != ~0u && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + assert(!stream->chunk_size || stream->chunk_size == ~0u); + + if (stream->end_of_data) return ERROR_NO_MORE_FILES; + + /* read terminator for the previous chunk */ + if(!stream->chunk_size && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) return res; for (;;) @@ -2764,6 +2771,8 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) stream->chunk_size = chunk_size; if (req->contentLength == ~0u) req->contentLength = chunk_size; else req->contentLength += chunk_size; + + if (!chunk_size) stream->end_of_data = TRUE; return discard_chunked_eol(stream, req); } remove_chunked_data(stream, 1); @@ -2786,7 +2795,7 @@ static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return !chunked_stream->chunk_size; + return chunked_stream->end_of_data; } static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2795,13 +2804,13 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; DWORD read_bytes = 0, ret_read = 0, res = ERROR_SUCCESS; - if(chunked_stream->chunk_size == ~0u) { + if(!chunked_stream->chunk_size || chunked_stream->chunk_size == ~0u) { res = start_next_chunk(chunked_stream, req); if(res != ERROR_SUCCESS) return res; } - while(size && chunked_stream->chunk_size) { + while(size && chunked_stream->chunk_size && !chunked_stream->end_of_data) { if(chunked_stream->buf_size) { read_bytes = min(size, min(chunked_stream->buf_size, chunked_stream->chunk_size)); @@ -2835,7 +2844,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, chunked_stream->chunk_size -= read_bytes; size -= read_bytes; ret_read += read_bytes; - if(!chunked_stream->chunk_size) { + if(size && !chunked_stream->chunk_size) { assert(read_mode != READMODE_NOBLOCK); res = start_next_chunk(chunked_stream, req); if(res != ERROR_SUCCESS) @@ -2855,8 +2864,8 @@ static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - /* FIXME: we can do better */ - return !chunked_stream->chunk_size; + remove_chunked_data(chunked_stream, chunked_stream->buf_size); + return chunked_stream->end_of_data; } static void chunked_destroy(data_stream_t *stream) @@ -2905,6 +2914,7 @@ static DWORD set_content_length(http_request_t *request) chunked_stream->data_stream.vtbl = &chunked_stream_vtbl; chunked_stream->buf_size = chunked_stream->buf_pos = 0; chunked_stream->chunk_size = ~0u; + chunked_stream->end_of_data = FALSE; if(request->read_size) { memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf57223..2526681 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4777,8 +4777,37 @@ static const struct notification async_send_request_ex_resolve_failure_test[] = { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; +static const struct notification async_send_request_ex_chunked_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_COOKIE_SENT, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_SENT, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, 1 }, + { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING } +}; + static const struct notification_data notification_data[] = { { + async_send_request_ex_chunked_test, + sizeof(async_send_request_ex_chunked_test)/sizeof(async_send_request_ex_chunked_test[0]), + "GET", + "test.winehq.org", + "tests/data.php" + }, + { async_send_request_ex_test, sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), "POST", @@ -5100,6 +5129,7 @@ START_TEST(http) test_async_HttpSendRequestEx(&notification_data[0]); test_async_HttpSendRequestEx(&notification_data[1]); test_async_HttpSendRequestEx(&notification_data[2]); + test_async_HttpSendRequestEx(&notification_data[3]); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test();

1 0

Dmitry Timoshkov : kernel32: Remove a 0-length read optimization from ReadFile.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: b4ab43b3de134d2816393ba7f23f67bfc36bd33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ab43b3de134d2816393ba7f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:55:20 2013 +0900 kernel32: Remove a 0-length read optimization from ReadFile. --- dlls/kernel32/file.c | 1 - dlls/kernel32/tests/comm.c | 1 - dlls/kernel32/tests/mailslot.c | 3 --- dlls/kernel32/tests/pipe.c | 9 +++------ dlls/ntdll/tests/file.c | 5 ----- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 506b651..7dd65cd 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -408,7 +408,6 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, bytesRead, overlapped ); if (bytesRead) *bytesRead = 0; /* Do this before anything else */ - if (!bytesToRead) return TRUE; if (is_console_handle(hFile)) { diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index baf3368..dfd148c 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2152,7 +2152,6 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hcom, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index ca0b108..4171504 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -80,16 +80,13 @@ static int mailslot_test(void) count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buffer, 0, &count, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); ok(count == 0, "expected 0, got %u\n", count); count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 07e82a8..273641d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1860,9 +1860,7 @@ static void test_readfileex_pending(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, read_buf, 0, &num_bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); ok(num_bytes == 0, "expected 0, got %u\n", num_bytes); @@ -1877,12 +1875,11 @@ todo_wine todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); -todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); +todo_wine ok(overlapped.InternalHigh == -1, "expected -1, got %lu\n", overlapped.InternalHigh); wait = WaitForSingleObject(event, 100); -todo_wine ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", wait); num_bytes = 0xdeadbeef; @@ -1890,13 +1887,13 @@ todo_wine ok(ret, "WriteFile failed\n"); ok(num_bytes == 1, "bytes %u\n", num_bytes); - wait = WaitForSingleObject(event, 0); + wait = WaitForSingleObject(event, 100); +todo_wine ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); ok(num_bytes == 1, "bytes %u\n", num_bytes); todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", overlapped.Internal); -todo_wine ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh); /* read the pending byte and clear the pipe */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5ae605b..66299ea 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1986,9 +1986,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); @@ -2201,9 +2199,7 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); @@ -2220,7 +2216,6 @@ todo_wine ok(bytes == 0, "bytes %u\n", bytes); todo_wine ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); -todo_wine ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); bytes = 0xdeadbeef;

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: docs Branch: master Commit: c206e3d0be7ea2a35c64be37fc8c212b8fe69591 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c206e3d0be7ea2a35c64be37f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 20 11:08:18 2013 +0200 wineusr: Assorted formatting & tagging fixes. A couple typos as well. --- en/wineusr-bugs.sgml | 2 +- en/wineusr-configuring.sgml | 15 ++++++++------- en/wineusr-running.sgml | 29 +++++++++++++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index e251bdd..c13cb17 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -270,7 +270,7 @@ </listitem> <listitem> <para> - The exact command line you used to start Wine. + The exact command line you used to start Wine (e.g. <userinput>wine "C:\Program Files\<replaceable>Test</replaceable>\<replaceable>program.exe</replaceable>"</userinput>). </para> </listitem> diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index ff54fa5..84a6de0 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -288,7 +288,7 @@ err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\ You may be interested in configuring your drive settings outside of <command>winecfg</command>, in which case you're in luck because it's quite easy. All of the drive settings reside in a special - directory, <filename class="directory">~/.wine/dosdevices</filename>. Each + directory: <filename class="directory">~/.wine/dosdevices</filename>. Each <quote>drive</quote> is simply a link to where it actually resides. Wine automatically sets up two drives the first time you run Wine: </para> @@ -700,7 +700,7 @@ ln -s /mnt/smb/<replaceable>myserver</replaceable>/<replaceable>some</replaceabl The ODBC system within Wine, as with the printing system, is designed to hook across to the Unix system at a high level. Rather than ensuring that all the Windows code works under Wine it uses a suitable - Unix ODBC provider, such as UnixODBC. Thus if you configure Wine to + Unix ODBC provider, such as <literal>unixODBC</literal>. Thus if you configure Wine to use the built-in <filename class="libraryfile">odbc32.dll</filename>, that Wine DLL will interface to your Unix ODBC package and let that do the work, whereas if you configure @@ -713,7 +713,7 @@ ln -s /mnt/smb/<replaceable>myserver</replaceable>/<replaceable>some</replaceabl The first step in using a Unix ODBC system with Wine is, of course, to get the Unix ODBC system working itself. This may involve downloading code or binary packages etc. There are several Unix ODBC systems - available such as unixODBC or an ODBC-ODBC bridge that can be used + available such as <literal>unixODBC</literal> or an ODBC-ODBC bridge that can be used to access a Microsoft Access database. Typically such systems will include a tool, such as <command>isql</command>, which will allow you to access the data from the command line so that you can check @@ -752,10 +752,10 @@ LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0 If you have any problems then you can use <userinput><envar>WINEDEBUG</envar>=+odbc32</userinput> command before running Wine to trace what is happening. One word of - warning. Some programs actually cheat a little and bypass the ODBC + warning: some programs actually cheat a little and bypass the ODBC library. For example the Crystal Reports engine goes to the registry - to check on the DSN. The fix for this is documented at unixODBC - site where there is a section on using unixODBC with Wine. + to check on the DSN. The fix for this is documented at <literal>unixODBC</literal> + site where there is a section on using <literal>unixODBC</literal> with Wine. </para> </sect3> <sect3> @@ -769,7 +769,8 @@ LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0 </para> <para> In order to set up MSSQL support you will first need to download - and run the <command>mdac_typ.exe</command> installer from microsoft.com. In order to + and run the <command>mdac_typ.exe</command> installer from <uri + type="homepage">www.microsoft.com</uri>. In order to configure your ODBC connections you must then run <command>CLICONFG.EXE</command> and <command>ODBCAD32.EXE</command> under Wine. You can find them in the <filename class="directory">windows\system</filename> diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 090eb58..ce4abae 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -383,7 +383,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" <title>-w</title> <para> This parameter makes a newly started <command>wineserver</command> wait until the - currently active <command>wineserver</command> instance terminates. + currently active instance terminates. </para> </sect2> </sect1> @@ -470,12 +470,12 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep </listitem> <listitem> <para> - <command>wineconsole</command> with <parameter>user</parameter> backend + <command>wineconsole</command> with <literal>user</literal> backend </para> </listitem> <listitem> <para> - <command>wineconsole</command> with <parameter>curses</parameter> backend + <command>wineconsole</command> with <literal>curses</literal> backend </para> </listitem> </itemizedlist> @@ -496,8 +496,8 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep <row> <entry>Function</entry> <entry>Bare streams</entry> - <entry>Wineconsole & user backend</entry> - <entry>Wineconsole & curses backend</entry> + <entry>Wineconsole with <literal>user</literal> backend</entry> + <entry>Wineconsole with <literal>curses</literal> backend</entry> </row> </thead> <tbody> @@ -538,8 +538,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep </row> <row> <entry>Implementation</entry> - <entry>Maps the standard Windows streams to the - standard Unix streams (stdin/stdout/stderr) + <entry> + Maps the standard Windows streams to the standard Unix streams + (<literal>stdin<literal>/<literal>stdout</literal>/<literal>stderr</literal>) </entry> <entry> <command>wineconsole</command> will create a new window (hence @@ -549,8 +550,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep <entry> <command>wineconsole</command> will use existing Unix console (from which the program is run) and with the help of - the (n)curses library take control of all the terminal - surface for interacting with the user + the <filename class="libraryfile">curses</filename>/<filename + class="libraryfile">ncurses</filename> library take control of all + the terminal surface for interacting with the user </entry> </row> <row> @@ -576,9 +578,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep to have for a given application. </para> <para> - As of today, only the USER backend allows you to edit those + As of today, only the <literal>user</literal> backend allows you to edit those options (we don't recommend editing by hand the registry - contents). This edition is fired when a user right click in + contents). This edition is fired when a user right clicks in the console (this popups a menu), where you can either choose from: <itemizedlist> @@ -588,9 +590,8 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep applications which haven't been configured yet. So, when an application is first run (on your machine, under your account) in <command>wineconsole</command>, - <command>wineconsole</command> will - inherit this default settings for the - application. Afterwards, the application will have its + it will inherit these default settings. + Afterwards, the application will have its own settings, that you'll be able to modify at your will. </para> <para>

1 0

Jacek Caban : mshtml: Added external MIME handling tests.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 6e143e6c81b7e1bef49fbf447b9b77226138c616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e143e6c81b7e1bef49fbf447… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:13:20 2013 +0200 mshtml: Added external MIME handling tests. --- dlls/mshtml/tests/htmldoc.c | 353 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 291 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e143e6c81b7e1bef49fb…

1 0

Jacek Caban : mshtml: Keep moniker reference after start_binding call.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 4db1b0081533ed93c06f9be2934f3b469fca22af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db1b0081533ed93c06f9be29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:12:42 2013 +0200 mshtml: Keep moniker reference after start_binding call. --- dlls/mshtml/navigate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb639a8..94c7717 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -360,6 +360,11 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac This->binding = NULL; } + if(This->mon) { + IMoniker_Release(This->mon); + This->mon = NULL; + } + list_remove(&This->entry); list_init(&This->entry); This->window = NULL; @@ -823,9 +828,6 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi if(str) IStream_Release(str); - IMoniker_Release(bscallback->mon); - bscallback->mon = NULL; - return S_OK; }

1 0

Jacek Caban : mshtml: Don' t pass navigation to Gecko for MIME types that it doesn't support.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: b17d139328895b88d43af753ce6560af5b1bbe74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17d139328895b88d43af753c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:12:51 2013 +0200 mshtml: Don't pass navigation to Gecko for MIME types that it doesn't support. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 29 ++++++++++++++++++++++++++++- dlls/mshtml/nsembed.c | 19 +++++++++++++++++++ dlls/mshtml/nsiface.idl | 16 ++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8063ac5..f3c3b28 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -832,6 +832,7 @@ void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsresult create_nsfile(const PRUnichar*,nsIFile**) DECLSPEC_HIDDEN; +char *get_nscategory_entry(const char*,const char*) DECLSPEC_HIDDEN; HRESULT create_pending_window(HTMLOuterWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLInnerWindow*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 94c7717..444abbc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1161,6 +1161,9 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } } + if(!This->nschannel) + return S_OK; + if(!This->nslistener) { BYTE buf[1024]; @@ -1544,7 +1547,7 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) if(result != E_ABORT) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel) { + else if(This->is_doc_channel && This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK; @@ -1604,12 +1607,36 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) return hres; } +static BOOL is_supported_doc_mime(const WCHAR *mime) +{ + char *nscat, *mimea; + BOOL ret; + + mimea = heap_strdupWtoA(mime); + if(!mimea) + return FALSE; + + nscat = get_nscategory_entry("Gecko-Content-Viewers", mimea); + + ret = nscat != NULL && !strcmp(nscat, "@mozilla.org/content/document-loader-factory;1"); + + heap_free(mimea); + nsfree(nscat); + return ret; +} + static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); switch(status_code) { case BINDSTATUS_MIMETYPEAVAILABLE: + if(This->is_doc_channel && !is_supported_doc_mime(status_text)) { + FIXME("External MIME: %s\n", debugstr_w(status_text)); + + This->nschannel = NULL; + } + if(!This->nschannel) return S_OK; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4e72464..bbac821 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -48,6 +48,7 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" #define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" +#define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1" #define PR_UINT32_MAX 0xffffffff @@ -73,6 +74,7 @@ static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; +static nsICategoryManager *cat_mgr; static nsIMemory *nsmem = NULL; static nsIFile *profile_directory, *plugin_directory; @@ -725,6 +727,11 @@ static BOOL init_xpcom(const PRUnichar *gre_path) if(NS_FAILED(nsres)) ERR("Could not get nsIMemory: %08x\n", nsres); + nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CATEGORYMANAGER_CONTRACTID, + &IID_nsICategoryManager, (void**)&cat_mgr); + if(NS_FAILED(nsres)) + ERR("Could not get category manager service: %08x\n", nsres); + if(registrar) { register_nsservice(registrar, pServMgr); nsIComponentRegistrar_Release(registrar); @@ -901,6 +908,15 @@ nsIWritableVariant *create_nsvariant(void) return ret; } +char *get_nscategory_entry(const char *category, const char *entry) +{ + char *ret = NULL; + nsresult nsres; + + nsres = nsICategoryManager_GetCategoryEntry(cat_mgr, category, entry, &ret); + return NS_SUCCEEDED(nsres) ? ret : NULL; +} + nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv) { nsIInterfaceRequestor *iface_req; @@ -1093,6 +1109,9 @@ void close_gecko(void) if(pServMgr) nsIServiceManager_Release(pServMgr); + if(cat_mgr) + nsICategoryManager_Release(cat_mgr); + if(nsmem) nsIMemory_Release(nsmem); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index fcdf6f1..010aa51 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3263,6 +3263,22 @@ interface nsICommandManager : nsISupports [ object, + uuid(3275b2cd-af6d-429a-80d7-f0c5120342ac), + local +] +interface nsICategoryManager : nsISupports +{ + nsresult GetCategoryEntry(const char *aCategory, const char *aEntry, char **_retval); + nsresult AddCategoryEntry(const char *aCategory, const char *aEntry, const char *aValue, bool aPersist, + bool aReplace, char **_retval); + nsresult DeleteCategoryEntry(const char *aCategory, const char *aEntry, bool aPersist); + nsresult DeleteCategory(const char *aCategory); + nsresult EnumerateCategory(const char *aCategory, nsISimpleEnumerator **_retval); + nsresult EnumerateCategories(nsISimpleEnumerator **_retval); +} + +[ + object, uuid(47b82b60-a36f-4167-8072-6f421151ed50), local ]

1 0

Jacek Caban : mshtml: Pass external connection to WebBrowser host, if possible.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: d36ffab315de831dd3e430ee9320584d4db171a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ffab315de831dd3e430ee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:13:06 2013 +0200 mshtml: Pass external connection to WebBrowser host, if possible. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 85 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/oleobj.c | 2 +- 3 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f3c3b28..df7b600 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -965,6 +965,7 @@ void do_ns_command(HTMLDocument*,const char*,nsICommandParams*) DECLSPEC_HIDDEN; void update_doc(HTMLDocument*,DWORD) DECLSPEC_HIDDEN; void update_title(HTMLDocumentObj*) DECLSPEC_HIDDEN; +void set_document_navigation(HTMLDocumentObj*,BOOL) DECLSPEC_HIDDEN; HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 444abbc..2c0666e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1625,6 +1625,89 @@ static BOOL is_supported_doc_mime(const WCHAR *mime) return ret; } +static IUri *get_moniker_uri(IMoniker *mon) +{ + IUriContainer *uri_container; + IUri *ret = NULL; + HRESULT hres; + + hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); + if(SUCCEEDED(hres)) { + hres = IUriContainer_GetIUri(uri_container, &ret); + IUriContainer_Release(uri_container); + if(FAILED(hres)) + return NULL; + }else { + FIXME("No IUriContainer\n"); + } + + return ret; +} + +static void handle_extern_mime_navigation(nsChannelBSC *This) +{ + IWebBrowserPriv2IE8 *webbrowser_priv; + IOleCommandTarget *cmdtrg; + HTMLDocumentObj *doc_obj; + IBindCtx *bind_ctx; + IUri *uri; + VARIANT flags; + HRESULT hres; + + if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->doc_obj) + return; + + doc_obj = This->bsc.window->base.outer_window->doc_obj; + + hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 62, 0, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + + set_document_navigation(doc_obj, FALSE); + + if(!doc_obj->webbrowser) { + FIXME("unimplemented in non-webbrowser mode\n"); + return; + } + + uri = get_moniker_uri(This->bsc.mon); + if(!uri) + return; + + hres = CreateBindCtx(0, &bind_ctx); + if(FAILED(hres)) { + IUri_Release(uri); + return; + } + + V_VT(&flags) = VT_I4; + V_I4(&flags) = navHyperlink; + + hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv2IE8, (void**)&webbrowser_priv); + if(SUCCEEDED(hres)) { + hres = IWebBrowserPriv2IE8_NavigateWithBindCtx2(webbrowser_priv, uri, &flags, NULL, NULL, NULL, bind_ctx, NULL); + IWebBrowserPriv2IE8_Release(webbrowser_priv); + }else { + IWebBrowserPriv *webbrowser_priv_old; + VARIANT uriv; + + hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv, (void**)&webbrowser_priv_old); + if(SUCCEEDED(hres)) { + V_VT(&uriv) = VT_BSTR; + IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); + + hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); + + SysFreeString(V_BSTR(&uriv)); + IWebBrowserPriv_Release(webbrowser_priv_old); + } + } + + IUri_Release(uri); +} + static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); @@ -1634,6 +1717,8 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW if(This->is_doc_channel && !is_supported_doc_mime(status_text)) { FIXME("External MIME: %s\n", debugstr_w(status_text)); + handle_extern_mime_navigation(This); + This->nschannel = NULL; } diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fded548..1a123ac 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -210,7 +210,7 @@ void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } -static void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) +void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) { VARIANT var;

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetFuncDocString.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 7f47beb7d84922d813b6eae19eb34a14f9b8a14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f47beb7d84922d813b6eae19… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 19 11:10:05 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetFuncDocString. --- dlls/oleaut32/tests/typelib.c | 50 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 15 ++++++++++- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e1ede75..f560dd8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4325,9 +4325,10 @@ static void test_SetFuncAndParamNames(void) DeleteFileA(filenameA); } -static void test_SetVarDocString(void) +static void test_SetDocString(void) { static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR name2W[] = {'n','a','m','e','2',0}; static OLECHAR doc1W[] = {'d','o','c','1',0}; static OLECHAR doc2W[] = {'d','o','c','2',0}; static OLECHAR var_nameW[] = {'v','a','r','n','a','m','e',0}; @@ -4339,6 +4340,7 @@ static void test_SetVarDocString(void) ITypeInfo *ti; BSTR namestr, docstr; VARDESC desc, *pdesc; + FUNCDESC funcdesc, *pfuncdesc; HRESULT hr; VARIANT v; @@ -4393,6 +4395,29 @@ static void test_SetVarDocString(void) ICreateTypeInfo_Release(cti); + hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + memset(&funcdesc, 0, sizeof(funcdesc)); + funcdesc.memid = MEMBERID_NIL; + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(cti); + hr = ICreateTypeLib2_SaveAllChanges(ctl); ok(hr == S_OK, "got: %08x\n", hr); @@ -4422,6 +4447,27 @@ static void test_SetVarDocString(void) ITypeInfo_ReleaseVarDesc(ti, pdesc); ITypeInfo_Release(ti); + + hr = ITypeLib_GetTypeInfo(tl, 1, &ti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetFuncDesc(ti, 0, &pfuncdesc); + ok(hr == S_OK, "got %08x\n", hr); + ok(pfuncdesc->memid == 0x60000000, "got wrong memid: %x\n", pfuncdesc->memid); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got wrong funckind: %x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got wrong invkind: %x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got wrong callconv: %x\n", pfuncdesc->callconv); + + hr = ITypeInfo_GetDocumentation(ti, pfuncdesc->memid, &namestr, &docstr, NULL, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(namestr == NULL, "got wrong name: %s\n", wine_dbgstr_w(namestr)); + ok(memcmp(docstr, doc1W, sizeof(doc1W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr)); + + SysFreeString(docstr); + + ITypeInfo_ReleaseFuncDesc(ti, pfuncdesc); + ITypeInfo_Release(ti); + ITypeLib_Release(tl); DeleteFileA(filenameA); @@ -5001,7 +5047,7 @@ START_TEST(typelib) test_inheritance(); test_SetVarHelpContext(); test_SetFuncAndParamNames(); - test_SetVarDocString(); + test_SetDocString(); test_FindName(); if ((filename = create_test_typelib(2))) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index afcdc5c..2877f1a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10722,8 +10722,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncDocString(ICreateTypeInfo2 *ifac UINT index, LPOLESTR docString) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString)); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString)); + + if(!docString) + return E_INVALIDARG; + + if(index >= This->cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + func_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface,

1 0

Huw Davies : iphlpapi: Use socklen_t where appropriate.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: f9447f92ef9706fd9b6028c09c555b74c62d92f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9447f92ef9706fd9b6028c09… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 19 15:39:22 2013 +0100 iphlpapi: Use socklen_t where appropriate. --- dlls/iphlpapi/icmp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 6d26bb4..7d84811 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -223,7 +223,7 @@ DWORD WINAPI IcmpSendEcho( struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; - unsigned int addrlen; + socklen_t addrlen; unsigned short id,seq,cksum; int res; @@ -266,7 +266,7 @@ DWORD WINAPI IcmpSendEcho( if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - unsigned int len; + socklen_t len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len);

1 0