June 2006 - Wine-Commits - list.winehq.org

Mike McCormack : include: Fix FARPROC, NEARPROC and PROC definitions for amd64.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 77a83a7f4d36027df86aeacea9e0cd9c1c12fe8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77a83a7f4d36027df86aeac… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 00:27:33 2006 +0900 include: Fix FARPROC, NEARPROC and PROC definitions for amd64. --- include/windef.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 2c76d7b..63fdcf7 100644 --- a/include/windef.h +++ b/include/windef.h @@ -279,8 +279,9 @@ typedef HICON HCURSOR; /* Callback function pointers types */ -typedef INT (CALLBACK *FARPROC)(); -typedef INT (CALLBACK *PROC)(); +typedef INT_PTR (CALLBACK *FARPROC)(); +typedef INT_PTR (CALLBACK *NEARPROC)(); +typedef INT_PTR (CALLBACK *PROC)(); /* Macros to split words and longs. */

1 0

lostwages/ news/2006060501.xml wwn/wn20060605_ ...
by WineHQ June 5, 2006

June 5, 2006

ChangeSet ID: 25387 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/06/05 02:28:54 Added files: news : 2006060501.xml wwn : wn20060605_315.xml Log message: WWN #315 Patch: http://cvs.winehq.org/patch.py?id=25387 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006060501.xml Added 1.1 +0 -0 lostwages/wwn/wn20060605_315.xml

1 0

appdb/include sidebar.php
by WineHQ June 5, 2006

June 5, 2006

ChangeSet ID: 25386 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/04 20:11:07 Modified files: include : sidebar.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix wiki link Patch: http://cvs.winehq.org/patch.py?id=25386 Old revision New revision Changes Path 1.17 1.18 +1 -1 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.17 appdb/include/sidebar.php:1.18 --- appdb/include/sidebar.php:1.17 5 Jun 2006 1:11: 7 -0000 +++ appdb/include/sidebar.php 5 Jun 2006 1:11: 7 -0000 @@ -11,7 +11,7 @@ function global_sidebar_menu() { $g->add(APPDB_OWNER, APPDB_OWNER_URL); $g->add("AppDB", BASE); $g->add("Bugzilla", BUGZILLA_ROOT); - $g->add("Wine Wiki", "http:\\wiki.winehq.org"); + $g->add("Wine Wiki", "http://wiki.winehq.org"); $g->done(); $g = new htmlmenu("AppDB");

1 0

appdb/include sidebar.php
by WineHQ June 3, 2006

June 3, 2006

ChangeSet ID: 25385 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/03 18:53:41 Modified files: include : sidebar.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Update appdb to have a menu with links to all wine related sites Patch: http://cvs.winehq.org/patch.py?id=25385 Old revision New revision Changes Path 1.16 1.17 +4 -1 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.16 appdb/include/sidebar.php:1.17 --- appdb/include/sidebar.php:1.16 3 Jun 2006 23:53:41 -0000 +++ appdb/include/sidebar.php 3 Jun 2006 23:53:41 -0000 @@ -8,7 +8,10 @@ require_once(BASE."include/vendor.php"); function global_sidebar_menu() { $g = new htmlmenu(APPDB_OWNER." Menu"); - $g->add("Back to ".APPDB_OWNER, APPDB_OWNER_URL); + $g->add(APPDB_OWNER, APPDB_OWNER_URL); + $g->add("AppDB", BASE); + $g->add("Bugzilla", BUGZILLA_ROOT); + $g->add("Wine Wiki", "http:\\wiki.winehq.org"); $g->done(); $g = new htmlmenu("AppDB");

1 0

appdb/include testResults.php
by WineHQ June 3, 2006

June 3, 2006

ChangeSet ID: 25384 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/03 17:17:00 Modified files: include : testResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add link to rating definitions next to 'raiting' field on the test submission form Patch: http://cvs.winehq.org/patch.py?id=25384 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.14 appdb/include/testResults.php:1.15 --- appdb/include/testResults.php:1.14 3 Jun 2006 22:17: 0 -0000 +++ appdb/include/testResults.php 3 Jun 2006 22:17: 0 -0000 @@ -484,7 +484,7 @@ class testData{ // Rating echo '<tr><td class="color0"><b>Rating</b></td><td class="color0">',"\n"; make_maintainer_rating_list("sTestedRating", $this->sTestedRating); - echo '</td></tr>',"\n"; + echo '<a href="/help/?topic=maintainer_ratings">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td class="color1"><b>Extra comments</b></td>',"\n"; echo '<td class="color0"><textarea name="sComments" rows=10 cols=35>';

1 0

Juan Lang : winedbg: Fix a crash on initial empty input.
by Alexandre Julliard June 3, 2006

June 3, 2006

Module: wine Branch: refs/heads/master Commit: a866fa37e9d3c3c731215891c5b678a74bd21145 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a866fa37e9d3c3c73121589… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jun 2 18:07:42 2006 -0700 winedbg: Fix a crash on initial empty input. --- programs/winedbg/debug.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 5d78eda..a3df742 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -47,7 +47,7 @@ static size_t last_line_idx = 0; /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ - if (len == 0 || (len == 1 && tmp[0] == '\n') || (len == 2 && tmp[0] == '\r' && tmp[1] == '\n')) + if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n') || (len == 2 && tmp[0] == '\r' && tmp[1] == '\n'))) { HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Juan Lang : crypt32: Implement X509_NAME_VALUE encoding/decoding.
by Alexandre Julliard June 3, 2006

June 3, 2006

Module: wine Branch: refs/heads/master Commit: dd4bd4ad28232507668279645b7c95139f4d882a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd4bd4ad282325076682796… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jun 2 13:20:13 2006 -0700 crypt32: Implement X509_NAME_VALUE encoding/decoding. --- dlls/crypt32/crypt32_private.h | 1 dlls/crypt32/decode.c | 52 +++++++++++++++++++ dlls/crypt32/encode.c | 107 ++++++++++++++++++++++++---------------- dlls/crypt32/tests/encode.c | 2 - 4 files changed, 114 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dd4bd4ad28232507668…

1 0

Jacek Caban : shdocvw: Set focus in ui_activate.
by Alexandre Julliard June 3, 2006

June 3, 2006

Module: wine Branch: refs/heads/master Commit: d7043f23ca0fc0d2b6cc44213c305be9fec941df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7043f23ca0fc0d2b6cc442… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:58:53 2006 +0200 shdocvw: Set focus in ui_activate. --- dlls/shdocvw/oleobject.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c7cbb74..a6df8a6 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -174,6 +174,8 @@ static HRESULT activate_ui(WebBrowser *T * IOleInPlaceFrmae_SetMenu */ + SetFocus(This->shell_embedding_hwnd); + return S_OK; }

1 0

Jacek Caban : mshtml: Use mime type reported by moniker if possible.
by Alexandre Julliard June 3, 2006

June 3, 2006

Module: wine Branch: refs/heads/master Commit: 56bb028611df894aa5c5955eab944c41ae9ea5c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56bb028611df894aa5c5955… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:48:13 2006 +0200 mshtml: Use mime type reported by moniker if possible. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 16 ++++++++++++++++ dlls/mshtml/nsio.c | 7 +++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 725d041..17e44e6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -129,6 +129,7 @@ typedef struct { nsIInterfaceRequestor *notif_callback; nsLoadFlags load_flags; nsIURI *original_uri; + char *content; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 7e38cf3..217b087 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -268,8 +268,24 @@ static HRESULT WINAPI BindStatusCallback ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BSCallback *This = STATUSCLB_THIS(iface); + TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + + switch(ulStatusCode) { + case BINDSTATUS_MIMETYPEAVAILABLE: { + int len; + + if(!This->nschannel) + return S_OK; + HeapFree(GetProcessHeap(), 0, This->nschannel->content); + + len = WideCharToMultiByte(CP_ACP, 0, szStatusText, -1, NULL, 0, NULL, NULL); + This->nschannel->content = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + WideCharToMultiByte(CP_ACP, 0, szStatusText, -1, This->nschannel->content, -1, NULL, NULL); + } + } + return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 76f60ba..2a922a3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -213,6 +213,7 @@ static nsrefcnt NSAPI nsChannel_Release( nsIInterfaceRequestor_Release(This->notif_callback); if(This->original_uri) nsIURI_Release(This->original_uri); + HeapFree(GetProcessHeap(), 0, This->content); HeapFree(GetProcessHeap(), 0, This); } @@ -465,6 +466,11 @@ static nsresult NSAPI nsChannel_GetConte TRACE("(%p)->(%p)\n", This, aContentType); + if(This->content) { + nsACString_Init(aContentType, This->content); + return S_OK; + } + if(This->channel) return nsIChannel_GetContentType(This->channel, aContentType); @@ -1450,6 +1456,7 @@ static nsresult NSAPI nsIOService_NewCha ret->load_group = NULL; ret->notif_callback = NULL; ret->load_flags = 0; + ret->content = NULL; nsIURI_AddRef(aURI); ret->original_uri = aURI;

1 0

Jacek Caban : mshtml: Return S_OK in OnStartBinding and OnStopBinding.
by Alexandre Julliard June 3, 2006

June 3, 2006

Module: wine Branch: refs/heads/master Commit: 42f96fce67a1542e1d6ee717abe00ed223cfa1f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42f96fce67a1542e1d6ee71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:45:25 2006 +0200 mshtml: Return S_OK in OnStartBinding and OnStopBinding. --- dlls/mshtml/navigate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 01e5a56..7e38cf3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -247,7 +247,7 @@ static HRESULT WINAPI BindStatusCallback { BSCallback *This = STATUSCLB_THIS(iface); FIXME("(%p)->(%ld %p)\n", This, dwReserved, pbind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) @@ -278,7 +278,7 @@ static HRESULT WINAPI BindStatusCallback { BSCallback *This = STATUSCLB_THIS(iface); FIXME("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,

1 0