January 2008 - Wine-Commits

Alexandre Julliard : winex11.drv: Set the initial icon hints in set_initial_wm_hints().
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 6a23bd885d2832621e00401e38f2e53e82d812d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a23bd885d2832621e00401e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 14:34:57 2008 +0100 winex11.drv: Set the initial icon hints in set_initial_wm_hints(). --- dlls/winex11.drv/window.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e39a5ce..109b142 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -774,6 +774,12 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); wine_tsx11_unlock(); + + if (data->wm_hints) + { + data->wm_hints->flags = 0; + set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); + } } @@ -837,21 +843,17 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) ); - wine_tsx11_unlock(); - /* wm hints */ if (data->wm_hints) { - data->wm_hints->flags = InputHint | StateHint | WindowGroupHint; + data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; data->wm_hints->input = !(style & WS_DISABLED); data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; data->wm_hints->window_group = group_leader; - set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); - - wine_tsx11_lock(); XSetWMHints( display, data->whole_window, data->wm_hints ); - wine_tsx11_unlock(); } + + wine_tsx11_unlock(); }

1 0

Jacek Caban : shdocvw: Store URL in BindStatusCallback.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 4ff62118954f2de233fc4ab326b0baf665d57cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff62118954f2de233fc4ab32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 21:53:06 2008 +0100 shdocvw: Store URL in BindStatusCallback. --- dlls/shdocvw/navigate.c | 7 +++++-- dlls/shdocvw/shdocvw.h | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index ad9fc0b..37245f7 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -40,6 +40,7 @@ typedef struct { DocHost *doc_host; + LPWSTR url; HGLOBAL post_data; LPWSTR headers; ULONG post_data_len; @@ -160,6 +161,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) IOleClientSite_Release(CLIENTSITE(This->doc_host)); if(This->post_data) GlobalFree(This->post_data); + heap_free(This->url); heap_free(This->headers); heap_free(This); } @@ -379,7 +381,7 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = { HttpNegotiate_OnResponse }; -static IBindStatusCallback *create_callback(DocHost *doc_host, PBYTE post_data, +static IBindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE post_data, ULONG post_data_len, LPWSTR headers) { BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback)); @@ -388,6 +390,7 @@ static IBindStatusCallback *create_callback(DocHost *doc_host, PBYTE post_data, ret->lpHttpNegotiateVtbl = &HttpNegotiateVtbl; ret->ref = 1; + ret->url = heap_strdupW(url); ret->post_data = NULL; ret->post_data_len = post_data_len; ret->headers = NULL; @@ -613,7 +616,7 @@ static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG CoTaskMemFree(This->url); This->url = url; - callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers); + callback = create_callback(This, url, post_data, post_data_len, (LPWSTR)headers); CreateAsyncBindCtx(0, callback, 0, &bindctx); hres = bind_to_object(This, mon, This->url, bindctx, callback); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 494bae9..5b9ed46 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -38,6 +38,8 @@ #include "mshtmhst.h" #include "hlink.h" +#include "wine/unicode.h" + /********************************************************************** * Shell Instance Objects */ @@ -241,4 +243,19 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + #endif /* __WINE_SHDOCVW_H */

1 0

Alexander Nicolaysen Sørnes : Fix display of users' rejected items
by Chris Morgan Jan. 21, 2008

Jan. 21, 2008

Module: appdb Branch: master Commit: 39233922471a1ca18420e4c37f1d7555d72fdc01 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=39233922471a1ca18420e4c3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 23:20:45 2008 +0100 Fix display of users' rejected items --- include/sidebar_login.php | 6 +++--- include/testData.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sidebar_login.php b/include/sidebar_login.php index eb18ce2..b8f2a32 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -40,7 +40,7 @@ function global_sidebar_login() { } /* Display the user's rejected applications */ - $iAppsRejected = application::objectGetEntriesCount(true, true); + $iAppsRejected = application::objectGetEntriesCount('rejected'); if($iAppsRejected && !$_SESSION['current']->hasPriv("admin")) { $g->add("Review Rejected Apps ($iAppsRejected)", BASE."objectManager.php?". @@ -49,7 +49,7 @@ function global_sidebar_login() { } /* Display the user's rejected versions */ - $iVersionsRejected = version::objectGetEntriesCount(true, true); + $iVersionsRejected = version::objectGetEntriesCount('rejected'); if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) { $g->add("Review Rejected Versions ($iVersionsRejected)", @@ -58,7 +58,7 @@ function global_sidebar_login() { } /* Display the user's rejected test results */ - $iTestDataRejected = testData::objectGetEntriesCount(true, true); + $iTestDataRejected = testData::objectGetEntriesCount('rejected'); if($iTestDataRejected && !$_SESSION['current']->hasPriv("admin")) $g->add("Review Rejected Test Results ($iTestDataRejected)", BASE."objectManager.php?sClass=testData_queue&". diff --git a/include/testData.php b/include/testData.php index 899a4fe..19cf8ae 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1143,7 +1143,7 @@ class testData{ { $oTest = new testData(); - if($bQueued && !$oTest->canEdit()) + if($sState != 'accepted' && !$oTest->canEdit()) { if($sState == 'rejected') {

1 0

Alexander Nicolaysen Sørnes : Fix typo in isUserSuperMaintainer()
by Chris Morgan Jan. 21, 2008

Jan. 21, 2008

Module: appdb Branch: master Commit: 9524dac5dacaa69d020af21fd7be1f9822ad8e28 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9524dac5dacaa69d020af21f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 23:10:43 2008 +0100 Fix typo in isUserSuperMaintainer() --- include/maintainer.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 61ed570..61e6b6b 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -548,7 +548,7 @@ class maintainer $hResult = query_parameters($sQuery, $oUser->iUserId, $iAppId, 'accepted'); } else /* are we super maintainer of any applications? */ { - $sQuery = "SELECT * FROM appMaintainers WHERE userid = '?' AND superMaintainer = '1' AND state'?'"; + $sQuery = "SELECT * FROM appMaintainers WHERE userid = '?' AND superMaintainer = '1' AND state = '?'"; $hResult = query_parameters($sQuery, $oUser->iUserId, 'accepted'); } if(!$hResult)

1 0

Alexander Nicolaysen Sørnes : Use sState for objectGetEntries[Count]()
by Chris Morgan Jan. 20, 2008

Jan. 20, 2008

Module: appdb Branch: master Commit: 9b92c2221c679eddd1c00a2c83f6406d137c7b50 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9b92c2221c679eddd1c00a2c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 21:31:15 2008 +0100 Use sState for objectGetEntries[Count]() --- include/appData.php | 75 +++++++++++++++----------------- include/application.php | 16 +++---- include/application_queue.php | 8 ++-- include/bugs.php | 24 +++++------ include/comment.php | 2 +- include/distribution.php | 16 +++--- include/downloadurl.php | 13 +++--- include/maintainer.php | 95 ++++++++++++++++++---------------------- include/monitor.php | 4 +- include/note.php | 2 +- include/objectManager.php | 14 +++--- include/screenshot.php | 27 ++++++------ include/sidebar_admin.php | 27 +++++------ include/testData.php | 19 ++++---- include/testData_queue.php | 8 ++-- include/url.php | 10 ++-- include/vendor.php | 18 ++------ include/version.php | 22 ++++------ include/version_queue.php | 8 ++-- unit_test/test_om_objects.php | 8 ++-- 20 files changed, 190 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=9b92c2221c679eddd1c0…

1 0

Alexander Nicolaysen Sørnes : comment: Add <a name> tag in threaded mode
by Chris Morgan Jan. 20, 2008

Jan. 20, 2008

Module: appdb Branch: master Commit: 4297db978608c7adaee1273a70260a5ae93934aa URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4297db978608c7adaee1273a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 17:44:48 2008 +0100 comment: Add <a name> tag in threaded mode --- include/comment.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/comment.php b/include/comment.php index c521ee5..13aeefe 100644 --- a/include/comment.php +++ b/include/comment.php @@ -359,10 +359,12 @@ class Comment { Comment::view_app_comment($oRow); } else { - echo '<li><a href="commentview.php?iAppId='.$oRow->appId.'&iVersionId='.$oRow->versionId.'&iThreadId='.$oRow->parentId.'"> '. - $oRow->subject.' </a> by '.forum_lookup_user($oRow->userId).' on '.$oRow->time.' </li>'."\n"; + echo "<li><a href=\"commentview.php?iAppId={$oRow->appId}&iVersionId=". + "{$oRow->versionId}&iThreadId={$oRow->parentId}\" ". + "name=\"Comment-{$oRow->commentId}\"> ". + $oRow->subject.' </a> by '.forum_lookup_user($oRow->userId).' on '.$oRow->time.' </li>'."\n"; } - + $hResult2 = Comment::grab_comments($oRow->versionId, $oRow->commentId); if ($hResult2 && query_num_rows($hResult2)) {

1 0

Alexander Nicolaysen Sørnes : Update rating info when submitting un-queued test data
by Chris Morgan Jan. 18, 2008

Jan. 18, 2008

Module: appdb Branch: master Commit: 89299badedbe67c502057ba83f9a16df7b48eda6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=89299badedbe67c502057ba8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jan 18 23:03:54 2008 +0100 Update rating info when submitting un-queued test data --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index bca9a28..3861126 100644 --- a/include/testData.php +++ b/include/testData.php @@ -93,7 +93,7 @@ class testData{ $this->testData($this->iTestingId); $this->SendNotificationMail(); - if(!$this->sState == 'accepted') + if($this->sState == 'accepted') $oVersion->updateRatingInfo(); return true; }

1 0

Alexander Nicolaysen Sørnes : Don' t show vote link for obsolete versions
by Chris Morgan Jan. 18, 2008

Jan. 18, 2008

Module: appdb Branch: master Commit: 0f5bb1b0f9c2d9b5b9564b55b4fd4c1014b4945c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f5bb1b0f9c2d9b5b9564b55… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jan 18 17:24:17 2008 +0100 Don't show vote link for obsolete versions --- include/version.php | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/version.php b/include/version.php index 3d0a36e..740291c 100644 --- a/include/version.php +++ b/include/version.php @@ -836,17 +836,24 @@ class version { // main URL echo " <tr class=\"color1\"><td>URL</td><td>".$appLinkURL."</td></tr>\n"; - $oM = new objectManager("voteManager", "Vote"); - $oM->setReturnTo($this->objectMakeUrl()); // Votes - if($_SESSION['current']->isLoggedIn()) - $shVoteLink = '   <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&iVersionId='.$this->iVersionId.'">Vote</a>'; - else - $shVoteLink = ''; - echo html_tr(array( - "Votes", - vote_count_version_total($this->iVersionId).$shVoteLink), - "color0"); + if(!$this->iObsoleteBy) + { + $oM = new objectManager("voteManager", "Vote"); + $oM->setReturnTo($this->objectMakeUrl()); + + if($_SESSION['current']->isLoggedIn()) + $shVoteLink = '   <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&iVersionId='.$this->iVersionId.'">Vote</a>'; + else + $shVoteLink = ''; + + $shVoteText = vote_count_version_total($this->iVersionId).$shVoteLink; + } else + { + $shVoteText = 'Marked as obsolete'; + } + + echo html_tr(array('Votes', $shVoteText), 'color0'); $sRating = $this->sTestedRating; $sRelease = $this->sTestedRelease;

1 0

Austin English : wined3d: Spelling fixes.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: 3471f841a16df35c2f86d3ff54d71f1de009328f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3471f841a16df35c2f86d3ff5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 9 13:37:05 2008 -0600 wined3d: Spelling fixes. --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 26 +++++++++++++------------- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/pixelshader.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/state.c | 18 +++++++++--------- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/vertexbuffer.c | 8 ++++---- dlls/wined3d/vertexshader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 15 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3471f841a16df35c2f86d…

1 0

Austin English : Misc spelling fixes.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: f6caf1be814407171f547e20622ac879db40fcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6caf1be814407171f547e206… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 16 17:04:38 2008 -0600 Misc spelling fixes. --- dlls/advapi32/tests/registry.c | 2 +- dlls/advpack/files.c | 2 +- dlls/advpack/reg.c | 2 +- dlls/avifil32/avifile.c | 10 +++++----- dlls/avifil32/editstream.c | 4 ++-- dlls/avifil32/icmstream.c | 2 +- dlls/avifil32/wavfile.c | 2 +- dlls/browseui/progressdlg.c | 2 +- dlls/cabinet/fci.c | 18 +++++++++--------- dlls/cabinet/tests/extract.c | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6caf1be814407171f547…

1 0