Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[hbelusca] 60551: [CSRSRV][CONSRV] - Fix the second parameter WaitType (aka. NotifyAll) of CsrNotifyWait. Indeed, we used before the constants WaitAll == 0 / WaitAny == 1 (see the WAIT_TYPE enum); ...
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 22:17:34 2013 New Revision: 60551 URL: http://svn.reactos.org/svn/reactos?rev=60551&view=rev Log: [CSRSRV][CONSRV] - Fix the second parameter WaitType (aka. NotifyAll) of CsrNotifyWait. Indeed, we used before the constants WaitAll == 0 / WaitAny == 1 (see the WAIT_TYPE enum); however, it appeared that Win2k3's CsrNotifyWait wanted a WaitType parameter == 1 when waiting for all the waits in a given wait-list. Therefore we would have to use WaitAll for waiting for any of the wait blocks, and WaitAny for waiting for all the wait blocks... looks illogical. Therefore I use instead a BOOLEAN variable (that I call NotifyAll) which is TRUE when I want to wait for all the wait blocks, and FALSE otherwise (as done e.g. for the WaitForMultipleObjects API). - Fix its usage in CONSRV. Magically fix key presses problems in console, when using Win2k3 csrsrv.dll ... Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/wait.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -349,7 +349,7 @@ BOOLEAN NTAPI CsrNotifyWait(IN PLIST_ENTRY WaitList, - IN ULONG WaitType, + IN BOOLEAN NotifyAll, IN PVOID WaitArgument1, IN PVOID WaitArgument2); Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -372,8 +372,8 @@ * @param WaitList * Pointer to the wait list whose wait blocks will be notified. * - * @param WaitType - * Type of the wait to perform, either WaitAny or WaitAll. + * @param NotifyAll + * Whether or not we must notify all the waits. * * @param WaitArgument[1-2] * User-defined argument to pass on to the wait function. @@ -386,7 +386,7 @@ BOOLEAN NTAPI CsrNotifyWait(IN PLIST_ENTRY WaitList, - IN ULONG WaitType, + IN BOOLEAN NotifyAll, IN PVOID WaitArgument1, IN PVOID WaitArgument2) { @@ -420,8 +420,11 @@ 0, FALSE); - /* We've already done a wait, so leave unless this is a Wait All */ - if (WaitType != WaitAll) break; + /* + * We've already done a wait, so leave unless + * we want to notify all the waits... + */ + if (!NotifyAll) break; } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -101,7 +101,7 @@ SetEvent(Console->InputBuffer.ActiveEvent); CsrNotifyWait(&Console->InputBuffer.ReadWaitQueue, - WaitAny, + FALSE, NULL, NULL); if (!IsListEmpty(&Console->InputBuffer.ReadWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -282,7 +282,7 @@ Console->UnpauseEvent = NULL; CsrNotifyWait(&Console->WriteWaitQueue, - WaitAll, + TRUE, NULL, NULL); if (!IsListEmpty(&Console->WriteWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -123,7 +123,7 @@ Console->UnpauseEvent = NULL; CsrNotifyWait(&Console->WriteWaitQueue, - WaitAll, + TRUE, NULL, NULL); if (!IsListEmpty(&Console->WriteWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -89,7 +89,7 @@ * return. */ CsrNotifyWait(&InputBuffer->ReadWaitQueue, - WaitAll, + TRUE, NULL, (PVOID)Entry); if (!IsListEmpty(&InputBuffer->ReadWaitQueue))

1 0

[akhaldi] 60550: [RPCSS] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 21:05:04 2013 New Revision: 60550 URL: http://svn.reactos.org/svn/reactos?rev=60550&view=rev Log: [RPCSS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/base/services/rpcss/epmp.c trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -19,6 +19,7 @@ */ #include <epm_s.h> + #include <wine/debug.h> #include <wine/list.h> @@ -88,16 +89,16 @@ WINE_FIXME("%p\n", entry_handle); } -void ept_insert(handle_t h, - unsigned32 num_ents, - ept_entry_t entries[], - boolean32 replace, - error_status_t *status) +void __cdecl ept_insert(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + boolean32 replace, + error_status_t *status) { unsigned32 i; RPC_STATUS rpc_status; - WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); + WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status); *status = RPC_S_OK; @@ -119,7 +120,7 @@ &entry->address); if (rpc_status != RPC_S_OK) { - WINE_WARN("TowerExplode failed %lu\n", rpc_status); + WINE_WARN("TowerExplode failed %u\n", rpc_status); *status = rpc_status; break; /* FIXME: more cleanup? */ } @@ -138,17 +139,17 @@ LeaveCriticalSection(&csEpm); } -void ept_delete(handle_t h, - unsigned32 num_ents, - ept_entry_t entries[], - error_status_t *status) +void __cdecl ept_delete(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + error_status_t *status) { unsigned32 i; RPC_STATUS rpc_status; *status = RPC_S_OK; - WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); + WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status); EnterCriticalSection(&csEpm); @@ -179,30 +180,30 @@ LeaveCriticalSection(&csEpm); } -void ept_lookup(handle_t h, - unsigned32 inquiry_type, - uuid_p_t object, - rpc_if_id_p_t interface_id, - unsigned32 vers_option, - ept_lookup_handle_t *entry_handle, - unsigned32 max_ents, - unsigned32 *num_ents, - ept_entry_t entries[], - error_status_t *status) +void __cdecl ept_lookup(handle_t h, + unsigned32 inquiry_type, + uuid_p_t object, + rpc_if_id_p_t interface_id, + unsigned32 vers_option, + ept_lookup_handle_t *entry_handle, + unsigned32 max_ents, + unsigned32 *num_ents, + ept_entry_t entries[], + error_status_t *status) { WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); *status = EPT_S_CANT_PERFORM_OP; } -void ept_map(handle_t h, - uuid_p_t object, - twr_p_t map_tower, - ept_lookup_handle_t *entry_handle, - unsigned32 max_towers, - unsigned32 *num_towers, - twr_p_t *towers, - error_status_t *status) +void __cdecl ept_map(handle_t h, + uuid_p_t object, + twr_p_t map_tower, + ept_lookup_handle_t *entry_handle, + unsigned32 max_towers, + unsigned32 *num_towers, + twr_p_t *towers, + error_status_t *status) { RPC_STATUS rpc_status; RPC_SYNTAX_IDENTIFIER iface, syntax; @@ -212,7 +213,7 @@ *status = RPC_S_OK; *num_towers = 0; - WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, + WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower, entry_handle, max_towers, num_towers, towers, status); rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, @@ -253,31 +254,31 @@ LeaveCriticalSection(&csEpm); } -void ept_lookup_handle_free(handle_t h, - ept_lookup_handle_t *entry_handle, +void __cdecl ept_lookup_handle_free(handle_t h, + ept_lookup_handle_t *entry_handle, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void __cdecl ept_inq_object(handle_t h, + GUID *ept_object, error_status_t *status) { - WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); - - *status = EPT_S_CANT_PERFORM_OP; -} - -void ept_inq_object(handle_t h, - GUID *ept_object, - error_status_t *status) -{ WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status); *status = EPT_S_CANT_PERFORM_OP; } -void ept_mgmt_delete(handle_t h, - boolean32 object_speced, - uuid_p_t object, - twr_p_t tower, - error_status_t *status) -{ - WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); - - *status = EPT_S_CANT_PERFORM_OP; -} +void __cdecl ept_mgmt_delete(handle_t h, + boolean32 object_speced, + uuid_p_t object, + twr_p_t tower, + error_status_t *status) +{ + WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + + *status = EPT_S_CANT_PERFORM_OP; +} Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -1,5 +1,5 @@ /* - * Running Object Table + * Running Object Table * * Copyright 2007 Robert Shearman * @@ -60,7 +60,7 @@ } } -HRESULT IrotRegister( +HRESULT __cdecl IrotRegister( IrotHandle h, const MonikerComparisonData *data, const InterfaceData *obj, @@ -140,7 +140,7 @@ return hr; } -HRESULT IrotRevoke( +HRESULT __cdecl IrotRevoke( IrotHandle h, IrotCookie cookie, IrotContextHandle *ctxt_handle, @@ -187,7 +187,7 @@ return E_INVALIDARG; } -HRESULT IrotIsRunning( +HRESULT __cdecl IrotIsRunning( IrotHandle h, const MonikerComparisonData *data) { @@ -212,7 +212,7 @@ return hr; } -HRESULT IrotGetObject( +HRESULT __cdecl IrotGetObject( IrotHandle h, const MonikerComparisonData *moniker_data, PInterfaceData *obj, @@ -254,7 +254,7 @@ return MK_E_UNAVAILABLE; } -HRESULT IrotNoteChangeTime( +HRESULT __cdecl IrotNoteChangeTime( IrotHandle h, IrotCookie cookie, const FILETIME *last_modified_time) @@ -278,7 +278,7 @@ return E_INVALIDARG; } -HRESULT IrotGetTimeOfLastChange( +HRESULT __cdecl IrotGetTimeOfLastChange( IrotHandle h, const MonikerComparisonData *moniker_data, FILETIME *time) @@ -306,7 +306,7 @@ return hr; } -HRESULT IrotEnumRunning( +HRESULT __cdecl IrotEnumRunning( IrotHandle h, PInterfaceList *list) { Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -122,7 +122,7 @@ return TRUE; } -#if 0 +#ifndef __REACTOS__ int main( int argc, char **argv ) { /* Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -233,7 +233,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 reactos/base/applications/wordpad # Synced to Wine-1.5.26 -reactos/base/services/rpcss # Synced to Wine-20081105 +reactos/base/services/rpcss # Synced to Wine-1.7.1 reactos/base/system/expand # Synced to Wine-1.5.26 reactos/base/system/msiexec # Synced to Wine-1.5.26 reactos/modules/rosapps/winfile # Autosync

1 0

[akhaldi] 60549: [WINE] * Mark localspl as in sync. * Hide evidence re. the existence of my time machine. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 21:00:36 2013 New Revision: 60549 URL: http://svn.reactos.org/svn/reactos?rev=60549&view=rev Log: [WINE] * Mark localspl as in sync. * Hide evidence re. the existence of my time machine. CORE-7469 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 5 21:00:36 2013 @@ -94,7 +94,7 @@ reactos/dll/win32/itss # Synced to Wine-1.7.1 reactos/dll/win32/jscript # Synced to Wine-1.7.1 reactos/dll/win32/loadperf # Synced to Wine-1.7.1 -reactos/dll/win32/localspl # Synced to Wine-1.5.26 +reactos/dll/win32/localspl # Synced to Wine-1.7.1 reactos/dll/win32/localui # Synced to Wine-1.7.1 reactos/dll/win32/lz32 # Synced to Wine-1.5.19 reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 @@ -242,7 +242,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.11 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.1 reactos/lib/sdk/uuid # Synced to Wine-1.1.42 advapi32 -

1 0

[akhaldi] 60548: [STRMBASE] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 20:55:09 2013 New Revision: 60548 URL: http://svn.reactos.org/svn/reactos?rev=60548&view=rev Log: [STRMBASE] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/enumpins.c trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] Sat Oct 5 20:55:09 2013 @@ -24,6 +24,8 @@ #include <assert.h> #define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -211,8 +213,8 @@ REGFILTER2 rf2; rf2.dwVersion = 1; rf2.dwMerit = pFilter->merit; - rf2.cPins = pFilter->pins; - rf2.rgPins = pFilter->pPin; + rf2.u.s1.cPins = pFilter->pins; + rf2.u.s1.rgPins = pFilter->pPin; return IFilterMapper2_RegisterFilter(pIFM2, pFilter->clsid, pFilter->name, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rf2); } Modified: trunk/reactos/lib/3rdparty/strmbase/enumpins.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/enum… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] Sat Oct 5 20:55:09 2013 @@ -76,7 +76,7 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -99,28 +99,27 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); - - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); - - return refCount; + ULONG ref = InterlockedIncrement(&This->refCount); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; } static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) + ULONG ref = InterlockedDecrement(&This->refCount); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) { IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); - return 0; - } - else - return refCount; + } + + return ref; } static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) @@ -129,7 +128,7 @@ HRESULT hr = S_OK; ULONG i = 0; - TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); + TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); if (!ppPins) return E_POINTER; @@ -168,7 +167,7 @@ { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%u)\n", cPins); + TRACE("(%p)->(%u)\n", iface, cPins); if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -184,7 +183,8 @@ { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("IEnumPinsImpl::Reset()\n"); + TRACE("(%p)->()\n", iface); + This->Version = This->receive_version(This->base); This->uIndex = 0; @@ -196,7 +196,7 @@ HRESULT hr; IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumPins_Construct(This->base, This->receive_pin, This->receive_pincount, This->receive_version, ppEnum); if (FAILED(hr)) Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Sat Oct 5 20:55:09 2013 @@ -343,8 +343,8 @@ DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); + IUnknown_Release(This->seekthru_unk); CoTaskMemFree(This); - IUnknown_Release(This->seekthru_unk); return 0; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 5 20:55:09 2013 @@ -242,7 +242,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.5.26 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.11 reactos/lib/sdk/uuid # Synced to Wine-1.1.42 advapi32 -

1 0

[akhaldi] 60547: [MSVCRTD_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 20:50:11 2013 New Revision: 60547 URL: http://svn.reactos.org/svn/reactos?rev=60547&view=rev Log: [MSVCRTD_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/msvcrtd/CMakeLists.txt trunk/rostests/winetests/msvcrtd/debug.c trunk/rostests/winetests/msvcrtd/testlist.c Modified: trunk/rostests/winetests/msvcrtd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvcrtd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/CMakeLists.txt [iso-8859-1] Sat Oct 5 20:50:11 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(msvcrtd_winetest debug.c testlist.c) -target_link_libraries(msvcrtd_winetest wine) set_module_type(msvcrtd_winetest win32cui) -add_importlibs(msvcrtd_winetest msvcrt kernel32 ntdll) +add_importlibs(msvcrtd_winetest msvcrt kernel32) add_cd_file(TARGET msvcrtd_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msvcrtd/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/debug.c… ============================================================================== --- trunk/rostests/winetests/msvcrtd/debug.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/debug.c [iso-8859-1] Sat Oct 5 20:50:11 2013 @@ -34,7 +34,7 @@ /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y) -#define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static int init_functions(void) { @@ -45,7 +45,11 @@ return FALSE; } - SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z"); + if (sizeof(void *) > sizeof(int)) /* 64-bit has a different mangled name */ + SET(pMSVCRTD_operator_new_dbg, "??2@YAPEAX_KHPEBDH@Z"); + else + SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z"); + if (pMSVCRTD_operator_new_dbg == NULL) return FALSE; Modified: trunk/rostests/winetests/msvcrtd/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/testlis… ============================================================================== --- trunk/rostests/winetests/msvcrtd/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/testlist.c [iso-8859-1] Sat Oct 5 20:50:11 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_debug(void);

1 0

[akhaldi] 60546: [COMDLG32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 20:44:20 2013 New Revision: 60546 URL: http://svn.reactos.org/svn/reactos?rev=60546&view=rev Log: [COMDLG32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt trunk/rostests/winetests/comdlg32/filedlg.c trunk/rostests/winetests/comdlg32/finddlg.c trunk/rostests/winetests/comdlg32/fontdlg.c trunk/rostests/winetests/comdlg32/itemdlg.c trunk/rostests/winetests/comdlg32/printdlg.c trunk/rostests/winetests/comdlg32/rsrc.rc trunk/rostests/winetests/comdlg32/testlist.c Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE filedlg.c @@ -7,12 +5,10 @@ fontdlg.c itemdlg.c printdlg.c - testlist.c - rsrc.rc) + testlist.c) -add_executable(comdlg32_winetest ${SOURCE}) -target_link_libraries(comdlg32_winetest wine uuid) - +add_executable(comdlg32_winetest ${SOURCE} rsrc.rc) +target_link_libraries(comdlg32_winetest uuid) set_module_type(comdlg32_winetest win32cui) -add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll ole32 shell32) +add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 msvcrt kernel32) add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -19,12 +19,23 @@ * */ -#include <windows.h> +//#include <windows.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <wine/test.h> -#include "shlguid.h" +#include <wingdi.h> +#include <objbase.h> +#include <cderr.h> +#include <dlgs.h> +#include <commdlg.h> + +#include <shlguid.h> #define COBJMACROS -#include "shobjidl.h" +#include <shobjidl.h> /* ##### */ @@ -93,7 +104,7 @@ ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -239,7 +250,7 @@ return 0; } -static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_INITDIALOG) { @@ -266,7 +277,7 @@ char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = create_view_window2_hook; @@ -283,10 +294,10 @@ char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; + ofn.lpfnHook = template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; @@ -318,7 +329,7 @@ { 0xffffffff } }; -static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { static RECT initrc, rc; static int index, count; @@ -531,14 +542,14 @@ static void test_resize(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; DWORD ret; int i; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; + ofn.lpfnHook = resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); ofn.lpTemplateName = "template_sz"; for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { @@ -581,7 +592,7 @@ /* test_ok_wndproc can be used as hook procedure or a subclass * window proc for the file dialog */ -static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { HWND parent = GetParent( dlg); static ok_wndproc_testcase *testcase = NULL; @@ -624,7 +635,7 @@ return FALSE; } -static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_SETFONT) SetWindowLongPtrA( dlg, GWLP_WNDPROC, (LONG_PTR) test_ok_wndproc); @@ -633,7 +644,7 @@ static void test_ok(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char tmpfilename[ MAX_PATH]; char curdir[MAX_PATH]; @@ -655,9 +666,7 @@ for( i = 0; ok_testcases[i].retval != -1; i++) { strcpy( filename, tmpfilename); ofn.lCustData = (LPARAM)(ok_testcases + i); - ofn.lpfnHook = ok_testcases[i].do_subclass - ? (LPOFNHOOKPROC) ok_template_hook - : (LPOFNHOOKPROC) test_ok_wndproc; + ofn.lpfnHook = ok_testcases[i].do_subclass ? ok_template_hook : test_ok_wndproc; ret = GetOpenFileNameA(&ofn); ok( ok_testcases[i].expclose == ok_testcases[i].actclose, "testid %d: Open File dialog should %shave closed.\n", i, @@ -706,7 +715,7 @@ { -1 } }; -static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) { static int index, fixhelp; static posz posz0[2]; @@ -843,10 +852,10 @@ return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook_arrange; + ofn.lpfnHook = template_hook_arrange; ofn.hInstance = hDlgTmpl; ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; for( i = 0; arrange_tests[i].nrcontrols != -1; i++) { @@ -916,7 +925,7 @@ ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -948,7 +957,7 @@ skip( "some interactive resizable dialog tests (set WINETEST_INTERACTIVE=1)\n"); return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = NULL; @@ -983,7 +992,7 @@ static void test_mru(void) { ok_wndproc_testcase testcase = {0}; - OPENFILENAME ofn = {sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; const char *test_dir_name = "C:\\mru_test"; const char *test_file_name = "test.txt"; const char *test_full_path = "C:\\mru_test\\test.txt"; @@ -996,7 +1005,7 @@ ofn.hInstance = GetModuleHandle(NULL); ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_NOCHANGEDIR; ofn.lCustData = (LPARAM)&testcase; - ofn.lpfnHook = (LPOFNHOOKPROC)test_ok_wndproc; + ofn.lpfnHook = test_ok_wndproc; SetLastError(0xdeadbeef); ret = CreateDirectoryA(test_dir_name, NULL); @@ -1044,55 +1053,198 @@ return FALSE; } -static const char *defext_filters[] = { - "TestFilter (*.pt*)\0*.pt*\0", - "TestFilter (*.ab?)\0*.ab?\0", - "TestFilter (*.*)\0*.*\0", - NULL /* is a test, not an endmark! */ -}; - #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +static void test_extension_helper(OPENFILENAME* ofn, const char *filter, + const char *expected_filename) +{ + char *filename_ptr; + DWORD ret; + BOOL boolret; + + strcpy(ofn->lpstrFile, "deadbeef"); + ofn->lpstrFilter = filter; + + boolret = GetSaveFileNameA(ofn); + ok(boolret, "%s: expected TRUE\n", filter); + + ret = CommDlgExtendedError(); + ok(!ret, "%s: CommDlgExtendedError returned %#x\n", filter, ret); + + filename_ptr = ofn->lpstrFile + ofn->nFileOffset; + ok(strcmp(filename_ptr, expected_filename) == 0, + "%s: Filename is %s, expected %s\n", filter, filename_ptr, expected_filename); +} + static void test_extension(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char curdir[MAX_PATH]; - char *filename_ptr; - const char *test_file_name = "deadbeef"; unsigned int i; - DWORD ret; BOOL boolret; + + const char *defext_concrete_filters[] = { + "TestFilter (*.abc)\0*.abc\0", + "TestFilter (*.abc;)\0*.abc;\0", + "TestFilter (*.abc;*.def)\0*.abc;*.def\0", + }; + + const char *defext_wildcard_filters[] = { + "TestFilter (*.pt*)\0*.pt*\0", + "TestFilter (*.pt*;*.abc)\0*.pt*;*.abc\0", + "TestFilter (*.ab?)\0*.ab?\0", + "TestFilter (*.*)\0*.*\0", + "TestFilter (*sav)\0*sav\0", + NULL /* is a test, not an endmark! */ + }; boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); - /* Ignore .* extension */ - ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; - ofn.lpstrDefExt = NULL; ofn.lpstrInitialDir = curdir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - for (i = 0; i < ARRAY_SIZE(defext_filters); i++) { - ofn.lpstrFilter = defext_filters[i]; - strcpy(filename, test_file_name); - boolret = GetSaveFileNameA(&ofn); - ok(boolret, "%u: expected true\n", i); - ret = CommDlgExtendedError(); - ok(!ret, "%u: CommDlgExtendedError returned %#x\n", i, ret); - filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); - ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); - ok( strcmp(filename_ptr, test_file_name) == 0, - "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + ofn.lpstrDefExt = NULL; + + /* Without lpstrDefExt, append no extension */ + test_extension_helper(&ofn, "TestFilter (*.abc) lpstrDefExt=NULL\0*.abc\0", "deadbeef"); + test_extension_helper(&ofn, "TestFilter (*.ab?) lpstrDefExt=NULL\0*.ab?\0", "deadbeef"); + + ofn.lpstrDefExt = ""; + + /* If lpstrDefExt="" and the filter has a concrete extension, append it */ + test_extension_helper(&ofn, "TestFilter (*.abc) lpstrDefExt=\"\"\0*.abc\0", "deadbeef.abc"); + + /* If lpstrDefExt="" and the filter has a wildcard extension, do nothing */ + test_extension_helper(&ofn, "TestFilter (*.ab?) lpstrDefExt=\"\"\0*.ab?\0", "deadbeef"); + + ofn.lpstrDefExt = "xyz"; + + /* Append concrete extensions from filters */ + for (i = 0; i < ARRAY_SIZE(defext_concrete_filters); i++) { + test_extension_helper(&ofn, defext_concrete_filters[i], "deadbeef.abc"); + } + + /* Append nothing from this filter */ + test_extension_helper(&ofn, "TestFilter (*.)\0*.\0", "deadbeef"); + + /* Ignore wildcard extensions in filters */ + for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) { + test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz"); } } #undef ARRAY_SIZE + + +static BOOL WINAPI test_null_enum(HWND hwnd, LPARAM lParam) +{ + /* Find the textbox and send a filename so IDOK will work. + If the file textbox is empty IDOK will be ignored */ + CHAR className[20]; + if(GetClassNameA(hwnd, className, sizeof(className)) > 0 && !strcmp("Edit",className)) + { + SetWindowText(hwnd, "testfile"); + return FALSE; /* break window enumeration */ + } + return TRUE; +} + +static UINT_PTR WINAPI test_null_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HWND parent = GetParent( dlg); + if( msg == WM_NOTIFY) { + SetTimer( dlg, 0, 100, 0); + SetTimer( dlg, 1, 1000, 0); + EnumChildWindows( parent, test_null_enum, 0); + } + if( msg == WM_TIMER) { + if(!wParam) + PostMessage( parent, WM_COMMAND, IDOK, 0); + else { + /* the dialog did not close automatically */ + KillTimer( dlg, 0); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + } + } + return FALSE; +} + +static void test_null_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + DWORD ret; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = NULL; + ofnA.nMaxFile = 0; + ofnA.nFileOffset = 0xdead; + ofnA.nFileExtension = 0xbeef; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + todo_wine ok(!ret, "CommDlgExtendedError returned %#x, should be 0\n", ret); + + todo_wine ok(ofnA.nFileOffset != 0xdead, "ofnA.nFileOffset is 0xdead\n"); + todo_wine ok(ofnA.nFileExtension != 0xbeef, "ofnA.nFileExtension is 0xbeef\n"); + + ofnA.lpstrFile = NULL; + ofnA.nMaxFile = 1024; /* bogus input - lpstrFile = NULL but fake 1024 bytes available */ + ofnA.nFileOffset = 0xdead; + ofnA.nFileExtension = 0xbeef; + ret = GetOpenFileNameA(&ofnA); + ok(ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + + ok(ofnA.nFileOffset != 0xdead, "ofnA.nFileOffset is 0xdead\n"); + ok(ofnA.nFileExtension == 0, "ofnA.nFileExtension is 0x%x, should be 0\n", ofnA.nFileExtension); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = NULL; + ofnW.nMaxFile = 0; + ofnW.nFileOffset = 0xdead; + ofnW.nFileExtension = 0xbeef; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(ret, "GetOpenFileNameW returned %#x\n", ret); + ret = CommDlgExtendedError(); + todo_wine ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + + todo_wine ok(ofnW.nFileOffset != 0xdead, "ofnW.nFileOffset is 0xdead\n"); + todo_wine ok(ofnW.nFileExtension != 0xbeef, "ofnW.nFileExtension is 0xbeef\n"); + + ofnW.lpstrFile = NULL; + ofnW.nMaxFile = 1024; /* bogus input - lpstrFile = NULL but fake 1024 bytes available */ + ofnW.nFileOffset = 0xdead; + ofnW.nFileExtension = 0xbeef; + ret = GetOpenFileNameW(&ofnW); + ok(ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + + ok(ofnW.nFileOffset != 0xdead, "ofnW.nFileOffset is 0xdead\n"); + ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); +} START_TEST(filedlg) { @@ -1106,4 +1258,5 @@ test_mru(); if( resizesupported) test_resizable2(); test_extension(); -} + test_null_filename(); +} Modified: trunk/rostests/winetests/comdlg32/finddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/finddl… ============================================================================== --- trunk/rostests/winetests/comdlg32/finddlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/finddlg.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -19,9 +19,16 @@ * */ -#include "windows.h" -#include "commdlg.h" -#include "wine/test.h" +//#include "windows.h" + +#define WIN32_NO_STATUS + +#include <wine/test.h> + +#include <wingdi.h> +#include <winuser.h> +#include <cderr.h> +#include <commdlg.h> static UINT ID_FINDMSGSTRING; Modified: trunk/rostests/winetests/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/fontdl… ============================================================================== --- trunk/rostests/winetests/comdlg32/fontdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/fontdlg.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -19,19 +19,21 @@ * */ -#include <stdarg.h> +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winspool.h" -#include "winuser.h" -#include "objbase.h" +#include <wine/test.h> -#include "commdlg.h" +//#include <stdarg.h> -#include "wine/test.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include <wingdi.h> +#include <winspool.h> +#include <winuser.h> +//#include "objbase.h" + +#include <commdlg.h> static int get_dpiy(void) { Modified: trunk/rostests/winetests/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/itemdl… ============================================================================== --- trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -19,11 +19,16 @@ * */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <wine/test.h> + #define COBJMACROS #define CONST_VTABLE -#include "shlobj.h" -#include "wine/test.h" +#include <shlobj.h> static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); @@ -277,17 +282,26 @@ IExplorerBrowser *peb; IShellBrowser *psb; + hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + /* since win8, the result is E_NOTIMPL for all other services */ hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&peb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&psb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IShellBrowser_Release(psb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IServiceProvider_QueryService(psp, &IID_IUnknown, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); IServiceProvider_Release(psp); @@ -369,7 +383,7 @@ hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogEvents, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(pfd); + if(SUCCEEDED(hr)) IFileDialog_Release(pfd); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -379,7 +393,7 @@ ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileOpenDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); @@ -1378,11 +1392,12 @@ &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); if(FAILED(hr)) { skip("Skipping IFileDialogCustomize tests.\n"); + IFileDialog_Release(pfod); return; } @@ -1666,7 +1681,7 @@ IFileDialogEvents_Release(pfde); IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); @@ -1674,7 +1689,7 @@ &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileDialogCustomize_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); i = 0; @@ -1884,8 +1899,32 @@ } IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); +} + +static void test_persistent_state(void) +{ + IFileDialog *fd; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + +if (0) +{ + /* crashes at least on Win8 */ + hr = IFileDialog_SetClientGuid(fd, NULL); +} + + hr = IFileDialog_SetClientGuid(fd, &IID_IUnknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IFileDialog_SetClientGuid(fd, &IID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IFileDialog_Release(fd); } START_TEST(itemdlg) @@ -1899,6 +1938,7 @@ test_advise(); test_filename(); test_customize(); + test_persistent_state(); } else skip("Skipping all Item Dialog tests.\n"); Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… ============================================================================== --- trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -2,6 +2,7 @@ * Unit test suite for comdlg32 API functions: printer dialogs * * Copyright 2006-2007 Detlef Riekenberg + * Copyright 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,24 +20,31 @@ * */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" - -#include "cderr.h" -#include "commdlg.h" - -#include "wine/test.h" +#define COBJMACROS +#define CONST_VTABLE +#define WIN32_NO_STATUS + +#include <wine/test.h> + +//#include <stdarg.h> +#include <stdio.h> + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include <wingdi.h> +#include <winuser.h> +#include <objbase.h> + +#include <cderr.h> +#include <commdlg.h> +#include <dlgs.h> /* ########################### */ +extern const IID IID_IObjectWithSite; + static HMODULE hcomdlg32; -static HRESULT (WINAPI * pPrintDlgExA)(LPPRINTDLGEXA); static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); /* ########################### */ @@ -44,25 +52,16 @@ static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; -/* ########################### */ - -static LPCSTR load_functions(void) -{ - LPCSTR ptr; - - ptr = "comdlg32.dll"; - hcomdlg32 = GetModuleHandleA(ptr); - - ptr = "PrintDlgExA"; - pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExA) return ptr; - - ptr = "PrintDlgExW"; - pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExW) return ptr; - - return NULL; - +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; } /* ########################### */ @@ -127,9 +126,21 @@ /* ########################### */ +static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + /* some driver popup a dialog and hung the test or silently limit the number of copies, + when trying to set more than 999 copies */ + SetDlgItemInt(hdlg, edt3, 123, FALSE); + PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); + } + return 0; +} + static void test_PrintDlgA(void) { - DWORD res; + DWORD res, n_copies = 0; LPPRINTDLGA pDlg; DEVNAMES *pDevNames; LPCSTR driver; @@ -137,7 +148,7 @@ LPCSTR port; CHAR buffer[MAX_PATH]; LPSTR ptr; - + DEVMODE *dm; pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGA)) * 2); if (!pDlg) return; @@ -200,9 +211,7 @@ /* The Driver Entry does not include a Path */ ptr = strrchr(driver, '\\'); - todo_wine { ok( ptr == NULL, "got %p for '%s' (expected NULL for a simple name)\n", ptr, driver); - } /* The Driver Entry does not have an extension (fixed to ".drv") */ ptr = strrchr(driver, '.'); @@ -220,37 +229,172 @@ res, GetLastError(), ptr, buffer); if (ptr) ptr[0] = '\0'; - todo_wine { ok( lstrcmpiA(driver, buffer) == 0, "got driver '%s' (expected '%s')\n", driver, buffer); - } - + + n_copies = DeviceCapabilities(device, port, DC_COPIES, NULL, NULL); + ok(n_copies > 0, "DeviceCapabilities(DC_COPIES) failed\n"); } GlobalUnlock(pDlg->hDevNames); - GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); + + /* if device doesn't support printing of multiple copies then + * an attempt to set number of copies > 1 in print dialog would + * cause the PrintDlg under Windows display the MessageBox and + * the test will hang waiting for user response. + */ + if (n_copies > 1) + { + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + /* Version of Microsoft XPS Document Writer driver shipped before Win7 + * reports that it can print multiple copies, but returns 1. + */ + ok(pDlg->nCopies == 123 || broken(pDlg->nCopies == 1), "expected nCopies 123, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + /* some broken drivers use always PD_USEDEVMODECOPIES */ + ok((S1(U1(*dm)).dmCopies == 1) || broken(S1(U1(*dm)).dmCopies == 123), + "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK | PD_USEDEVMODECOPIES; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + ok(S1(U1(*dm)).dmCopies == 123, "expected dm->dmCopies 123, got %d\n", S1(U1(*dm)).dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + } + HeapFree(GetProcessHeap(), 0, pDlg); - } /* ########################### */ +static HRESULT WINAPI callback_QueryInterface(IPrintDialogCallback *iface, + REFIID riid, void **ppv) +{ + ok(0, "callback_QueryInterface(%s): unexpected call\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI callback_AddRef(IPrintDialogCallback *iface) +{ + trace("callback_AddRef\n"); + return 2; +} + +static ULONG WINAPI callback_Release(IPrintDialogCallback *iface) +{ + trace("callback_Release\n"); + return 1; +} + +static HRESULT WINAPI callback_InitDone(IPrintDialogCallback *iface) +{ + trace("callback_InitDone\n"); + return S_OK; +} + +static HRESULT WINAPI callback_SelectionChange(IPrintDialogCallback *iface) +{ + trace("callback_SelectionChange\n"); + return S_OK; +} + +static HRESULT WINAPI callback_HandleMessage(IPrintDialogCallback *iface, + HWND hdlg, UINT msg, WPARAM wp, LPARAM lp, LRESULT *res) +{ + trace("callback_HandleMessage %p,%04x,%lx,%lx,%p\n", hdlg, msg, wp, lp, res); + /* *res = PD_RESULT_PRINT; */ + return S_OK; +} + +static const IPrintDialogCallbackVtbl callback_Vtbl = +{ + callback_QueryInterface, + callback_AddRef, + callback_Release, + callback_InitDone, + callback_SelectionChange, + callback_HandleMessage +}; + +static IPrintDialogCallback callback = { &callback_Vtbl }; + +static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + trace("unknown_QueryInterface %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IPrintDialogCallback)) + { + *ppv = &callback; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IObjectWithSite)) + { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected IID %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI unknown_AddRef(IUnknown *iface) +{ + trace("unknown_AddRef\n"); + return 2; +} + +static ULONG WINAPI unknown_Release(IUnknown *iface) +{ + trace("unknown_Release\n"); + return 1; +} + +static const IUnknownVtbl unknown_Vtbl = +{ + unknown_QueryInterface, + unknown_AddRef, + unknown_Release +}; + +static IUnknown unknown = { &unknown_Vtbl }; + static void test_PrintDlgExW(void) { + PRINTPAGERANGE pagerange[2]; LPPRINTDLGEXW pDlg; + DEVNAMES *dn; HRESULT res; + + /* PrintDlgEx not present before w2k */ + if (!pPrintDlgExW) { + skip("PrintDlgExW not available\n"); + return; + } /* Set CommDlgExtendedError != 0 */ PrintDlg(NULL); SetLastError(0xdeadbeef); res = pPrintDlgExW(NULL); - if(res == E_NOTIMPL) - { - win_skip("PrintDlgExW returns not implemented\n"); - return; - } ok( (res == E_INVALIDARG), "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", res, GetLastError(), CommDlgExtendedError()); @@ -288,10 +432,136 @@ "got 0x%x with %u and %u (expected 'E_HANDLE')\n", res, GetLastError(), CommDlgExtendedError()); + /* nStartPage must be START_PAGE_GENERAL for the general page or a valid property sheet index */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this is invalid: a valid lpPageRanges with 0 for nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->lpPageRanges = pagerange; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this is invalid: NULL for lpPageRanges with a valid nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nMaxPageRanges = 1; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this works: lpPageRanges with a valid nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nMaxPageRanges = 1; + pDlg->lpPageRanges = pagerange; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + if (res == E_FAIL) + { + skip("No printer configured.\n"); + HeapFree(GetProcessHeap(), 0, pDlg); + return; + } + + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + + dn = GlobalLock(pDlg->hDevNames); + ok(dn != NULL, "expected '!= NULL' for GlobalLock(%p)\n",pDlg->hDevNames); + if (dn) + { + ok(dn->wDriverOffset, "(expected '!= 0' for wDriverOffset)\n"); + ok(dn->wDeviceOffset, "(expected '!= 0' for wDeviceOffset)\n"); + ok(dn->wOutputOffset, "(expected '!= 0' for wOutputOffset)\n"); + ok(dn->wDefault == DN_DEFAULTPRN, "got 0x%x (expected DN_DEFAULTPRN)\n", dn->wDefault); + + GlobalUnlock(pDlg->hDevNames); + } + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + /* this works also: PD_NOPAGENUMS */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + /* this works: PD_RETURNDC with PD_RETURNDEFAULT */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS | PD_RETURNDC; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNDC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + + /* this works: PD_RETURNIC with PD_RETURNDEFAULT */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS | PD_RETURNIC; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNIC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + + /* interactive PrintDlgEx tests */ + + if (!winetest_interactive) + { + skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + return; + } + + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_NOPAGENUMS | PD_RETURNIC; + pDlg->nStartPage = START_PAGE_GENERAL; + pDlg->lpCallback = &unknown; + pDlg->dwResultAction = S_OK; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->dwResultAction == PD_RESULT_PRINT, "expected PD_RESULT_PRINT, got %#x\n", pDlg->dwResultAction); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNIC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); HeapFree(GetProcessHeap(), 0, pDlg); - return; - } static BOOL abort_proc_called = FALSE; @@ -376,19 +646,11 @@ START_TEST(printdlg) { - LPCSTR ptr; - - ptr = load_functions(); + hcomdlg32 = GetModuleHandleA("comdlg32.dll"); + pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, "PrintDlgExW"); test_PageSetupDlgA(); test_PrintDlgA(); + test_PrintDlgExW(); test_abort_proc(); - - /* PrintDlgEx not present before w2k */ - if (ptr) { - win_skip("%s\n", ptr); - return; - } - - test_PrintDlgExW(); -} +} Modified: trunk/rostests/winetests/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/rsrc.r… ============================================================================== --- trunk/rostests/winetests/comdlg32/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/rsrc.rc [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" +#include <windef.h> +#include <winuser.h> -TEMPLATE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +TEMPLATE1 DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg" { @@ -38,7 +38,7 @@ * resizing on small desk tops. * This will work with 640x480 pixels */ -TEMPLATE_SZ DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 300, 40 +TEMPLATE_SZ DIALOG 5, 43, 300, 40 STYLE WS_CHILD | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg" { @@ -50,7 +50,7 @@ } /* note: the test program will modify coordinates and nr of controls in this template */ -TEMPLATE_STC32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 11111, 0, 316, 76 +TEMPLATE_STC32 DIALOG 11111, 0, 316, 76 STYLE WS_CHILD | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg" { Modified: trunk/rostests/winetests/comdlg32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/testli… ============================================================================== --- trunk/rostests/winetests/comdlg32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/testlist.c [iso-8859-1] Sat Oct 5 20:44:20 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_filedlg(void); extern void func_finddlg(void);

1 0

[akhaldi] 60545: [COMDLG32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 20:43:34 2013 New Revision: 60545 URL: http://svn.reactos.org/svn/reactos?rev=60545&view=rev Log: [COMDLG32] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/win32/comdlg32/comdlg32_classes.idl (with props) Removed: trunk/reactos/dll/win32/comdlg32/filedlg31.h Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg32.c trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/finddlg.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.… Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… Added: trunk/reactos/dll/win32/comdlg32/comdlg32_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Removed: trunk/reactos/dll/win32/comdlg32/filedlg31.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/finddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 60544: [UUID] * Add IID_IPrintDialogCallback.
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 20:39:50 2013 New Revision: 60544 URL: http://svn.reactos.org/svn/reactos?rev=60544&view=rev Log: [UUID] * Add IID_IPrintDialogCallback. Modified: trunk/reactos/lib/sdk/uuid/shguids.c Modified: trunk/reactos/lib/sdk/uuid/shguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/shguids.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/uuid/shguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/shguids.c [iso-8859-1] Sat Oct 5 20:39:50 2013 @@ -88,7 +88,7 @@ //IID_INamedPropertyBag //IID_IPersistFolder3 //IID_IPersistQuery -//IID_IPrintDialogCallback +DEFINE_GUID(IID_IPrintDialogCallback, 0x5852a2c3,0x6530,0x11d1,0xb6,0xa3,0x00,0x00,0xf8,0x75,0x7b,0xf9); //IID_IPrintDialogServices //IID_IQueryForm //IID_IQueryFrame

1 0

[aandrejevic] 60543: [SOFT386] Set the opcode handler for the INS and OUTS instructions to be Soft386OpcodeIns and Soft386OpcodeOuts, respectively.
by aandrejevic＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: aandrejevic Date: Sat Oct 5 20:12:08 2013 New Revision: 60543 URL: http://svn.reactos.org/svn/reactos?rev=60543&view=rev Log: [SOFT386] Set the opcode handler for the INS and OUTS instructions to be Soft386OpcodeIns and Soft386OpcodeOuts, respectively. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Oct 5 20:12:08 2013 @@ -147,10 +147,10 @@ Soft386OpcodeImulModrmImm, Soft386OpcodePushByteImm, Soft386OpcodeImulModrmImm, - NULL, // TODO: OPCODE 0x6C NOT SUPPORTED - NULL, // TODO: OPCODE 0x6D NOT SUPPORTED - NULL, // TODO: OPCODE 0x6E NOT SUPPORTED - NULL, // TODO: OPCODE 0x6F NOT SUPPORTED + Soft386OpcodeIns, + Soft386OpcodeIns, + Soft386OpcodeOuts, + Soft386OpcodeOuts, Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sat Oct 5 20:12:08 2013 @@ -153,5 +153,7 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeStos); SOFT386_OPCODE_HANDLER(Soft386OpcodeLods); SOFT386_OPCODE_HANDLER(Soft386OpcodeScas); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIns); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOuts); #endif // _OPCODES_H_

1 0

[hbelusca] 60542: Forgot this one.
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 20:10:06 2013 New Revision: 60542 URL: http://svn.reactos.org/svn/reactos?rev=60542&view=rev Log: Forgot this one. Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 5 20:10:06 2013 @@ -367,7 +367,7 @@ * @name CsrNotifyWait * @implemented NT4 * - * The CsrNotifyWait notifies CSR Wait Blocks. + * The CsrNotifyWait routine notifies CSR Wait Blocks. * * @param WaitList * Pointer to the wait list whose wait blocks will be notified.

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013