Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66501: [XDK] Addendum to r66499.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 16:00:09 2015 New Revision: 66501 URL: http://svn.reactos.org/svn/reactos?rev=66501&view=rev Log: [XDK] Addendum to r66499. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat Feb 28 16:00:09 2015 @@ -2971,9 +2971,22 @@ #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_INIT {0} + typedef union _RTL_RUN_ONCE { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; + +typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); +typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; + +NTSYSAPI +DWORD +WINAPI +RtlRunOnceComplete( + PRTL_RUN_ONCE, + DWORD, + PVOID); #endif

1 0

[akhaldi] 66500: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 15:46:43 2015 New Revision: 66500 URL: http://svn.reactos.org/svn/reactos?rev=66500&view=rev Log: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246 Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (with props) Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -8,15 +8,11 @@ list(APPEND SOURCE DllMain.c GetTickCount64.c + InitOnceExecuteOnce.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista SHARED ${SOURCE}) set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) -add_importlibs(kernel32_vista kernel32) - -if(MSVC) - add_importlibs(kernel32_vista ntdll) -endif() - +add_importlibs(kernel32_vista kernel32 ntdll) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (added) +++ trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -0,0 +1,118 @@ + +#include "k32_vista.h" + +#include <ndk/exfuncs.h> +#include <wine/config.h> +#include <wine/port.h> + +/* Taken from Wine ntdll/sync.c */ + +HANDLE keyed_event = NULL; + +static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +{ + if (flags & RTL_RUN_ONCE_CHECK_ONLY) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + } + + for (;;) + { + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 0: /* first time */ + if (!interlocked_cmpxchg_ptr( &once->Ptr, + (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + return STATUS_PENDING; + break; + + case 1: /* in progress, wait */ + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + next = val & ~3; + if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + (void *)val ) == (void *)val) + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + break; + + case 2: /* done */ + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + return STATUS_PENDING; + } + } +} + +static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +{ + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + + if (flags & RTL_RUN_ONCE_INIT_FAILED) + { + if (context) return STATUS_INVALID_PARAMETER; + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + } + else context = (void *)((ULONG_PTR)context | 2); + + for (;;) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 1: /* in progress */ + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + val &= ~3; + while (val) + { + ULONG_PTR next = *(ULONG_PTR *)val; + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + val = next; + } + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + return STATUS_SUCCESS; + + default: + return STATUS_UNSUCCESSFUL; + } + } +} + +static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) +{ + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + + if (ret != STATUS_PENDING) return ret; + + if (!func( once, param, context )) + { + RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + return STATUS_UNSUCCESSFUL; + } + + return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); +} + +/* Taken from Wine kernel32/sync.c */ + +/* + * @implemented + */ +BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) +{ + return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); +} Propchange: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/k… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -1,2 +1,3 @@ @ stdcall -ret64 GetTickCount64() +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr)

1 0

[akhaldi] 66499: [PSDK] Add missing RTL_RUN_ONCE_INIT, RTL_RUN_ONCE_INIT_FN, PRTL_RUN_ONCE_INIT_FN and RtlRunOnceComplete() definitions.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 15:41:27 2015 New Revision: 66499 URL: http://svn.reactos.org/svn/reactos?rev=66499&view=rev Log: [PSDK] Add missing RTL_RUN_ONCE_INIT, RTL_RUN_ONCE_INIT_FN, PRTL_RUN_ONCE_INIT_FN and RtlRunOnceComplete() definitions. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Feb 28 15:41:27 2015 @@ -4321,18 +4321,26 @@ RtlQueryDepthSList( _In_ PSLIST_HEADER ListHead); -#ifndef _RTL_RUN_ONCE_DEF -#define _RTL_RUN_ONCE_DEF - #define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_INIT {0} + typedef union _RTL_RUN_ONCE { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; -#endif +typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); +typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; + +NTSYSAPI +DWORD +WINAPI +RtlRunOnceComplete( + PRTL_RUN_ONCE, + DWORD, + PVOID); #define RTL_CONDITION_VARIABLE_INIT {0} #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1

1 0

[hbelusca] 66498: [SVCHOST]: Delay-load netapi32 and ole32 (they will be loaded only if needed). [WIN32K]: Fix cursor check (in few corner cases SYSTEMCUR(ARROW) happens to be NULL, when some progr...
by hbelusca＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: hbelusca Date: Sat Feb 28 15:33:26 2015 New Revision: 66498 URL: http://svn.reactos.org/svn/reactos?rev=66498&view=rev Log: [SVCHOST]: Delay-load netapi32 and ole32 (they will be loaded only if needed). [WIN32K]: Fix cursor check (in few corner cases SYSTEMCUR(ARROW) happens to be NULL, when some programs -- ole32 -- wants to create windows while there is no graphics initialized yet). James, can you investigate? Modified: trunk/reactos/base/services/svchost/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Sat Feb 28 15:33:26 2015 @@ -14,6 +14,7 @@ target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) -add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll) +add_delay_importlibs(svchost netapi32 ole32) +add_importlibs(svchost advapi32 rpcrt4 kernel32 ntdll) add_pch(svchost svchost.h SOURCE) add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sat Feb 28 15:33:26 2015 @@ -2424,8 +2424,19 @@ wc.cbClsExtra = 0; wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes; wc.hIcon = NULL; + //// System Cursors should be initilized!!! - wc.hCursor = DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL ? UserHMGetHandle(SYSTEMCUR(ARROW)) : NULL; + if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL && + SYSTEMCUR(ARROW) != NULL) + { + wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW)); + } + else + { + ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); + wc.hCursor = NULL; + } + hBrush = DefaultServerClasses[i].hBrush; if (hBrush <= (HBRUSH)COLOR_MENUBAR) {

1 0

[akhaldi] 66497: [PSDK] Add missing INIT_ONCE_STATIC_INIT and InitOnceExecuteOnce() definitions.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 14:34:18 2015 New Revision: 66497 URL: http://svn.reactos.org/svn/reactos?rev=66497&view=rev Log: [PSDK] Add missing INIT_ONCE_STATIC_INIT and InitOnceExecuteOnce() definitions. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Feb 28 14:34:18 2015 @@ -585,6 +585,8 @@ #define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED #endif +#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT + #ifndef RC_INVOKED #ifndef _FILETIME_ @@ -3772,6 +3774,15 @@ #endif /* _WIN32_WINNT >= 0x0601 */ +WINBASEAPI +BOOL +WINAPI +InitOnceExecuteOnce( + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context); + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

[akhaldi] 66496: [PSDK] Update COWAIT_FLAGS.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 14:06:40 2015 New Revision: 66496 URL: http://svn.reactos.org/svn/reactos?rev=66496&view=rev Log: [PSDK] Update COWAIT_FLAGS. Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Sat Feb 28 14:06:40 2015 @@ -677,8 +677,9 @@ typedef enum tagCOWAIT_FLAGS { - COWAIT_WAITALL = 0x00000001, - COWAIT_ALERTABLE = 0x00000002 + COWAIT_WAITALL = 0x00000001, + COWAIT_ALERTABLE = 0x00000002, + COWAIT_INPUTAVAILABLE = 0x00000004 } COWAIT_FLAGS; _Check_return_

1 0

[akhaldi] 66495: [DPLAYX_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 11:57:37 2015 New Revision: 66495 URL: http://svn.reactos.org/svn/reactos?rev=66495&view=rev Log: [DPLAYX_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/dplayx/dplayx.c 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] Sat Feb 28 11:57:37 2015 @@ -72,6 +72,13 @@ UINT dpidSize; } CallbackData, *lpCallbackData; +struct provider_data +{ + int call_count; + GUID *guid_ptr[10]; + GUID guid_data[10]; + BOOL ret_value; +}; static LPSTR get_temp_buffer(void) { @@ -685,7 +692,7 @@ } hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); @@ -743,10 +750,117 @@ if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); +} + +static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + if (prov->ret_value) /* Only trace when looping all providers */ + trace("Provider #%d '%s' (%d.%d)\n", prov->call_count, name, major, minor); + return prov->ret_value; +} + +static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + return prov->ret_value; +} + +static void test_EnumerateProviders(void) +{ + HRESULT hr; + int i; + struct provider_data arg; + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = TRUE; + + hr = DirectPlayEnumerateA(callback_providersA, NULL); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateA(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); + ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + hr = DirectPlayEnumerateA(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); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateA(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); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateW(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); + 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); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count > 0, "Expected at least one valid provider\n"); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateW(callback_providersW, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); } /* EnumConnections */ @@ -915,9 +1029,9 @@ if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) { hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + checkHR( DPERR_ALREADYINITIALIZED, hr ); } return TRUE; @@ -976,7 +1090,7 @@ { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -1085,7 +1199,7 @@ /* Uninitialized dpsd */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd_server.dwSize = sizeof(DPSESSIONDESC2); @@ -1095,7 +1209,7 @@ /* Regular operation */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); /* Opening twice */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); @@ -1698,12 +1812,16 @@ checkHR( DPERR_INVALIDPARAMS, hr ); hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL ); checkHR( DPERR_INVALIDPARAM, hr ); +if(0) +{ + /* Crashes under Win7 */ hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); checkHR( DPERR_INVALIDPARAM, hr ); dwDataSize=-1; hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} /* Get: Insufficient buffer size */ dwDataSize=0; @@ -2498,10 +2616,14 @@ checkHR( DPERR_INVALIDPLAYER, hr ); check( 1024, dwDataSize ); +if(0) +{ + /* Crashes under Win7 */ dwDataSize = -1; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); @@ -5789,6 +5911,9 @@ check( -1, dwNumBytes ); /* - Remote players */ +if(0) +{ + /* Crash under Win7 */ dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3], DPMESSAGEQUEUE_RECEIVE, @@ -5796,6 +5921,7 @@ checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */ check( -1, dwNumMsgs ); check( -1, dwNumBytes ); +} dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0, @@ -6532,6 +6658,7 @@ test_COM(); test_COM_dplobby(); + test_EnumerateProviders(); if (!winetest_interactive) {

1 0

[akhaldi] 66494: [DPLAYX] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 11:57:17 2015 New Revision: 66494 URL: http://svn.reactos.org/svn/reactos?rev=66494&view=rev Log: [DPLAYX] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.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] Sat Feb 28 11:57:17 2015 @@ -5761,6 +5761,11 @@ DWORD max_sizeOfDescriptionA = 0; WCHAR *descriptionW = NULL; DWORD max_sizeOfDescriptionW = 0; + DWORD sizeOfSubKeyName; + WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ + LONG ret_value; + static GUID *guid_cache; + static int cache_count; if (!lpEnumCallbackA && !lpEnumCallbackW) { @@ -5775,19 +5780,37 @@ ERR(": no service provider key in the registry - check your Wine installation !!!\n"); return DPERR_GENERIC; } - + + dwIndex = 0; + do + { + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); + dwIndex++; + } + while (ret_value == ERROR_SUCCESS); + /* The game Swing from bug 37185 expects GUID values to persist after + * the end of the enumeration. */ + if (cache_count < dwIndex) + { + HeapFree(GetProcessHeap(), 0, guid_cache); + guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); + if (!guid_cache) + { + ERR(": failed to alloc required memory.\n"); + return DPERR_EXCEPTION; + } + cache_count = dwIndex; + } /* Traverse all the service providers we have available */ dwIndex = 0; while (1) { - WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ - DWORD sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); HKEY hkServiceProvider; - GUID serviceProviderGUID; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - LONG ret_value; + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) @@ -5818,7 +5841,7 @@ ERR(": invalid format for the GUID registry data member for service provider %s (%s).\n", debugstr_w(subKeyName), debugstr_w(guidKeyContent)); continue; } - CLSIDFromString(guidKeyContent, &serviceProviderGUID ); + CLSIDFromString(guidKeyContent, &guid_cache[dwIndex]); /* The enumeration will return FALSE if we are not to continue. * @@ -5846,7 +5869,7 @@ RegQueryValueExA(hkServiceProvider, "DescriptionA", NULL, NULL, (LPBYTE) descriptionA, &sizeOfDescription); - if (!lpEnumCallbackA(&serviceProviderGUID, descriptionA, 6, 0, lpContext)) + if (!lpEnumCallbackA(&guid_cache[dwIndex], descriptionA, 6, 0, lpContext)) goto end; } else @@ -5868,7 +5891,7 @@ RegQueryValueExW(hkServiceProvider, descW, NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); - if (!lpEnumCallbackW(&serviceProviderGUID, descriptionW, 6, 0, lpContext)) + if (!lpEnumCallbackW(&guid_cache[dwIndex], descriptionW, 6, 0, lpContext)) goto end; } 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 Feb 28 11:57:17 2015 @@ -40,7 +40,7 @@ reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.27 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.27 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27

1 0

[akhaldi] 66493: [BOOTDATA/HIVESFT] Add DirectPlay service providers registry entries. CORE-9285
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 11:56:36 2015 New Revision: 66493 URL: http://svn.reactos.org/svn/reactos?rev=66493&view=rev Log: [BOOTDATA/HIVESFT] Add DirectPlay service providers registry entries. CORE-9285 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Feb 28 11:56:36 2015 @@ -46,6 +46,31 @@ ; DirectX HKLM,"SOFTWARE\Microsoft\DirectX","InstalledVersion",0x00000001, 0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","DescriptionA",,"Internet TCP/IP Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","DescriptionW",,"Internet TCP/IP Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","dwReserved1",0x10001,0x000001f4 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","dwReserved2",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","Guid",,"{36E95EE0-8577-11cf-960C-0080C7534E82}" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","NATHelp",,"dpnhupnp.dll" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay","Path",,"dpwsockx.dll" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","DescriptionA",,"IPX Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","DescriptionW",,"IPX Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","dwReserved1",0x10001,0x00000032 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","dwReserved2",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","Guid",,"{685BC400-9D2C-11cf-A9CD-00AA006886E3}" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay","Path",,"dpwsockx.dll" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","DescriptionA",,"Modem Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","DescriptionW",,"Modem Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","dwReserved1",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","dwReserved2",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","Guid",,"{44EAA760-CB68-11cf-9C4E-00A0C905425E}" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay","Path",,"dpmodemx.dll" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","DescriptionA",,"Serial Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","DescriptionW",,"Serial Connection For DirectPlay" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","dwReserved1",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","dwReserved2",0x10001,0x00000000 +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","Guid",,"{0F1D6860-88D9-11cf-9C4E-00A0C905425E}" +HKLM,"SOFTWARE\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay","Path",,"dpmodemx.dll" ; RPC HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012

1 0

[janderwald] 66492: [STREAMCI] - minor changes
by janderwald＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: janderwald Date: Sat Feb 28 11:28:06 2015 New Revision: 66492 URL: http://svn.reactos.org/svn/reactos?rev=66492&view=rev Log: [STREAMCI] - minor changes Modified: trunk/reactos/dll/win32/streamci/streamci.c Modified: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 28 11:28:06 2015 @@ -1,3 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/win32/streamci/streamci.c + * PURPOSE: Streaming device class installer + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + #include "precomp.h" DWORD @@ -56,7 +65,7 @@ PSWENUM_INSTALL_INTERFACE InstallInterface; DWORD dwResult; - hDevInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_SYSTEM, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); if (!hDevInfo) { // failed @@ -79,6 +88,7 @@ return GetLastError(); } + DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) { // failed @@ -86,7 +96,6 @@ SetupDiDestroyDeviceInfoList(hDevInfo); return GetLastError(); } - hDevice = CreateFileW(DeviceInterfaceDetailData->DevicePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED|FILE_ATTRIBUTE_NORMAL, NULL); if (hDevice == INVALID_HANDLE_VALUE)

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