Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 73943: [COMPSTUI] Sync with Wine Staging 2.2. CORE-12823 1791b7d compstui: Fix SetCPSUIUserData spec file entry.
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 17:07:09 2017 New Revision: 73943 URL: http://svn.reactos.org/svn/reactos?rev=73943&view=rev Log: [COMPSTUI] Sync with Wine Staging 2.2. CORE-12823 1791b7d compstui: Fix SetCPSUIUserData spec file entry. Modified: trunk/reactos/dll/win32/compstui/compstui.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/compstui/compstui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/compstui/compstui.spec [iso-8859-1] Sun Feb 26 17:07:09 2017 @@ -1,4 +1,4 @@ @ stdcall CommonPropertySheetUIA(long ptr long ptr) @ stdcall CommonPropertySheetUIW(long ptr long ptr) @ stdcall GetCPSUIUserData(long) -@ stdcall SetCPSUIUserData(long ptr) +@ stdcall SetCPSUIUserData(long long) 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] Sun Feb 26 17:07:09 2017 @@ -56,7 +56,7 @@ reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.23 -reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 +reactos/dll/win32/compstui # Synced to WineStaging-2.2 reactos/dll/win32/credui # Synced to WineStaging-1.9.16 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.23 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11

1 0

[akhaldi] 73942: [AVIFIL32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 17:03:08 2017 New Revision: 73942 URL: http://svn.reactos.org/svn/reactos?rev=73942&view=rev Log: [AVIFIL32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Sun Feb 26 17:03:08 2017 @@ -378,8 +378,8 @@ ok(res == 0, "Unable to open file: error=%u\n", res); pStream0 = (void *)0xdeadbeef; - res = AVIFileGetStream(pFile, &pStream0, ~0, 0); - ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %#x\n", res); + res = AVIFileGetStream(pFile, &pStream0, ~0U, 0); + ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %u\n", res); ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n"); res = AVIFileGetStream(pFile, &pStream0, 0, 0);

1 0

[akhaldi] 73941: [AVIFIL32] Sync with Wine Staging 2.2. CORE-12823 349a80e avifil32: Fix AVIStreamReadFormat spec file entry.
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 17:02:24 2017 New Revision: 73941 URL: http://svn.reactos.org/svn/reactos?rev=73941&view=rev Log: [AVIFIL32] Sync with Wine Staging 2.2. CORE-12823 349a80e avifil32: Fix AVIStreamReadFormat spec file entry. Modified: trunk/reactos/dll/win32/avifil32/avifil32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/avifil32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.spec [iso-8859-1] Sun Feb 26 17:02:24 2017 @@ -49,7 +49,7 @@ 49 stdcall AVIStreamOpenFromFileW(ptr wstr long long long ptr) 50 stdcall AVIStreamRead(ptr long long ptr long ptr ptr) 51 stdcall AVIStreamReadData(ptr long ptr ptr) -52 stdcall AVIStreamReadFormat(ptr long ptr long) +52 stdcall AVIStreamReadFormat(ptr long ptr ptr) 53 stdcall AVIStreamRelease(ptr) 54 stdcall AVIStreamSampleToTime(ptr long) 55 stdcall AVIStreamSetFormat(ptr long ptr long) 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] Sun Feb 26 17:02:24 2017 @@ -48,7 +48,7 @@ reactos/dll/win32/atl # Synced to WineStaging-2.2 reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 -reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/avifil32 # Synced to WineStaging-2.2 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-2.2

1 0

[akhaldi] 73940: [ATL] Sync with Wine Staging 2.2. CORE-12823 de24275 atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 26e8873 atl: Fix AtlModuleInit spec file entry.
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:56:41 2017 New Revision: 73940 URL: http://svn.reactos.org/svn/reactos?rev=73940&view=rev Log: [ATL] Sync with Wine Staging 2.2. CORE-12823 de24275 atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 26e8873 atl: Fix AtlModuleInit spec file entry. Modified: trunk/reactos/dll/win32/atl/atl.c trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=73… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] Sun Feb 26 16:56:41 2017 @@ -28,9 +28,9 @@ typedef unsigned char cpp_bool; -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem) Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Sun Feb 26 16:56:41 2017 @@ -8,7 +8,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) -16 stdcall AtlModuleInit(ptr long long) +16 stdcall AtlModuleInit(ptr ptr long) 17 stdcall AtlModuleRegisterClassObjects(ptr long long) 18 stdcall AtlModuleRegisterServer(ptr long ptr) 19 stdcall AtlModuleRegisterTypeLib(ptr wstr) 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] Sun Feb 26 16:56:41 2017 @@ -45,7 +45,7 @@ reactos/dll/win32/activeds # Synced to WineStaging-1.9.11 reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.11 reactos/dll/win32/advpack # Synced to WineStaging-1.9.11 -reactos/dll/win32/atl # Synced to WineStaging-1.9.16 +reactos/dll/win32/atl # Synced to WineStaging-2.2 reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.23

1 0

[akhaldi] 73939: [QUARTZ_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:53:38 2017 New Revision: 73939 URL: http://svn.reactos.org/svn/reactos?rev=73939&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/quartz/filtergraph.c Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Sun Feb 26 16:53:38 2017 @@ -50,6 +50,212 @@ &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); } +static void test_basic_video(void) +{ + IBasicVideo* pbv; + LONG video_width, video_height; + LONG left, top, width, height; + HRESULT hr; + + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IBasicVideo, (LPVOID*)&pbv); + ok(hr==S_OK, "Cannot get IBasicVideo interface returned: %x\n", hr); + + /* test get video size */ + hr = IBasicVideo_GetVideoSize(pbv, NULL, NULL); + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); + hr = IBasicVideo_GetVideoSize(pbv, &video_width, NULL); + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); + hr = IBasicVideo_GetVideoSize(pbv, NULL, &video_height); + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); + hr = IBasicVideo_GetVideoSize(pbv, &video_width, &video_height); + ok(hr==S_OK, "Cannot get video size returned: %x\n", hr); + + /* test source position */ + hr = IBasicVideo_GetSourcePosition(pbv, NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, NULL, NULL); + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, NULL, NULL, &width, &height); + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(left == 0, "expected 0, got %d\n", left); + ok(top == 0, "expected 0, got %d\n", top); + ok(width == video_width, "expected %d, got %d\n", video_width, width); + ok(height == video_height, "expected %d, got %d\n", video_height, height); + + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, 0, 0); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width*2, video_height*2); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_put_SourceTop(pbv, -1); + ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); + hr = IBasicVideo_put_SourceTop(pbv, 0); + ok(hr==S_OK, "Cannot put source top returned: %x\n", hr); + hr = IBasicVideo_put_SourceTop(pbv, 1); + ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); + + hr = IBasicVideo_SetSourcePosition(pbv, video_width, 0, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, 0, video_height, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, -1, 0, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, 0, -1, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width, video_height+1); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width+1, video_height); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + + hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width/3+1, video_height/3+1); + ok(hr==S_OK, "Cannot set source position returned: %x\n", hr); + + hr = IBasicVideo_get_SourceLeft(pbv, &left); + ok(hr==S_OK, "Cannot get source left returned: %x\n", hr); + ok(left==video_width/2, "expected %d, got %d\n", video_width/2, left); + hr = IBasicVideo_get_SourceTop(pbv, &top); + ok(hr==S_OK, "Cannot get source top returned: %x\n", hr); + ok(top==video_height/2, "expected %d, got %d\n", video_height/2, top); + hr = IBasicVideo_get_SourceWidth(pbv, &width); + ok(hr==S_OK, "Cannot get source width returned: %x\n", hr); + ok(width==video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + hr = IBasicVideo_get_SourceHeight(pbv, &height); + ok(hr==S_OK, "Cannot get source height returned: %x\n", hr); + ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + + hr = IBasicVideo_put_SourceLeft(pbv, video_width/3); + ok(hr==S_OK, "Cannot put source left returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); + ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + + hr = IBasicVideo_put_SourceTop(pbv, video_height/3); + ok(hr==S_OK, "Cannot put source top returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); + ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + + hr = IBasicVideo_put_SourceWidth(pbv, video_width/4+1); + ok(hr==S_OK, "Cannot put source width returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); + ok(width == video_width/4+1, "expected %d, got %d\n", video_width/4+1, width); + + hr = IBasicVideo_put_SourceHeight(pbv, video_height/4+1); + ok(hr==S_OK, "Cannot put source height returned: %x\n", hr); + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); + ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); + + /* test destination rectangle */ + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, &width, &height); + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get destination position returned: %x\n", hr); + ok(left == 0, "expected 0, got %d\n", left); + ok(top == 0, "expected 0, got %d\n", top); + todo_wine ok(width == video_width, "expected %d, got %d\n", video_width, width); + todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); + + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0); + ok(hr==E_INVALIDARG, "IBasicVideo_SetDestinationPosition returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width*2, video_height*2); + ok(hr==S_OK, "Cannot put destination position returned: %x\n", hr); + + hr = IBasicVideo_put_DestinationLeft(pbv, -1); + ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); + hr = IBasicVideo_put_DestinationLeft(pbv, 0); + ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); + hr = IBasicVideo_put_DestinationLeft(pbv, 1); + ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); + + hr = IBasicVideo_SetDestinationPosition(pbv, video_width, 0, video_width, video_height); + ok(hr==S_OK, "Cannot set destinaiton position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, 0, video_height, video_width, video_height); + ok(hr==S_OK, "Cannot set destinaiton position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, -1, 0, video_width, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, 0, -1, video_width, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, video_width/2, video_height/2, video_width, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, video_width/2, video_height/2, video_width, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width, video_height+1); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width+1, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + + hr = IBasicVideo_SetDestinationPosition(pbv, video_width/2, video_height/2, video_width/3+1, video_height/3+1); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + + hr = IBasicVideo_get_DestinationLeft(pbv, &left); + ok(hr==S_OK, "Cannot get destination left returned: %x\n", hr); + ok(left==video_width/2, "expected %d, got %d\n", video_width/2, left); + hr = IBasicVideo_get_DestinationTop(pbv, &top); + ok(hr==S_OK, "Cannot get destination top returned: %x\n", hr); + ok(top==video_height/2, "expected %d, got %d\n", video_height/2, top); + hr = IBasicVideo_get_DestinationWidth(pbv, &width); + ok(hr==S_OK, "Cannot get destination width returned: %x\n", hr); + ok(width==video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + hr = IBasicVideo_get_DestinationHeight(pbv, &height); + ok(hr==S_OK, "Cannot get destination height returned: %x\n", hr); + ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + + hr = IBasicVideo_put_DestinationLeft(pbv, video_width/3); + ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); + ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + + hr = IBasicVideo_put_DestinationTop(pbv, video_height/3); + ok(hr==S_OK, "Cannot put destination top returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); + ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + + hr = IBasicVideo_put_DestinationWidth(pbv, video_width/4+1); + ok(hr==S_OK, "Cannot put destination width returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); + ok(width == video_width/4+1, "expected %d, got %d\n", video_width/4+1, width); + + hr = IBasicVideo_put_DestinationHeight(pbv, video_height/4+1); + ok(hr==S_OK, "Cannot put destination height returned: %x\n", hr); + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); + ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); + ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); + + /* reset source rectangle */ + hr = IBasicVideo_SetDefaultSourcePosition(pbv); + ok(hr==S_OK, "IBasicVideo_SetDefaultSourcePosition returned: %x\n", hr); + + /* reset destination position */ + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width, video_height); + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); + + IBasicVideo_Release(pbv); +} + static void rungraph(void) { HRESULT hr; @@ -70,6 +276,8 @@ IMediaFilter_Release(pmf); + test_basic_video(); + hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); @@ -146,18 +354,26 @@ HANDLE h; HRESULT hr; + h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h == INVALID_HANDLE_VALUE) { + skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + return; + } + CloseHandle(h); + if (!createfiltergraph()) return; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle(h); - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr==S_OK, "RenderFile returned: %x\n", hr); - rungraph(); - } + hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + ok(hr == S_OK, "RenderFile returned: %x\n", hr); + rungraph(); releasefiltergraph(); + + /* check reference leaks */ + h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); + CloseHandle(h); } static void test_graph_builder(void)

1 0

[akhaldi] 73938: [QUARTZ] Sync with Wine Staging 2.2. CORE-12823 e2a4974 quartz: Downgrade FIXME->WARN. c6a4811 quartz: Clean up another trace for consistency. ff36b5c quartz: A couple of spelling ...
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:52:09 2017 New Revision: 73938 URL: http://svn.reactos.org/svn/reactos?rev=73938&view=rev Log: [QUARTZ] Sync with Wine Staging 2.2. CORE-12823 e2a4974 quartz: Downgrade FIXME->WARN. c6a4811 quartz: Clean up another trace for consistency. ff36b5c quartz: A couple of spelling fixes in comments. ac59a68 quartz: Don't write past end of d3d9 buffer. 478feea quartz: Keep This/iface order in TRACEs for consistency. 97405fc quartz: Add tests for IBasicVideo. 5cdb0b5 quartz: Use wine_dbgstr_longlong() to trace REFERENCE_TIME. 89d4e14 quartz: Take MP3 padding bit into account when calculating the block size. Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sun Feb 26 16:52:09 2017 @@ -521,7 +521,7 @@ { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); This->filter.state = State_Running; Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Sun Feb 26 16:52:09 2017 @@ -708,6 +708,9 @@ IPin_QueryDirection(ppin, &pindir); hr = IPin_ConnectedTo(ppin, &pConnectedTo); + + TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + if (FAILED(hr)) { TRACE("Querying connected to failed: %x\n", hr); return hr; @@ -721,7 +724,7 @@ IPin_Release(pConnectedTo); if (FAILED(hr)) WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); + TRACE("-> %08x\n", hr); return hr; } @@ -744,7 +747,7 @@ HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->() live sources not handled properly!\n", iface, This); + TRACE("(%p/%p)->() live sources not handled properly!\n", This, iface); EnterCriticalSection(&This->cs); @@ -2354,7 +2357,7 @@ if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { - FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + WARN("Unhandled time format %s\n", debugstr_guid(pFormat)); return S_FALSE; } @@ -5278,8 +5281,7 @@ IFilterGraphImpl *This = impl_from_IMediaFilter(iface); if (tStart) - FIXME("Run called with non-null tStart: %x%08x\n", - (int)(tStart>>32), (int)tStart); + FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart)); return MediaControl_Run(&This->IMediaControl_iface); } @@ -5298,7 +5300,7 @@ HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->(%p)\n", iface, This, pClock); + TRACE("(%p/%p)->(%p)\n", This, iface, pClock); EnterCriticalSection(&This->cs); { @@ -5346,7 +5348,7 @@ { IFilterGraphImpl *This = impl_from_IMediaFilter(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, ppClock); + TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); if (!ppClock) return E_POINTER; Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Sun Feb 26 16:52:09 2017 @@ -353,6 +353,7 @@ int freq_index; int mode_ext; int emphasis; + int padding; int lsf = 1; int mpeg1; int layer; @@ -377,6 +378,7 @@ layer = 4-((header[1]>>1)&0x3); bitrate_index = ((header[2]>>4)&0xf); + padding = ((header[2]>>1)&0x1); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); mode = ((header[3]>>6)&0x3); mode_ext = ((header[3]>>4)&0x3); @@ -405,12 +407,12 @@ if (layer == 3) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - (format->nSamplesPerSec<<lsf) + 1; + (format->nSamplesPerSec<<lsf) + padding; else if (layer == 2) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - format->nSamplesPerSec + 1; + format->nSamplesPerSec + padding; else - format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + 1); + format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + padding); format->wBitsPerSample = 0; Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Sun Feb 26 16:52:09 2017 @@ -242,9 +242,9 @@ lock.pBits = (char *)lock.pBits + (height * lock.Pitch); while (height--) { + lock.pBits = (char *)lock.pBits - lock.Pitch; memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits - lock.Pitch; } } else if (lock.Pitch != width * bmiHeader->biBitCount / 8) @@ -3010,7 +3010,7 @@ TRACE("(%p/%p)->(...)\n", iface, This); - /* No AddRef taken here or the base VMR9 filter would never be destroied */ + /* No AddRef taken here or the base VMR9 filter would never be destroyed */ This->SurfaceAllocatorNotify = allocnotify; return S_OK; } 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] Sun Feb 26 16:52:09 2017 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/quartz # Synced to WineStaging-2.2 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.9.11

1 0

[akhaldi] 73937: [DPLAYX_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:43:10 2017 New Revision: 73937 URL: http://svn.reactos.org/svn/reactos?rev=73937&view=rev Log: [DPLAYX_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/dplayx/CMakeLists.txt trunk/rostests/winetests/dplayx/dplayx.c Modified: trunk/rostests/winetests/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dplayx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dplayx/CMakeLists.txt [iso-8859-1] Sun Feb 26 16:43:10 2017 @@ -1,5 +1,5 @@ add_executable(dplayx_winetest dplayx.c testlist.c) set_module_type(dplayx_winetest win32cui) -add_importlibs(dplayx_winetest dplayx ole32 msvcrt kernel32) +add_importlibs(dplayx_winetest dplayx ole32 oleaut32 version advapi32 msvcrt kernel32) add_rostests_file(TARGET dplayx_winetest) Modified: trunk/rostests/winetests/dplayx/dplayx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/dplayx.c… ============================================================================== --- trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] Sun Feb 26 16:43:10 2017 @@ -23,7 +23,11 @@ #define INITGUID #include <dplay.h> #include <dplobby.h> - +#include <netfw.h> + +static HRESULT (WINAPI *pDirectPlayEnumerateA)( LPDPENUMDPCALLBACKA, void* ); +static HRESULT (WINAPI *pDirectPlayEnumerateW)( LPDPENUMDPCALLBACKW, void* ); +static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IUnknown *pUnk ); #define check(expected, result) \ ok( (expected) == (result), \ @@ -735,21 +739,21 @@ /* TODO: Check how it behaves with pUnk!=NULL */ /* pDP==NULL */ - hr = DirectPlayCreate( NULL, NULL, NULL ); + hr = pDirectPlayCreate( NULL, NULL, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); - hr = DirectPlayCreate( (LPGUID) &GUID_NULL, NULL, NULL ); + hr = pDirectPlayCreate( (LPGUID) &GUID_NULL, NULL, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); - hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, NULL, NULL ); + hr = pDirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, NULL, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); /* pUnk==NULL, pDP!=NULL */ - hr = DirectPlayCreate( NULL, &pDP, NULL ); + hr = pDirectPlayCreate( NULL, &pDP, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); - hr = DirectPlayCreate( (LPGUID) &GUID_NULL, &pDP, NULL ); + hr = pDirectPlayCreate( (LPGUID) &GUID_NULL, &pDP, NULL ); checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); - hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); + hr = pDirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); @@ -801,20 +805,20 @@ memset(&arg, 0, sizeof(arg)); arg.ret_value = TRUE; - hr = DirectPlayEnumerateA(callback_providersA, NULL); + hr = pDirectPlayEnumerateA(callback_providersA, NULL); ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); SetLastError(0xdeadbeef); - hr = DirectPlayEnumerateA(NULL, &arg); + hr = pDirectPlayEnumerateA(NULL, &arg); ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); SetLastError(0xdeadbeef); - hr = DirectPlayEnumerateA(NULL, NULL); + hr = pDirectPlayEnumerateA(NULL, NULL); ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); - hr = DirectPlayEnumerateA(callback_providersA, &arg); + hr = pDirectPlayEnumerateA(callback_providersA, &arg); ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); ok(arg.call_count > 0, "Expected at least one valid provider\n"); trace("Found %d providers\n", arg.call_count); @@ -827,26 +831,26 @@ memset(&arg, 0, sizeof(arg)); arg.ret_value = FALSE; - hr = DirectPlayEnumerateA(callback_providersA, &arg); + hr = pDirectPlayEnumerateA(callback_providersA, &arg); ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); - hr = DirectPlayEnumerateW(callback_providersW, NULL); + hr = pDirectPlayEnumerateW(callback_providersW, NULL); ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); SetLastError(0xdeadbeef); - hr = DirectPlayEnumerateW(NULL, &arg); + hr = pDirectPlayEnumerateW(NULL, &arg); ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); SetLastError(0xdeadbeef); - hr = DirectPlayEnumerateW(NULL, NULL); + hr = pDirectPlayEnumerateW(NULL, NULL); ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); memset(&arg, 0, sizeof(arg)); arg.ret_value = TRUE; - hr = DirectPlayEnumerateW(callback_providersW, &arg); + hr = pDirectPlayEnumerateW(callback_providersW, &arg); ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); ok(arg.call_count > 0, "Expected at least one valid provider\n"); @@ -858,7 +862,7 @@ memset(&arg, 0, sizeof(arg)); arg.ret_value = FALSE; - hr = DirectPlayEnumerateW(callback_providersW, &arg); + hr = pDirectPlayEnumerateW(callback_providersW, &arg); ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); } @@ -889,7 +893,11 @@ } else if ( IsEqualGUID( types[1], guidDataType ) ) { - todo_wine checkGuid( sps[ callbackData->dwCounter1 ], lpData ); + BOOL found = FALSE; + int i; + for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ ) + found = IsEqualGUID( sps[i], lpData ); + ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) ); } callbackData->dwCounter2++; @@ -953,14 +961,14 @@ hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = 0; hr = IDirectPlayX_EnumConnections( pDP, NULL, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = 0; @@ -976,7 +984,7 @@ hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = DPCONNECTION_DIRECTPLAYLOBBY; @@ -991,7 +999,7 @@ hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = ~( DPCONNECTION_DIRECTPLAY | @@ -1090,7 +1098,7 @@ { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - checkHR( DP_OK, hr ); + todo_wine checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -6651,28 +6659,254 @@ ok(refcount == 0, "refcount == %u, expected 0\n", refcount); } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR dplaysvrW[] = + {'d','p','l','a','y','s','v','r','.','e','x','e',0}; + static const WCHAR separator[] = {'\\',0}; + static const WCHAR clientW[] = + {'d','p','l','a','y','_','c','l','i','e','n','t',0}; + static const WCHAR serverW[] = + {'d','p','l','a','y','_','s','e','r','v','e','r',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + WCHAR path[MAX_PATH]; + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + + if(!GetSystemDirectoryW(path, MAX_PATH)) + { + SysFreeString( image ); + return E_FAIL; + } + lstrcatW(path, separator); + lstrcatW(path, dplaysvrW); + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( clientW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + if (hr != S_OK) goto done; + + INetFwAuthorizedApplication_Release( app ); + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + SysFreeString( image ); + image = SysAllocString( path ); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( serverW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} START_TEST(dplayx) { + BOOL firewall_enabled; + HRESULT hr; + char path[MAX_PATH]; + HMODULE module; + + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dplayx.dll"); + + if (!winetest_interactive && is_stub_dll(path)) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + + if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + + if (firewall_enabled) + { + hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + CoInitialize( NULL ); + + module = LoadLibraryA("dplayx.dll"); + + pDirectPlayEnumerateA = (void *)GetProcAddress(module, "DirectPlayEnumerateA"); + pDirectPlayEnumerateW = (void *)GetProcAddress(module, "DirectPlayEnumerateW"); + pDirectPlayCreate = (void *)GetProcAddress(module, "DirectPlayCreate"); test_COM(); test_COM_dplobby(); test_EnumerateProviders(); - - if (!winetest_interactive) - { - skip("Run in interactive mode to run dplayx tests.\n"); - return; - } - - trace("Running in interactive mode, tests will take a while\n"); - test_DirectPlayCreate(); test_EnumConnections(); test_InitializeConnection(); - test_GetCaps(); + + if (!winetest_interactive) + { + skip("Run in interactive mode to run all dplayx tests.\n"); + return; + } + + trace("Running in interactive mode, tests will take a while\n"); + /* test_Open() takes almost a minute, */ test_Open(); /* test_EnumSession takes three minutes */ @@ -6708,5 +6942,6 @@ test_remote_data_replication(); test_host_migration(); + FreeLibrary(module); CoUninitialize(); }

1 0

[akhaldi] 73936: [DPLAYX] Sync with Wine Staging 2.2. CORE-12823 7603e85 dplayx: Don't print an error when no Lobby Providers are found. 7ae50b2 dplayx: Fix multiple assigments to the same lvalue (...
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:41:39 2017 New Revision: 73936 URL: http://svn.reactos.org/svn/reactos?rev=73936&view=rev Log: [DPLAYX] Sync with Wine Staging 2.2. CORE-12823 7603e85 dplayx: Don't print an error when no Lobby Providers are found. 7ae50b2 dplayx: Fix multiple assigments to the same lvalue (coccinellery). Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Sun Feb 26 16:41:39 2017 @@ -4355,8 +4355,7 @@ if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey, 0, KEY_READ, &hkResult ) != ERROR_SUCCESS ) { - /* Hmmm. Does this mean that there are no service providers? */ - ERR(": no service providers?\n"); + TRACE("No Lobby Providers have been registered.\n"); return DP_OK; } Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] Sun Feb 26 16:41:39 2017 @@ -287,10 +287,10 @@ lpMsgBody->dpidAppServer2 = dpidServer; lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x20; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; + lpMsgBody->unknown3[1] = 0x0; + lpMsgBody->unknown3[2] = 0x20; + lpMsgBody->unknown3[3] = 0x0; + lpMsgBody->unknown3[4] = 0x0; lpMsgBody->dpidAppServer3 = dpidServer; lpMsgBody->unknown4[0] = 0x30; 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] Sun Feb 26 16:41:39 2017 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23

1 0

[akhaldi] 73935: [DINPUT_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:37:17 2017 New Revision: 73935 URL: http://svn.reactos.org/svn/reactos?rev=73935&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/dinput/joystick.c Modified: trunk/rostests/winetests/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/joystick… ============================================================================== --- trunk/rostests/winetests/dinput/joystick.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/joystick.c [iso-8859-1] Sun Feb 26 16:37:17 2017 @@ -744,6 +744,46 @@ ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + /* Test SendForceFeedbackCommand + * DISFFC_STOPALL - Should stop effects only + * DISFFC_RESET - Should stop effects and unload them (NOT release them) + * Tests for game Odallus (bug 41623) */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0xFF); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + + /* Send STOPALL and prove that the effect can still be started */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_STOPALL); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + + /* Send RESET and prove that we can still manipulate the effect, thus not released */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_RESET); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DIERR_NOTDOWNLOADED,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); }

1 0

[akhaldi] 73934: [DINPUT] Sync with Wine Staging 2.2. CORE-12823 f921b63 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. f9b4be5 dinput: Allocate correct amount of memory ...
by akhaldi＠svn.reactos.org 26 Feb '17

26 Feb '17

Author: akhaldi Date: Sun Feb 26 16:36:28 2017 New Revision: 73934 URL: http://svn.reactos.org/svn/reactos?rev=73934&view=rev Log: [DINPUT] Sync with Wine Staging 2.2. CORE-12823 f921b63 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. f9b4be5 dinput: Allocate correct amount of memory in IDirectInput8AImpl_EnumDevicesBySemantics. 04bddb6 dinput: Give correct count of devices still to be enumerated. 8339de0 dinput: Simplify JoystickWImpl_Unacquire for Linux. 27f4568 dinput: DISFFC_RESET will not release the effects. 2d2d833 dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand. cc37322 dinput: Fix GetEffectStatus for Linux when effect was not downloaded. 6bb2c4c dinput: Skip events that are not useful currently. 49d4261 dinput: Spelling and case fixes in comments. Modified: trunk/reactos/dll/directx/wine/dinput/dinput.rc trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/dinput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -32,6 +32,8 @@ #include <wine/wine_common_ver.rc> +#pragma makedep po + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -911,7 +911,9 @@ LPDIRECTINPUTDEVICE8A lpdid; DWORD callbackFlags; int i, j; - + int device_count = 0; + int remain; + DIDEVICEINSTANCEA *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -939,18 +941,36 @@ { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEA)*device_count); + didevis[device_count-1] = didevi; } } } + + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; @@ -982,6 +1002,9 @@ LPDIRECTINPUTDEVICE8W lpdid; DWORD callbackFlags; int i, j; + int device_count = 0; + int remain; + DIDEVICEINSTANCEW *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -999,18 +1022,36 @@ { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis[device_count-1] = didevi; } } } + + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; Modified: trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ef… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -234,10 +234,15 @@ LPDIRECTINPUTEFFECT iface, LPDWORD pdwFlags) { - TRACE("(this=%p,%p)\n", iface, pdwFlags); + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("(this=%p,%p)\n", This, pdwFlags); if (!pdwFlags) return E_POINTER; + + if (This->effect.id == -1) + return DIERR_NOTDOWNLOADED; /* linux sends the effect status through an event. * that event is trapped by our parent joystick driver @@ -633,9 +638,9 @@ This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; - /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on Linux */ This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; - /* dinput uses microseconds, linux uses miliseconds */ + /* dinput uses microseconds, Linux uses milliseconds */ if (tsp->dwPeriod <= 1000) This->effect.u.periodic.period = 1; else Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -69,6 +69,8 @@ HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); + typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; @@ -726,18 +728,10 @@ TRACE("(this=%p)\n",This); res = IDirectInputDevice2WImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { - effect_list_item *itr; struct input_event event; - /* For each known effect: - * - stop it - * - unload it - * But, unlike DISFFC_RESET, do not release the effect. - */ - LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) { - IDirectInputEffect_Stop(itr->ref); - IDirectInputEffect_Unload(itr->ref); - } + /* Stop and unload all effects */ + JoystickWImpl_SendForceFeedbackCommand(iface, DISFFC_RESET); /* Enable autocenter. */ event.type = EV_FF; @@ -883,7 +877,7 @@ break; #endif default: - FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); + TRACE("skipping event\n"); break; } if (inst_id >= 0) @@ -1312,9 +1306,9 @@ { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1322,17 +1316,19 @@ case DISFFC_RESET: { - effect_list_item *itr, *ptr; - - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + effect_list_item *itr; + + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE: case DISFFC_CONTINUE: - FIXME("No support for Pause or Continue in linux\n"); + FIXME("No support for Pause or Continue in linux\n"); break; case DISFFC_SETACTUATORSOFF: @@ -1341,8 +1337,8 @@ break; default: - FIXME("Unknown Force Feedback Command!\n"); - return DIERR_INVALIDPARAM; + WARN("Unknown Force Feedback Command %u!\n", dwFlags); + return DIERR_INVALIDPARAM; } return DI_OK; #else 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] Sun Feb 26 16:36:28 2017 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dinput # Synced to WineStaging-2.2 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23

1 0

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