December 2007 - Wine-Commits

Andrew Talbot : ntdll: Remove unneeded casts.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 1ebe82af65943bdafe8dfcfc613b60677f41c765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebe82af65943bdafe8dfcfc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 17:21:48 2007 +0000 ntdll: Remove unneeded casts. --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/heap.c | 4 ++-- dlls/ntdll/reg.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/sec.c | 4 ++-- dlls/ntdll/threadpool.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 90626db..3c0d549 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -209,7 +209,7 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) HANDLE sem; if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; if (!(ret = (HANDLE)interlocked_cmpxchg_ptr( (PVOID *)&crit->LockSemaphore, - (PVOID)sem, 0 ))) + sem, 0 ))) ret = sem; else NtClose(sem); /* somebody beat us to it */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 198c5b1..57ae2cb 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1621,8 +1621,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) ptr = entry->lpData; LIST_FOR_EACH_ENTRY( sub, &heapPtr->subheap_list, SUBHEAP, entry ) { - if (((char *)ptr >= (char *)sub->base) && - ((char *)ptr < (char *)sub->base + sub->size)) + if ((ptr >= (char *)sub->base) && + (ptr < (char *)sub->base + sub->size)) { currentheap = sub; break; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 8b724ec..a095ee3 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -833,7 +833,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath) KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); - KeyPath->Buffer = (PWCHAR)buf; + KeyPath->Buffer = buf; KeyPath->Length += sizeof(pathW); KeyPath->MaximumLength += sizeof(pathW); } diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 2f819c4..f9679a6 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -526,7 +526,7 @@ void RELAY_SetupDLL( HMODULE module ) /* patch the functions in the export table to point to the relay thunks */ funcs = (DWORD *)((char *)module + exports->AddressOfFunctions); - entry_point_rva = (const char *)descr->entry_point_base - (const char *)module; + entry_point_rva = descr->entry_point_base - (const char *)module; for (i = 0; i < exports->NumberOfFunctions; i++, funcs++) { if (!descr->entry_point_offsets[i]) continue; /* not a normal function */ diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index fd5ed7a..5a1fe89 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -66,8 +66,8 @@ static BOOLEAN copy_acl(DWORD nDestinationAclLength, PACL pDestinationAcl, PACL if (!pSourceAcl || !RtlValidAcl(pSourceAcl)) return FALSE; - - size = ((ACL *)pSourceAcl)->AclSize; + + size = pSourceAcl->AclSize; if (nDestinationAclLength < size) return FALSE; diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 147667b..f73f707 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -148,7 +148,7 @@ static NTSTATUS add_work_item_to_queue(struct work_item *work_item) { HANDLE sem; status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); - if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, (PVOID)sem, 0 )) + if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, sem, 0 )) NtClose(sem); /* somebody beat us to it */ } else

1 0

Jacek Caban : urlmon: Move setting protocol_sink to separated function.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 2e62330c67f1bd0145f0f27b89d6b3080ed4ba5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e62330c67f1bd0145f0f27b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 14:53:25 2007 +0100 urlmon: Move setting protocol_sink to separated function. --- dlls/urlmon/bindprot.c | 27 +++++++++++++++++++++------ dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index f97fc4f..936d078 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -105,9 +105,8 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) IInternetProtocol_Release(This->protocol); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_sink) - IInternetProtocolSink_Release(This->protocol_sink); + set_binding_sink(PROTOCOL(This), NULL); heap_free(This); URLMON_UnlockModule(); @@ -172,10 +171,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl IInternetBindInfo_AddRef(pOIBindInfo); This->bind_info = pOIBindInfo; - IInternetProtocolSink_AddRef(pOIProtSink); - This->protocol_sink = pOIProtSink; - - IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&This->service_provider); + set_binding_sink(PROTOCOL(This), pOIProtSink); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { @@ -268,6 +264,25 @@ static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) return IInternetProtocol_UnlockRequest(This->protocol); } +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink) +{ + BindProtocol *This = PROTOCOL_THIS(bind_protocol); + IInternetProtocolSink *prev_sink; + IServiceProvider *service_provider = NULL; + + if(sink) + IInternetProtocolSink_AddRef(sink); + prev_sink = InterlockedExchangePointer((void**)&This->protocol_sink, sink); + if(prev_sink) + IInternetProtocolSink_Release(prev_sink); + + if(sink) + IInternetProtocolSink_QueryInterface(sink, &IID_IServiceProvider, (void**)&service_provider); + service_provider = InterlockedExchangePointer((void**)&This->service_provider, service_provider); + if(service_provider) + IServiceProvider_Release(service_provider); +} + #undef PROTOCOL_THIS static const IInternetProtocolVtbl BindProtocolVtbl = { diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 631b60b..70906a1 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -71,6 +71,7 @@ HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol); +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); static inline void *heap_alloc(size_t len) {

1 0

Jeremy Newman : core status page: Fix link for dll override docs
by Jeremy Newman Dec. 31, 2007

Dec. 31, 2007

Module: website Branch: master Commit: d28be575635be17f8f866bbe8b7231d61d35a95b URL: http://source.winehq.org/git/website.git/?a=commit;h=d28be575635be17f8f866b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 31 11:25:53 2007 -0600 core status page: Fix link for dll override docs AUTHOR: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> --- templates/en/status_wine.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/status_wine.template b/templates/en/status_wine.template index 77cd61e..dae1119 100644 --- a/templates/en/status_wine.template +++ b/templates/en/status_wine.template @@ -140,7 +140,7 @@ </tr> <tr> <td>Native DLL overrides</td> - <td class="good"><a href="http://www.winehq.org/site/docs/wineusr-guide/config-dll">Good</a></td> + <td class="good"><a href="{$root}/site/docs/wineusr-guide/config-wine-main#AEN241">Good</a></td> <td><a href="{$root}/site/?issue=46#Feature:%20DLL%20overrides%20by%20Ove%20K%E5ven">#46</a>, <a href="{$root}/site/?issue=134#Native%20vs.%20Builtin%20DLLs">#134</a>, <a href="{$root}/site/?issue=180#Configuring%20Native%20OLE%20DLLs">#180</a>,

1 0

Zachary Goldberg : WWN 337
by Jeremy Newman Dec. 31, 2007

Dec. 31, 2007

Module: website Branch: master Commit: 2abf95ff1224a37093b3c2f03debc988e69133e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=2abf95ff1224a37093b3c2… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Sun Dec 30 16:26:55 2007 -0500 WWN 337 --- news/2007123001.xml | 7 + wwn/wn20071230_337.xml | 874 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 881 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2abf95ff1224a37093…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman Dec. 31, 2007

Dec. 31, 2007

Module: website Branch: master Commit: 1c51f5f3a896daf952259cdb0d14c01140adc62f URL: http://source.winehq.org/git/website.git/?a=commit;h=1c51f5f3a896daf952259c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 31 11:15:41 2007 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexander Nicolaysen Sørnes : version_queue: Allow to undo becoming maintainer or monitor
by Chris Morgan Dec. 30, 2007

Dec. 30, 2007

Module: appdb Branch: master Commit: 274f256a63d80d4c122a6811f49602386788f3e9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=274f256a63d80d4c122a6811… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 30 16:14:42 2007 +0100 version_queue: Allow to undo becoming maintainer or monitor --- include/version_queue.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/version_queue.php b/include/version_queue.php index 77ddac7..7ed7d34 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -149,7 +149,7 @@ class version_queue if(!$this->oVersion->iVersionId && $this->oVersion->iAppId && !$_SESSION['current']->isSuperMaintainer($this->oVersion->iAppId)) { - echo html_frame_start("Become Maintainer or Monitor Changes", "90%"); + echo html_frame_start("Become a Maintainer or Monitor Changes", "90%"); echo "<div style='padding:5px;' class='color0'>\n"; $oTable = new Table(); if($this->oVersion->iMaintainerRequest == MAINTAINER_REQUEST) @@ -173,6 +173,12 @@ class version_queue "name=\"iMaintainerRequest\" value=\"".MONITOR_REQUEST."\" /> ". "Monitor changes to this version, also after it has been accepted"); $oTable->AddRow($oTableRow); + $oTableRow = new TableRow(); + $oTableRow->AddTextCell(' '); + $oTableRow->AddTextCell('<input type="radio" name="iMaintainerRequest" value="0" /> '. + 'None of the above'); + $oTable->AddRow($oTableRow); + echo $oTable->GetString(); echo "</div\n"; echo html_frame_end();

1 0

Alexandre Julliard : Wine release 0.9.52
by Alexandre Julliard Dec. 28, 2007

Dec. 28, 2007

Module: website Branch: master Commit: 347e67b984c08dbf25584552753c4024ebcb8870 URL: http://source.winehq.org/git/website.git/?a=commit;h=347e67b984c08dbf255845… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 16:36:39 2007 +0100 Wine release 0.9.52 --- news/2007122801.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/news/2007122801.xml b/news/2007122801.xml new file mode 100644 index 0000000..29e92a5 --- /dev/null +++ b/news/2007122801.xml @@ -0,0 +1,25 @@ +<news> +<date>December 28, 2007</date> +<title>Wine 0.9.52 Released</title> +<body> +<p>Wine 0.9.52 was released today, with the following main changes:</p> + +<ul> +<li>Improved graphics tablet support.</li> +<li>Support for RPC context handles.</li> +<li>Fixes for some longstanding screen depth issues.</li> +<li>Implementation of "My Network Places" shell folder.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.52.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.52">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.52 : Alexandre Julliard : Release 0.9.52
by Alexandre Julliard Dec. 28, 2007

Dec. 28, 2007

Module: wine Branch: refs/tags/wine-0.9.52 Tag: c64830a35db842daf31ac8ab55c3adac81251d25 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c64830a35db842daf31ac8ab55c3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 16:26:23 2007 +0100 Release 0.9.52

1 0

Alexandre Julliard : Release 0.9.52.
by Alexandre Julliard Dec. 28, 2007

Dec. 28, 2007

Module: wine Branch: master Commit: c03617509409fb5a1f8528c6f927c0bc7ed9d2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03617509409fb5a1f8528c6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 16:26:23 2007 +0100 Release 0.9.52. --- ANNOUNCE | 868 +++++++++++++++++------------------------ ChangeLog | 1315 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1688 insertions(+), 515 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c03617509409fb5a1f852…

1 0

Vincent Hardy : regedit: Window caption correction.
by Alexandre Julliard Dec. 28, 2007

Dec. 28, 2007

Module: wine Branch: master Commit: d306bc00905118316749b925a5c068bdb9f356b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d306bc00905118316749b925a… Author: Vincent Hardy <vincent.hardy.be(a)gmail.com> Date: Fri Dec 28 11:11:25 2007 +0100 regedit: Window caption correction. --- programs/regedit/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index b972bed..0b309ff 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -182,7 +182,7 @@ END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Modification de la c&ha�ne" +CAPTION "Modification de la cha�ne" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nom de la valeur�:",IDC_STATIC,5,5,119,8

1 0