Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[cwittich] 66543: [WLANAPI] add checks for invalid parameters
by cwittich＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: cwittich Date: Mon Mar 2 17:23:38 2015 New Revision: 66543 URL: http://svn.reactos.org/svn/reactos?rev=66543&view=rev Log: [WLANAPI] add checks for invalid parameters Modified: trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/profile.c Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 2 17:23:38 2015 @@ -108,7 +108,7 @@ { DWORD dwError = ERROR_SUCCESS; - if ((pReserved != NULL) || (hClientHandle == NULL)) + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (pConnectionParameters == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept @@ -132,7 +132,7 @@ { DWORD dwError = ERROR_SUCCESS; - if ((pReserved != NULL) || (hClientHandle == NULL)) + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept Modified: trunk/reactos/dll/win32/wlanapi/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/profile.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/profile.c [iso-8859-1] Mon Mar 2 17:23:38 2015 @@ -39,6 +39,9 @@ IN LPCWSTR strProfileName, PVOID pReserved) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileName == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -51,6 +54,9 @@ IN LPCWSTR strNewProfileName, PVOID pReserved) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strOldProfileName == NULL) || (strNewProfileName == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -65,6 +71,9 @@ DWORD *pdwFlags, PDWORD pdwGrantedAccess) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (pstrProfileXml == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -80,6 +89,9 @@ PVOID pReserved, OUT DWORD *pdwReasonCode) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileXml == NULL) || (pdwReasonCode == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -93,6 +105,9 @@ OUT DWORD *pdwDataSize, OUT PBYTE *ppData) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileName == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -106,6 +121,12 @@ IN const PBYTE pData, PVOID pReserved) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileName == NULL)) + return ERROR_INVALID_PARAMETER; + + if ((dwDataSize != 0) && (pData == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -117,6 +138,9 @@ PVOID pReserved, OUT PWLAN_PROFILE_INFO_LIST *ppProfileList) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (ppProfileList == NULL)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; } @@ -129,6 +153,9 @@ IN LPCWSTR *strProfileNames, PVOID pReserved) { + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileNames == NULL) || (dwItems == 0)) + return ERROR_INVALID_PARAMETER; + UNIMPLEMENTED; return ERROR_SUCCESS; }

1 0

[cwittich] 66542: [WLANAPI_WINETEST] add some tests for WlanConnect, WlanDisconnect and WlanScan
by cwittich＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: cwittich Date: Mon Mar 2 16:10:33 2015 New Revision: 66542 URL: http://svn.reactos.org/svn/reactos?rev=66542&view=rev Log: [WLANAPI_WINETEST] add some tests for WlanConnect, WlanDisconnect and WlanScan Modified: trunk/rostests/winetests/wlanapi/wlanapi.c Modified: trunk/rostests/winetests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] Mon Mar 2 16:10:33 2015 @@ -75,8 +75,106 @@ ok(ret == ERROR_INVALID_HANDLE, "expected failure\n"); } +static void WlanConnect_test(void) +{ + DWORD ret; + DWORD dwNegotiatedVersion; + HANDLE hClientHandle; + WLAN_CONNECTION_PARAMETERS pConnectParams; + const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; + + ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); + if (ret != ERROR_SUCCESS) + { + skip("WlanOpenHandle failed. Skipping wlanapi_WlanConnect tests\n"); + return; + } + + /* invalid pReserved */ + ret = WlanConnect(hClientHandle, &InterfaceGuid, &pConnectParams, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanConnect(hClientHandle, NULL, &pConnectParams, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanConnect(NULL, &InterfaceGuid, &pConnectParams, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid connection parameters */ + ret = WlanConnect(hClientHandle, &InterfaceGuid, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + WlanCloseHandle(hClientHandle, NULL); +} + +static void WlanDisconnect_test(void) +{ + DWORD ret; + DWORD dwNegotiatedVersion; + HANDLE hClientHandle; + const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; + + ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); + if (ret != ERROR_SUCCESS) + { + skip("WlanOpenHandle failed. Skipping wlanapi_WlanDisconnect tests\n"); + return; + } + + /* invalid pReserved */ + ret = WlanDisconnect(hClientHandle, &InterfaceGuid, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanDisconnect(hClientHandle, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanDisconnect(NULL, &InterfaceGuid, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + WlanCloseHandle(hClientHandle, NULL); +} + +static void WlanScan_test(void) +{ + DWORD ret; + DWORD dwNegotiatedVersion; + HANDLE hClientHandle; + DOT11_SSID Ssid; + WLAN_RAW_DATA RawData; + const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; + + ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); + if (ret != ERROR_SUCCESS) + { + skip("WlanOpenHandle failed. Skipping wlanapi_WlanDisconnect tests\n"); + return; + } + + /* invalid pReserved */ + ret = WlanScan(hClientHandle, &InterfaceGuid, &Ssid, &RawData, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanScan(hClientHandle, NULL, &Ssid, &RawData, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanScan(NULL, &InterfaceGuid, &Ssid, &RawData, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + WlanCloseHandle(hClientHandle, NULL); +} + + START_TEST(wlanapi) { WlanOpenHandle_test(); WlanCloseHandle_test(); + WlanConnect_test(); + WlanDisconnect_test(); + WlanScan_test(); }

1 0

[cwittich] 66541: [WLANAPI] stub some WlanProfile functions fix some declarations
by cwittich＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: cwittich Date: Mon Mar 2 14:33:50 2015 New Revision: 66541 URL: http://svn.reactos.org/svn/reactos?rev=66541&view=rev Log: [WLANAPI] stub some WlanProfile functions fix some declarations Added: trunk/reactos/dll/win32/wlanapi/profile.c (with props) Modified: trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/psdk/wlanapi.h trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -120,7 +120,7 @@ DWORD _RpcGetInterfaceCapability( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, PWLAN_INTERFACE_CAPABILITY *ppCapability) { UNIMPLEMENTED; @@ -129,7 +129,7 @@ DWORD _RpcSetInterface( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, DWORD OpCode, DWORD dwDataSize, LPBYTE pData) @@ -140,7 +140,7 @@ DWORD _RpcQueryInterface( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, long OpCode, LPDWORD pdwDataSize, LPBYTE *ppData, @@ -152,7 +152,7 @@ DWORD _RpcIhvControl( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, DWORD Type, DWORD dwInBufferSize, LPBYTE pInBuffer, @@ -166,7 +166,7 @@ DWORD _RpcScan( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, PDOT11_SSID pDot11Ssid, PWLAN_RAW_DATA pIeData) { @@ -191,7 +191,7 @@ DWORD _RpcGetAvailableNetworkList( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, DWORD dwFlags, WLAN_AVAILABLE_NETWORK_LIST **ppAvailableNetworkList) { @@ -201,7 +201,7 @@ DWORD _RpcGetNetworkBssList( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, PDOT11_SSID pDot11Ssid, short dot11BssType, DWORD bSecurityEnabled, @@ -214,8 +214,8 @@ DWORD _RpcConnect( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, - PWLAN_CONNECTION_PARAMETERS *pConnectionParameters) + const GUID *pInterfaceGuid, + const PWLAN_CONNECTION_PARAMETERS *pConnectionParameters) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -223,7 +223,7 @@ DWORD _RpcDisconnect( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGUID) + const GUID *pInterfaceGUID) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -248,7 +248,7 @@ DWORD _RpcSetProfileEapUserData( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, EAP_METHOD_TYPE MethodType, DWORD dwFlags, @@ -261,7 +261,7 @@ DWORD _RpcSetProfile( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, DWORD dwFlags, wchar_t *strProfileXml, wchar_t *strAllUserProfileSecurity, @@ -274,7 +274,7 @@ DWORD _RpcGetProfile( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, wchar_t **pstrProfileXml, LPDWORD pdwFlags, @@ -286,7 +286,7 @@ DWORD _RpcDeleteProfile( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName) { UNIMPLEMENTED; @@ -295,7 +295,7 @@ DWORD _RpcRenameProfile( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strOldProfileName, wchar_t *strNewProfileName) { @@ -305,7 +305,7 @@ DWORD _RpcSetProfileList( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, DWORD dwItems, BYTE **strProfileNames) { @@ -315,7 +315,7 @@ DWORD _RpcGetProfileList( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, PWLAN_PROFILE_INFO_LIST *ppProfileList) { UNIMPLEMENTED; @@ -324,7 +324,7 @@ DWORD _RpcSetProfilePosition( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, DWORD dwPosition) { @@ -334,7 +334,7 @@ DWORD _RpcSetProfileCustomUserData( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, DWORD dwDataSize, LPBYTE pData) @@ -345,7 +345,7 @@ DWORD _RpcGetProfileCustomUserData( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, LPDWORD dwDataSize, LPBYTE *pData) @@ -384,7 +384,7 @@ DWORD _RpcSaveTemporaryProfile( WLANSVC_RPC_HANDLE hClientHandle, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *strProfileName, wchar_t *strAllUserProfileSecurity, DWORD dwFlags, @@ -396,7 +396,7 @@ DWORD _RpcIsUIRequestPending( wchar_t *arg_1, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, struct_C *arg_3, LPDWORD arg_4) { @@ -417,7 +417,7 @@ DWORD _RpcIsNetworkSuppressed( wchar_t *arg_1, DWORD arg_2, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, LPDWORD arg_4) { UNIMPLEMENTED; @@ -426,7 +426,7 @@ DWORD _RpcRemoveUIForwardingNetworkList( wchar_t *arg_1, - GUID *pInterfaceGuid) + const GUID *pInterfaceGuid) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -456,7 +456,7 @@ DWORD _RpcGetProfileKeyInfo( wchar_t *arg_1, DWORD arg_2, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *arg_4, DWORD arg_5, LPDWORD arg_6, @@ -469,7 +469,7 @@ DWORD _RpcAsyncDoPlap( wchar_t *arg_1, - GUID *pInterfaceGuid, + const GUID *pInterfaceGuid, wchar_t *arg_3, DWORD dwSize, struct_E arg_5[]) @@ -495,7 +495,7 @@ DWORD _RpcCancelPlap( wchar_t *arg_1, - GUID *pInterfaceGuid) + const GUID *pInterfaceGuid) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -5,6 +5,7 @@ list(APPEND SOURCE main.c + profile.c ${CMAKE_CURRENT_BINARY_DIR}/wlanapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_c.c) Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -101,6 +101,55 @@ DWORD WINAPI +WlanConnect(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN const PWLAN_CONNECTION_PARAMETERS pConnectionParameters, + PVOID pReserved) +{ + DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (hClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + _RpcConnect(hClientHandle, pInterfaceGuid, &pConnectionParameters); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + +DWORD +WINAPI +WlanDisconnect(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + PVOID pReserved) +{ + DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (hClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + _RpcDisconnect(hClientHandle, pInterfaceGuid); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + +DWORD +WINAPI WlanOpenHandle(IN DWORD dwClientVersion, PVOID pReserved, OUT DWORD *pdwNegotiatedVersion, @@ -178,7 +227,7 @@ DWORD WINAPI WlanScan(IN HANDLE hClientHandle, - IN GUID *pInterfaceGuid, + IN const GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved) Added: trunk/reactos/dll/win32/wlanapi/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/profile.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/profile.c (added) +++ trunk/reactos/dll/win32/wlanapi/profile.c [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -0,0 +1,134 @@ +/* + * Wireless LAN API (wlanapi.dll) + * + * Copyright 2009 Christoph von Wittich (Christoph(a)ApiViewer.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +/* INCLUDES ****************************************************************/ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wlansvc_c.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); + +DWORD +WINAPI +WlanDeleteProfile(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN LPCWSTR strProfileName, + PVOID pReserved) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanRenameProfile(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN LPCWSTR strOldProfileName, + IN LPCWSTR strNewProfileName, + PVOID pReserved) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanGetProfile(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN LPCWSTR strProfileName, + PVOID pReserved, + OUT LPWSTR *pstrProfileXml, + DWORD *pdwFlags, + PDWORD pdwGrantedAccess) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanSetProfile(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN DWORD dwFlags, + IN LPCWSTR strProfileXml, + LPCWSTR strAllUserProfileSecurity, + IN BOOL bOverwrite, + PVOID pReserved, + OUT DWORD *pdwReasonCode) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanGetProfileCustomUserData(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN LPCWSTR strProfileName, + PVOID pReserved, + OUT DWORD *pdwDataSize, + OUT PBYTE *ppData) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanSetProfileCustomUserData(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN LPCWSTR strProfileName, + IN DWORD dwDataSize, + IN const PBYTE pData, + PVOID pReserved) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanGetProfileList(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + PVOID pReserved, + OUT PWLAN_PROFILE_INFO_LIST *ppProfileList) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanSetProfileList(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + DWORD dwItems, + IN LPCWSTR *strProfileNames, + PVOID pReserved) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} Propchange: trunk/reactos/dll/win32/wlanapi/profile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -1,8 +1,8 @@ @ stdcall WlanAllocateMemory (long) @ stdcall WlanCloseHandle (ptr ptr) -@ stub WlanConnect -@ stub WlanDeleteProfile -@ stub WlanDisconnect +@ stdcall WlanConnect (ptr ptr ptr ptr) +@ stdcall WlanDeleteProfile (ptr ptr ptr ptr) +@ stdcall WlanDisconnect (ptr ptr ptr) @ stdcall WlanEnumInterfaces (ptr ptr ptr) @ stub WlanExtractPsdIEDataList @ stdcall WlanFreeMemory (ptr) @@ -10,9 +10,9 @@ @ stub WlanGetFilterList @ stub WlanGetInterfaceCapability @ stub WlanGetNetworkBssList -@ stub WlanGetProfile -@ stub WlanGetProfileCustomUserData -@ stub WlanGetProfileList +@ stdcall WlanGetProfile (ptr ptr ptr ptr ptr long ptr) +@ stdcall WlanGetProfileCustomUserData (ptr ptr ptr ptr ptr ptr) +@ stdcall WlanGetProfileList (ptr ptr ptr ptr) @ stub WlanGetSecuritySettings @ stub WlanIhvControl @ stdcall WlanOpenHandle (long ptr ptr ptr) @@ -20,17 +20,17 @@ @ stub WlanQueryInterface @ stub WlanReasonCodeToString @ stub WlanRegisterNotification -@ stub WlanRenameProfile +@ stdcall WlanRenameProfile (ptr ptr ptr ptr ptr) @ stub WlanSaveTemporaryProfile @ stdcall WlanScan (ptr ptr ptr ptr ptr) @ stub WlanSetAutoConfigParameter @ stub WlanSetFilterList @ stub WlanSetInterface -@ stub WlanSetProfile -@ stub WlanSetProfileCustomUserData +@ stdcall WlanSetProfile (ptr ptr long ptr ptr long ptr ptr) +@ stdcall WlanSetProfileCustomUserData (ptr ptr ptr long ptr ptr) @ stub WlanSetProfileEapUserData @ stub WlanSetProfileEapXmlUserData -@ stub WlanSetProfileList +@ stdcall WlanSetProfileList (ptr ptr long ptr ptr) @ stub WlanSetProfilePosition @ stub WlanSetPsdIEDataList @ stub WlanSetSecuritySettings Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -190,8 +190,19 @@ VOID WINAPI WlanFreeMemory(PVOID pMemory); DWORD WINAPI WlanOpenHandle(IN DWORD dwClientVersion, PVOID pReserved, OUT DWORD *pdwNegotiatedVersion, OUT HANDLE *phClientHandle); DWORD WINAPI WlanCloseHandle(IN HANDLE hClientHandle, PVOID pReserved); +DWORD WINAPI WlanConnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN const PWLAN_CONNECTION_PARAMETERS pConnectionParameters, PVOID pReserved); +DWORD WINAPI WlanDisconnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved); DWORD WINAPI WlanEnumInterfaces(IN HANDLE hClientHandle, PVOID pReserved, OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); -DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); +DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); +DWORD WINAPI WlanDeleteProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved); +DWORD WINAPI WlanGetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT LPWSTR *pstrProfileXml, DWORD *pdwFlags, PDWORD pdwGrantedAccess); +DWORD WINAPI WlanGetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT DWORD *pdwDataSize, OUT PBYTE *ppData); +DWORD WINAPI WlanGetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved, OUT PWLAN_PROFILE_INFO_LIST *ppProfileList); +DWORD WINAPI WlanSetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN DWORD dwFlags, IN LPCWSTR strProfileXml, LPCWSTR strAllUserProfileSecurity, IN BOOL bOverwrite, PVOID pReserved, OUT DWORD *pdwReasonCode); +DWORD WINAPI WlanSetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN DWORD dwDataSize, IN const PBYTE pData, PVOID pReserved); +DWORD WINAPI WlanSetProfileEapUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN EAP_METHOD_TYPE eapType, IN DWORD dwFlags, IN DWORD dwEapUserDataSize, IN const LPBYTE pbEapUserData, PVOID pReserved); +DWORD WINAPI WlanSetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, DWORD dwItems, IN LPCWSTR *strProfileNames, PVOID pReserved); +DWORD WINAPI WlanRenameProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strOldProfileName, IN LPCWSTR strNewProfileName, PVOID pReserved); #endif #ifdef __cplusplus Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Mon Mar 2 14:33:50 2015 @@ -79,13 +79,13 @@ /* Function: 0x05 */ DWORD _RpcGetInterfaceCapability( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [out, ref] PWLAN_INTERFACE_CAPABILITY *ppCapability); /* Function: 0x06 */ DWORD _RpcSetInterface( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] /* enum32 */ DWORD OpCode, [in] DWORD dwDataSize, [in, size_is(dwDataSize)] LPBYTE pData); @@ -93,7 +93,7 @@ /* Function: 0x07 */ DWORD _RpcQueryInterface( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] /* enum32 */ long OpCode, [in, out] LPDWORD pdwDataSize, [out][ref][size_is(*pdwDataSize)] LPBYTE* ppData, @@ -102,7 +102,7 @@ /* Function: 0x08 */ DWORD _RpcIhvControl( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] /* enum32 */ DWORD Type, [in] DWORD dwInBufferSize, [in][size_is(dwInBufferSize)] LPBYTE pInBuffer, @@ -113,21 +113,21 @@ /* Function: 0x09 */ DWORD _RpcScan( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][unique] PDOT11_SSID pDot11Ssid, [in][unique] PWLAN_RAW_DATA pIeData); /* Function: 0x0A */ DWORD _RpcGetAvailableNetworkList( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] DWORD dwFlags, [out][ref] WLAN_AVAILABLE_NETWORK_LIST **ppAvailableNetworkList); /* Function: 0x0B */ DWORD _RpcGetNetworkBssList( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][unique] PDOT11_SSID pDot11Ssid, [in] /* enum16 */ short dot11BssType, [in] DWORD bSecurityEnabled, @@ -137,13 +137,13 @@ /* Function: 0x0C */ DWORD _RpcConnect( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, - [in] PWLAN_CONNECTION_PARAMETERS* pConnectionParameters); + [in] const GUID* pInterfaceGuid, + [in] const PWLAN_CONNECTION_PARAMETERS* pConnectionParameters); /* Function: 0x0D */ DWORD _RpcDisconnect( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGUID); + [in] const GUID* pInterfaceGUID); /* Function: 0x0E */ DWORD _RpcRegisterNotification( @@ -159,7 +159,7 @@ /* Function: 0x10 */ DWORD _RpcSetProfileEapUserData( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [in] EAP_METHOD_TYPE MethodType, [in] DWORD dwFlags, @@ -169,7 +169,7 @@ /* Function: 0x11 */ DWORD _RpcSetProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] DWORD dwFlags, [in][string] wchar_t * strProfileXml, [in][unique][string] wchar_t * strAllUserProfileSecurity, @@ -179,7 +179,7 @@ /* Function: 0x12 */ DWORD _RpcGetProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [out][ref][string] wchar_t ** pstrProfileXml, [out] LPDWORD pdwFlags, @@ -188,40 +188,40 @@ /* Function: 0x13 */ DWORD _RpcDeleteProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName); /* Function: 0x14 */ DWORD _RpcRenameProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strOldProfileName, [in][string] wchar_t * strNewProfileName); /* Function: 0x15 */ DWORD _RpcSetProfileList( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] DWORD dwItems, [in] /* [string] */ [size_is(dwItems)] /* wchar_t */ BYTE ** strProfileNames); /* FIXME */ /* Function: 0x16 */ DWORD _RpcGetProfileList( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [out][ref] PWLAN_PROFILE_INFO_LIST *ppProfileList); /* Function: 0x17 */ DWORD _RpcSetProfilePosition( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [in] DWORD dwPosition); /* Function: 0x18 */ DWORD _RpcSetProfileCustomUserData( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [in] DWORD dwDataSize, [in][unique][size_is(dwDataSize)] LPBYTE pData); @@ -229,7 +229,7 @@ /* Function: 0x19 */ DWORD _RpcGetProfileCustomUserData( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [in, out] LPDWORD dwDataSize, [out][ref][size_is(*dwDataSize)] LPBYTE *pData); @@ -256,7 +256,7 @@ /* Function: 0x1D */ DWORD _RpcSaveTemporaryProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, [in][unique][string] wchar_t * strAllUserProfileSecurity, [in] DWORD dwFlags, @@ -265,7 +265,7 @@ /* Function: 0x1E, address: 0x2C992E36 */ DWORD _RpcIsUIRequestPending( [in] wchar_t * arg_1, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in] struct_C * arg_3, [out] LPDWORD arg_4); @@ -280,13 +280,13 @@ DWORD _RpcIsNetworkSuppressed( [in] wchar_t * arg_1, [in] DWORD arg_2, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [out] LPDWORD arg_4); /* Function: 0x21 */ DWORD _RpcRemoveUIForwardingNetworkList( [in] wchar_t * arg_1, - [in] GUID* pInterfaceGuid); + [in] const GUID* pInterfaceGuid); /* Function: 0x22 */ DWORD _RpcQueryExtUIRequest( @@ -307,7 +307,7 @@ DWORD _RpcGetProfileKeyInfo( [in] wchar_t * arg_1, [in] DWORD arg_2, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * arg_4, [in] DWORD arg_5, [out] LPDWORD arg_6, @@ -317,7 +317,7 @@ /* Function: 0x25 */ DWORD _RpcAsyncDoPlap( [in] wchar_t * arg_1, - [in] GUID* pInterfaceGuid, + [in] const GUID* pInterfaceGuid, [in][string] wchar_t * arg_3, [in] DWORD dwSize, [in][size_is(dwSize)] struct_E arg_5[]); @@ -337,7 +337,7 @@ /* Function: 0x27 */ DWORD _RpcCancelPlap( [in] wchar_t * arg_1, - [in] GUID* pInterfaceGuid); + [in] const GUID* pInterfaceGuid); /* Function: 0x28 */ DWORD _RpcSetSecuritySettings(

1 0

[jimtabor] 66540: [NtUser] - Fix test for child windows. This is for painting changes. See CORE-7447.
by jimtabor＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: jimtabor Date: Mon Mar 2 06:45:19 2015 New Revision: 66540 URL: http://svn.reactos.org/svn/reactos?rev=66540&view=rev Log: [NtUser] - Fix test for child windows. This is for painting changes. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Mar 2 06:45:19 2015 @@ -850,25 +850,25 @@ /* INTERNAL ******************************************************************/ - +//// +// This fixes a check for children messages that need paint while searching the parents messages! +// Fixes wine msg:test_paint_messages:WmParentErasePaint .. +//// BOOL FASTCALL IntIsChildWindow(PWND Parent, PWND BaseWindow) { - PWND Window; - - Window = BaseWindow; - while (Window && ((Window->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) - { - if (Window == Parent) - { - return(TRUE); - } - - Window = Window->spwndParent; - } - - return(FALSE); -} + PWND Window = BaseWindow; + do + { + if ( Window == NULL || (Window->style & (WS_POPUP|WS_CHILD)) != WS_CHILD ) + return FALSE; + + Window = Window->spwndParent; + } + while(Parent != Window); + return TRUE; +} +//// /* Link the window into siblings list

1 0

[hbelusca] 66539: [SHLWAPI]: Update the ros-diff.
by hbelusca＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: hbelusca Date: Mon Mar 2 01:23:55 2015 New Revision: 66539 URL: http://svn.reactos.org/svn/reactos?rev=66539&view=rev Log: [SHLWAPI]: Update the ros-diff. Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff [iso-8859-1] Mon Mar 2 01:23:55 2015 @@ -2,6 +2,31 @@ =================================================================== --- path.c (working copy) +++ path.c (working copy) +@@ -21,23 +21,8 @@ + + #include "precomp.h" + +-/* Get a function pointer from a DLL handle */ +-#define GET_FUNC(func, module, name, fail) \ +- do { \ +- if (!func) { \ +- if (!SHLWAPI_h##module && !(SHLWAPI_h##module = LoadLibraryA(#module ".dll"))) return fail; \ +- func = (fn##func)GetProcAddress(SHLWAPI_h##module, name); \ +- if (!func) return fail; \ +- } \ +- } while (0) ++int WINAPI IsNetDrive(int drive); + +-/* DLL handles for late bound calls */ +-static HMODULE SHLWAPI_hshell32; +- +-/* Function pointers for GET_FUNC macro; these need to be global because of gcc bug */ +-typedef BOOL (WINAPI *fnpIsNetDrive)(int); +-static fnpIsNetDrive pIsNetDrive; +- + HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); + + static inline WCHAR* heap_strdupAtoW(LPCSTR str) @@ -2186,7 +2186,7 @@ { TRACE("(%s)\n",debugstr_a(lpszPath)); @@ -20,3 +45,23 @@ return TRUE; return FALSE; } +@@ -3699,8 +3684,7 @@ + dwDriveNum = PathGetDriveNumberA(lpszPath); + if (dwDriveNum == -1) + return FALSE; +- GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ +- return pIsNetDrive(dwDriveNum); ++ return IsNetDrive(dwDriveNum); + } + + /************************************************************************* +@@ -3721,8 +3705,7 @@ + dwDriveNum = PathGetDriveNumberW(lpszPath); + if (dwDriveNum == -1) + return FALSE; +- GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ +- return pIsNetDrive(dwDriveNum); ++ return IsNetDrive(dwDriveNum); + } + + /*************************************************************************

1 0

[hbelusca] 66538: [SHLWAPI]: Remove some Wine madness. CORE-8936.
by hbelusca＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: hbelusca Date: Mon Mar 2 01:15:00 2015 New Revision: 66538 URL: http://svn.reactos.org/svn/reactos?rev=66538&view=rev Log: [SHLWAPI]: Remove some Wine madness. CORE-8936. Modified: trunk/reactos/dll/win32/shlwapi/path.c Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Mon Mar 2 01:15:00 2015 @@ -21,22 +21,7 @@ #include "precomp.h" -/* Get a function pointer from a DLL handle */ -#define GET_FUNC(func, module, name, fail) \ - do { \ - if (!func) { \ - if (!SHLWAPI_h##module && !(SHLWAPI_h##module = LoadLibraryA(#module ".dll"))) return fail; \ - func = (fn##func)GetProcAddress(SHLWAPI_h##module, name); \ - if (!func) return fail; \ - } \ - } while (0) - -/* DLL handles for late bound calls */ -static HMODULE SHLWAPI_hshell32; - -/* Function pointers for GET_FUNC macro; these need to be global because of gcc bug */ -typedef BOOL (WINAPI *fnpIsNetDrive)(int); -static fnpIsNetDrive pIsNetDrive; +int WINAPI IsNetDrive(int drive); HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); @@ -3699,8 +3684,7 @@ dwDriveNum = PathGetDriveNumberA(lpszPath); if (dwDriveNum == -1) return FALSE; - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ - return pIsNetDrive(dwDriveNum); + return IsNetDrive(dwDriveNum); } /************************************************************************* @@ -3721,8 +3705,7 @@ dwDriveNum = PathGetDriveNumberW(lpszPath); if (dwDriveNum == -1) return FALSE; - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ - return pIsNetDrive(dwDriveNum); + return IsNetDrive(dwDriveNum); } /*************************************************************************

1 0

[hbelusca] 66537: Fix build.
by hbelusca＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: hbelusca Date: Mon Mar 2 01:02:18 2015 New Revision: 66537 URL: http://svn.reactos.org/svn/reactos?rev=66537&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Mon Mar 2 01:02:18 2015 @@ -205,7 +205,7 @@ 206 stdcall ExtractAssociatedIconA(long str ptr) 207 stdcall ExtractAssociatedIconExA(long str long long) 208 stdcall ExtractAssociatedIconExW(long wstr long long) -209 stdcall -noname Int64ToString(__int64 wstr long long ptr long) +209 stdcall -noname Int64ToString(int64 wstr long long ptr long) 210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) 211 stdcall -noname Printers_GetPidl(ptr str long long) 212 stdcall -noname Printers_AddPrinterPropPages(ptr ptr)

1 0

[hbelusca] 66536: [SHELL32]: Fix some imports. CORE-8936 CORE-8174
by hbelusca＠svn.reactos.org 02 Mar '15

02 Mar '15

Author: hbelusca Date: Mon Mar 2 00:59:14 2015 New Revision: 66536 URL: http://svn.reactos.org/svn/reactos?rev=66536&view=rev Log: [SHELL32]: Fix some imports. CORE-8936 CORE-8174 Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.cpp trunk/reactos/dll/win32/shell32/wine/control.c trunk/reactos/dll/win32/shell32/wine/shellord.c trunk/reactos/dll/win32/shell32/wine/shellpath.c trunk/reactos/dll/win32/shell32/wine/shellreg.c trunk/reactos/dll/win32/shell32/wine/shlmenu.c trunk/reactos/dll/win32/shell32/wine/shpolicy.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -1,7 +1,7 @@ 2 stdcall SHChangeNotifyRegister(long long long long long ptr) 3 stdcall SHDefExtractIconA(str long long ptr ptr long) 4 stdcall SHChangeNotifyDeregister(long) -5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) # FIXME: Inspect +5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) 6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) 7 stdcall -noname SHLookupIconIndexA(str long long) 8 stdcall -noname SHLookupIconIndexW(wstr long long) @@ -26,22 +26,22 @@ 27 stdcall ILSaveToStream(ptr ptr) 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW -30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW # FIXME: should be PathBuildRootW +30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootW 31 stdcall -noname PathFindExtension(wstr) PathFindExtensionW 32 stdcall -noname PathAddBackslash(wstr) PathAddBackslashW 33 stdcall -noname PathRemoveBlanks(wstr) PathRemoveBlanksW 34 stdcall -noname PathFindFileName(wstr) PathFindFileNameW -35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme -36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme -37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW # FIXME: Inspect +35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW +36 stdcall -noname PathAppend(ptr ptr) PathAppendAW +37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW 38 stdcall -noname PathStripPath(wstr) PathStripPathW -39 stdcall -noname PathIsUNC(wstr) PathIsUNCW # FIXME: Inspect -40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW # FIXME: Inspect +39 stdcall -noname PathIsUNC(wstr) PathIsUNCW +40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW 41 stdcall IsLFNDriveA(str) 42 stdcall IsLFNDriveW(wstr) 43 stdcall PathIsExe(ptr) PathIsExeAW 44 stub -noname Control_RunDLLNoFallback -45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme +45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # FIXME 46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW 48 stdcall -noname PathSetDlgItemPath(long long wstr) PathSetDlgItemPathW @@ -49,19 +49,19 @@ 50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(wstr) PathGetArgsW -53 stdcall -noname IsSuspendAllowed() # FIXME: Wine says DoEnvironmentSubst +53 stdcall -noname IsSuspendAllowed() 54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW 56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW -57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW # FIXME: Inspect -58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme +57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW +58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # FIXME 59 stdcall RestartDialog(long wstr long) -60 stdcall -noname ExitWindowsDialog(long) # Fixme -61 stdcall -noname RunFileDlg(long long long wstr wstr long) RunFileDlg # Fixme? +60 stdcall -noname ExitWindowsDialog(long) +61 stdcall -noname RunFileDlg(long long long wstr wstr long) 62 stdcall PickIconDlg(long long long long) 63 stdcall GetFileNameFromBrowse(long long long long wstr wstr wstr) 64 stdcall DriveType(long) -65 stdcall -noname InvalidateDriveType(long) # FIXME: Inspect +65 stdcall -noname InvalidateDriveType(long) 66 stdcall IsNetDrive(long) 67 stdcall Shell_MergeMenus(long long long long long long) 68 stdcall SHGetSetSettings(ptr long long) @@ -74,13 +74,13 @@ 75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) 76 stdcall -noname DragQueryInfo(ptr ptr) 77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) -78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme -79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme +78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # FIXME +79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # FIXME 80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) 81 stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA 82 stdcall -noname DDECreatePostNotify(ptr) 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) -84 stdcall -noname SHIsBadInterfacePtr(ptr long) # Fixme +84 stdcall -noname SHIsBadInterfacePtr(ptr long) 85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA 86 stdcall -noname SHRegisterDragDrop(long ptr) 87 stdcall -noname SHRevokeDragDrop(long) @@ -92,10 +92,10 @@ 93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW 95 stdcall -noname SHLogILFromFSIL(ptr) -96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # Fixme +96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # FIXME 97 stdcall -noname SHWaitForFileToOpen(long long long) 98 stdcall SHGetRealIDL(ptr ptr ptr) -99 stdcall -noname SetAppStartingCursor(long long) # Fixme +99 stdcall -noname SetAppStartingCursor(long long) 100 stdcall SHRestricted(long) 101 stdcall OpenAs_RunDLLA(long long str long) 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) @@ -118,11 +118,11 @@ 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW @ stdcall -private DllGetVersion(ptr) 121 stdcall SHFlushClipboard() -122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? +122 stdcall -noname RunDll_CallEntry16(long long long str long) 123 stdcall -noname SHFreeUnusedLibraries() @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() -126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme +126 stdcall -noname SHOutOfMemoryMessageBox(long long long) 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject 129 stdcall DAD_AutoScroll(long ptr ptr) @@ -156,10 +156,10 @@ 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(wstr long long) SHPathGetExtensionW 159 stdcall -noname PathIsDirectory(wstr) PathIsDirectoryW -160 stdcall -noname SHNetConnectionDialog(ptr wstr long) # Fixme +160 stdcall -noname SHNetConnectionDialog(ptr wstr long) 161 stdcall SHRunControlPanel(long long) -162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # Fixme -163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # Fixme +162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # FIXME +163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # FIXME 164 stdcall Win32DeleteFile(wstr) Win32DeleteFileW 165 stdcall SHCreateDirectory(long ptr) 166 stdcall CallCPLEntry16(long long long long long long) @@ -181,7 +181,7 @@ 182 varargs ShellMessageBoxW(long long wstr wstr long) 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) -185 stdcall -noname SHHandleDiskFull(ptr long) # Fixme +185 stdcall -noname SHHandleDiskFull(ptr long) 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stdcall -noname ILGetPseudoNameW(ptr ptr wstr long) 188 stdcall -noname ShellDDEInit(long) @@ -193,7 +193,7 @@ 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) 195 stdcall SHFree(ptr) 196 stdcall SHAlloc(long) -197 stdcall -noname SHGlobalDefect(long) # FIXME: Inspect +197 stdcall -noname SHGlobalDefect(long) 198 stdcall -noname SHAbortInvokeCommand() 199 stdcall DuplicateIcon(long long) 200 stdcall -noname SHCreateDesktop(ptr) @@ -205,9 +205,9 @@ 206 stdcall ExtractAssociatedIconA(long str ptr) 207 stdcall ExtractAssociatedIconExA(long str long long) 208 stdcall ExtractAssociatedIconExW(long wstr long long) -209 stdcall -noname Int64ToString(double wstr long long ptr long) # Fixme -210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) # Fixme -211 stdcall -noname Printers_GetPidl(ptr str) # Fixme +209 stdcall -noname Int64ToString(__int64 wstr long long ptr long) +210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) +211 stdcall -noname Printers_GetPidl(ptr str long long) 212 stdcall -noname Printers_AddPrinterPropPages(ptr ptr) 213 stdcall -noname Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall -noname Printers_UnregisterWindow(long long) @@ -238,13 +238,13 @@ 239 stdcall PathIsSlowW(wstr long) 240 stdcall PathIsSlowA(str long) 241 stdcall -noname SHGetUserDisplayName(wstr ptr) -242 stdcall -noname SHGetProcessDword(long long) # FIXME: Inspect +242 stdcall -noname SHGetProcessDword(long long) 243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx # FIXME: Inspect -244 stdcall -noname SHInitRestricted(ptr ptr) # FIXME: Inspect +244 stdcall -noname SHSettingsChanged(ptr ptr) 245 stdcall SHTestTokenMembership(ptr ptr) 246 stub -noname SHInvokePrivilegedFunctionW 247 stub -noname SHGetActiveConsoleSessionId -248 stdcall -noname SHGetUserSessionId(ptr) # Fixme +248 stdcall -noname SHGetUserSessionId(ptr) 249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW 250 stdcall -noname PathRemoveExtension(wstr) PathRemoveExtensionW 251 stdcall -noname PathRemoveArgs(wstr) PathRemoveArgsW @@ -253,9 +253,9 @@ 254 stub -noname DisconnectWindowsDialog 255 stdcall Options_RunDLL(ptr ptr str long) 256 stdcall SHCreateShellFolderView(ptr ptr) -257 stdcall -noname SHGetShellFolderViewCB(ptr) # FIXME: Inspect +257 stdcall -noname SHGetShellFolderViewCB(ptr) 258 stdcall -noname LinkWindow_RegisterClass() -259 stdcall -noname LinkWindow_UnregisterClass() # FIXME: Inspect +259 stdcall -noname LinkWindow_UnregisterClass(long) 260 stdcall Options_RunDLLA(ptr ptr str long) 261 stdcall Options_RunDLLW(ptr ptr wstr long) 262 stdcall PrintersGetCommand_RunDLL(ptr ptr wstr long) @@ -394,10 +394,10 @@ 395 stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW 396 stdcall StrStrW(wstr wstr) shlwapi.StrStrW 397 stdcall WOWShellExecute(ptr str str str str long ptr) -520 stdcall SHAllocShared(ptr long long) # FIXME: Inspect -521 stdcall SHLockShared(long long) # FIXME: Inspect -522 stdcall SHUnlockShared(ptr) # FIXME: Inspect -523 stdcall SHFreeShared(long long) # FIXME: Inspect +520 stdcall SHAllocShared(ptr long long) shlwapi.SHAllocShared +521 stdcall SHLockShared(long long) shlwapi.SHLockShared +522 stdcall SHUnlockShared(ptr) shlwapi.SHUnlockShared +523 stdcall SHFreeShared(long long) shlwapi.SHFreeShared 524 stdcall RealDriveType(long long) 525 stdcall -noname RealDriveTypeFlags(long long) 526 stdcall SHFlushSFCache() @@ -406,9 +406,9 @@ 643 stdcall -noname SHChangeNotifyReceive(long long ptr ptr) 644 stdcall SHChangeNotification_Lock(long long ptr ptr) 645 stdcall SHChangeNotification_Unlock(long) -646 stdcall -noname SHChangeRegistrationReceive(ptr long) # FIXME: Inspect +646 stdcall -noname SHChangeRegistrationReceive(ptr long) 648 stdcall -noname SHWaitOp_Operate(ptr long) -650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW # Fixme +650 stdcall -noname PathIsSameRoot(wstr wstr) PathIsSameRootW 651 stdcall -noname OldReadCabinetState(long long) ReadCabinetState 652 stdcall WriteCabinetState(long) 653 stdcall PathProcessCommand(long long long long) PathProcessCommandAW @@ -432,7 +432,7 @@ 708 stdcall -noname SHGetSetFolderCustomSettingsA(ptr str long) 709 stdcall SHGetSetFolderCustomSettingsW(ptr wstr long) 711 stdcall -noname CheckWinIniForAssocs() -712 stdcall -noname SHCopyMonikerToTemp(ptr wstr wstr long) # FIXME: Inspect +712 stdcall -noname SHCopyMonikerToTemp(ptr wstr wstr long) 713 stdcall -noname PathIsTemporaryA(str) 714 stdcall -noname PathIsTemporaryW(wstr) 715 stdcall -noname SHCreatePropertyBag(ptr ptr) Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -1107,7 +1107,7 @@ */ EXTERN_C LPITEMIDLIST WINAPI -Printers_GetPidl(LPCITEMIDLIST pidl, LPCWSTR lpName) +Printers_GetPidl(LPCITEMIDLIST pidl, LPCWSTR lpName, DWORD dwUnknown1, DWORD dwUnknown2) { FIXME("Printers_GetPidl() stub\n"); return NULL; Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -481,7 +481,7 @@ * Control_RunDLLW [SHELL32.@] * */ -EXTERN_C void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) +void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) { CPanel Panel; @@ -538,10 +538,10 @@ /************************************************************************* - * RunDLL_CallEntry16 [SHELL32.122] - * the name is probably wrong - */ -EXTERN_C void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + * RunDll_CallEntry16 [SHELL32.122] + * the name is OK (when written with Dll, and not DLL as in Wine!) + */ +void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) { #if !defined(__CYGWIN__) && !defined (__MINGW32__) && !defined(_MSC_VER) Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -67,20 +67,6 @@ extern INT WINAPI AddMRUData(HANDLE hList, LPCVOID lpData, DWORD cbData); extern INT WINAPI FindMRUData(HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum); extern INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize); - - -/* Get a function pointer from a DLL handle */ -#define GET_FUNC(func, funcType, module, name, fail) \ - do { \ - if (!func) { \ - if (!SHELL32_h##module && !(SHELL32_h##module = LoadLibraryA(#module ".dll"))) return fail; \ - func = (funcType)GetProcAddress(SHELL32_h##module, name); \ - if (!func) return fail; \ - } \ - } while (0) - -/* Function pointers for GET_FUNC macro */ -static HMODULE SHELL32_hshlwapi=NULL; /************************************************************************* @@ -1371,62 +1357,6 @@ } /************************************************************************* - * SHAllocShared [SHELL32.520] - * - * See shlwapi.SHAllocShared - */ -HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) -{ - typedef HANDLE (WINAPI *SHAllocSharedProc)(LPCVOID, DWORD, DWORD); - static SHAllocSharedProc pSHAllocShared; - - GET_FUNC(pSHAllocShared, SHAllocSharedProc, shlwapi, (char*)7, NULL); - return pSHAllocShared(lpvData, dwSize, dwProcId); -} - -/************************************************************************* - * SHLockShared [SHELL32.521] - * - * See shlwapi.SHLockShared - */ -LPVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) -{ - typedef HANDLE (WINAPI *SHLockSharedProc)(HANDLE, DWORD); - static SHLockSharedProc pSHLockShared; - - GET_FUNC(pSHLockShared, SHLockSharedProc, shlwapi, (char*)8, NULL); - return pSHLockShared(hShared, dwProcId); -} - -/************************************************************************* - * SHUnlockShared [SHELL32.522] - * - * See shlwapi.SHUnlockShared - */ -BOOL WINAPI SHUnlockShared(LPVOID lpView) -{ - typedef HANDLE (WINAPI *SHUnlockSharedProc)(LPCVOID); - static SHUnlockSharedProc pSHUnlockShared; - - GET_FUNC(pSHUnlockShared, SHUnlockSharedProc, shlwapi, (char*)9, FALSE); - return pSHUnlockShared(lpView) != NULL; -} - -/************************************************************************* - * SHFreeShared [SHELL32.523] - * - * See shlwapi.SHFreeShared - */ -BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) -{ - typedef HANDLE (WINAPI *SHFreeSharedProc)(HANDLE, DWORD); - static SHFreeSharedProc pSHFreeShared; - - GET_FUNC(pSHFreeShared, SHFreeSharedProc, shlwapi, (char*)10, FALSE); - return pSHFreeShared(hShared, dwProcId) != NULL; -} - -/************************************************************************* * SetAppStartingCursor [SHELL32.99] */ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v) @@ -2101,7 +2031,7 @@ /************************************************************************* * LinkWindow_UnregisterClass (SHELL32.259) */ -BOOL WINAPI LinkWindow_UnregisterClass(void) +BOOL WINAPI LinkWindow_UnregisterClass(DWORD dwUnused) { FIXME("()\n"); return TRUE; Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -90,16 +90,6 @@ } /************************************************************************* - * PathBuildRoot [SHELL32.30] - */ -LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive) -{ - if(SHELL_OsIsUnicode()) - return PathBuildRootW(lpszPath, drive); - return PathBuildRootA(lpszPath, drive); -} - -/************************************************************************* * PathGetExtensionA [internal] * * NOTES @@ -128,7 +118,7 @@ /************************************************************************* * SHPathGetExtension [SHELL32.158] */ -EXTERN_C LPVOID WINAPI SHPathGetExtensionW(LPCWSTR lpszPath, DWORD void1, DWORD void2) +LPVOID WINAPI SHPathGetExtensionW(LPCWSTR lpszPath, DWORD void1, DWORD void2) { return PathGetExtensionW(lpszPath); } @@ -257,16 +247,6 @@ if (SHELL_OsIsUnicode()) return PathFileExistsW (lpszPath); return PathFileExistsA (lpszPath); -} - -/************************************************************************* - * PathIsSameRoot [SHELL32.650] - */ -BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2) -{ - if (SHELL_OsIsUnicode()) - return PathIsSameRootW(lpszPath1, lpszPath2); - return PathIsSameRootA(lpszPath1, lpszPath2); } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/wine/shellreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellreg.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -146,7 +146,7 @@ /************************************************************************* * SHCreateSessionKey [SHELL32.723] */ -EXTERN_C HRESULT +HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey) { Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shl… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -821,7 +821,7 @@ * LPXXXXX pointer to struct containing a func addr at offset 8 * or NULL at failure. */ -EXTERN_C IContextMenu * WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, UINT w, UINT x) +IContextMenu * WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, UINT w, UINT x) { FIXME("hmenu=%p hwnd=%p 0x%08x 0x%08x stub\n", hMenu,hWndParent,w,x); Modified: trunk/reactos/dll/win32/shell32/wine/shpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shp… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shpolicy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shpolicy.c [iso-8859-1] Mon Mar 2 00:59:14 2015 @@ -815,7 +815,7 @@ * NOTES * Exported by ordinal. * This function caches the retrieved values to prevent unnecessary registry access, - * if SHInitRestricted() was previously called. + * if SHSettingsChanged() was previously called. * * REFERENCES * a: MS System Policy Editor. @@ -872,7 +872,7 @@ } /************************************************************************* - * SHInitRestricted [SHELL32.244] + * SHSettingsChanged [SHELL32.244] * * Initialise the policy cache to speed up calls to SHRestricted(). * @@ -888,7 +888,7 @@ * NOTES * Exported by ordinal. Introduced in Win98. */ -BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey) +BOOL WINAPI SHSettingsChanged(LPCVOID unused, LPCVOID inpRegKey) { TRACE("(%p, %p)\n", unused, inpRegKey);

1 0

[akhaldi] 66535: [README.WINE] Mark some DirectX modules as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: akhaldi Date: Sun Mar 1 22:51:48 2015 New Revision: 66535 URL: http://svn.reactos.org/svn/reactos?rev=66535&view=rev Log: [README.WINE] Mark some DirectX modules as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 1 22:51:48 2015 @@ -27,7 +27,7 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to Wine-1.7.27 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37 @@ -35,14 +35,14 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.37 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/dplay # Synced to WineStaging-1.7.37 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/dxdiagn # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37

1 0

[akhaldi] 66534: [QUARTZ] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: akhaldi Date: Sun Mar 1 22:48:56 2015 New Revision: 66534 URL: http://svn.reactos.org/svn/reactos?rev=66534&view=rev Log: [QUARTZ] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c trunk/reactos/dll/directx/wine/quartz/avidec.c trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/dsoundrender.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/main.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/dll/directx/wine/quartz/waveparser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ac… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -39,11 +39,6 @@ return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); } -static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); -} - static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { ACMWrapperImpl* This = impl_from_TransformFilter(tf); Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -32,11 +32,6 @@ static const IBaseFilterVtbl AVIDec_Vtbl; -static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); -} - static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -243,8 +243,7 @@ if (rtSampleStart != rtSampleStop) { - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) @@ -321,7 +320,7 @@ } rtstart = (double)(start - pin->pin.pin.tStart) / pin->pin.pin.dRate; rtstop = (double)(stop - pin->pin.pin.tStart) / pin->pin.pin.dRate; - hr = IMediaSample_SetMediaTime(sample, &start, &stop); + IMediaSample_SetMediaTime(sample, &start, &stop); IMediaSample_SetTime(sample, &rtstart, &rtstop); IMediaSample_SetMediaTime(sample, &start, &stop); @@ -1182,7 +1181,7 @@ indexes = 0; } } - else if (!indexes && pAviSplit->oldindex) + else if (pAviSplit->oldindex) indexes = pAviSplit->Parser.cStreams; if (!indexes && pAviSplit->AviHeader.dwFlags & AVIF_MUSTUSEINDEX) Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -28,7 +28,6 @@ static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; -static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; @@ -899,7 +898,7 @@ static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { DSoundRenderImpl *This = lpParam; - struct dsoundrender_timer head = {0}; + struct dsoundrender_timer head = {NULL}; MSG msg; TRACE("(%p): Main Loop\n", This); 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 Mar 1 22:48:56 2015 @@ -180,7 +180,6 @@ GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; - LONGLONG stop_position; LONG recursioncount; IUnknown *pSite; LONG version; @@ -1716,8 +1715,27 @@ IMoniker *pMoniker, IBindCtx *pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->(%p %p %s %p): stub !!!\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + HRESULT hr; + IBaseFilter* pfilter; + + TRACE("(%p/%p)->(%p %p %s %p)\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + + hr = IMoniker_BindToObject(pMoniker, pCtx, NULL, &IID_IBaseFilter, (void**)&pfilter); + if(FAILED(hr)) { + WARN("Unable to bind moniker to filter object (%x)\n", hr); + return hr; + } + + hr = IFilterGraph2_AddFilter(iface, pfilter, lpcwstrFilterName); + if (FAILED(hr)) { + WARN("Unable to add filter (%x)\n", hr); + IBaseFilter_Release(pfilter); + return hr; + } + + if(ppFilter) + *ppFilter = pfilter; + else IBaseFilter_Release(pfilter); return S_OK; } @@ -2409,52 +2427,6 @@ return hr; } -static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) -{ - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - HRESULT hr = S_OK; - - TRACE("(%p/%p)->(%p)\n", This, iface, pStop); - - if (!pStop) - return E_POINTER; - - EnterCriticalSection(&This->cs); - if (This->stop_position < 0) - /* Stop position not set, use duration instead */ - hr = IMediaSeeking_GetDuration(iface, pStop); - else - *pStop = This->stop_position; - LeaveCriticalSection(&This->cs); - - return hr; -} - -static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) -{ - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - LONGLONG time = 0; - - if (!pCurrent) - return E_POINTER; - - EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock && This->start_time >= 0) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time -= This->start_time; - } - if (This->pause_time > 0) - time += This->pause_time; - *pCurrent = time; - LeaveCriticalSection(&This->cs); - - TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - - return S_OK; -} - static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat) { @@ -2495,11 +2467,6 @@ if ((dwCurrentFlags & 0x7) != AM_SEEKING_AbsolutePositioning && (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); - - if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) - This->stop_position = *pStop; - else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) - FIXME("Stop position not handled yet!\n"); if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) IMediaControl_Pause(&This->IMediaControl_iface); @@ -2518,16 +2485,68 @@ return hr; } +static HRESULT WINAPI found_getposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) +{ + struct pos_args *args = (void*)pargs; + + return IMediaSeeking_GetPositions(seek, args->current, args->stop); +} + static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, LONGLONG *pStop) { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); + struct pos_args args; + LONGLONG time = 0; HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); - hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); - if (SUCCEEDED(hr)) - hr = IMediaSeeking_GetStopPosition(iface, pStop); + + args.current = pCurrent; + args.stop = pStop; + EnterCriticalSection(&This->cs); + hr = all_renderers_seek(This, found_getposition, (DWORD_PTR)&args); + if (This->state == State_Running && This->refClock && This->start_time >= 0) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time -= This->start_time; + } + if (This->pause_time > 0) + time += This->pause_time; + *pCurrent += time; + LeaveCriticalSection(&This->cs); + + return hr; +} + +static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) +{ + LONGLONG time; + HRESULT hr; + + if (!pCurrent) + return E_POINTER; + + hr = MediaSeeking_GetPositions(iface, pCurrent, &time); + + TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); + + return hr; +} + +static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) +{ + IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); + LONGLONG time; + HRESULT hr; + + TRACE("(%p/%p)->(%p)\n", This, iface, pStop); + + if (!pStop) + return E_POINTER; + + hr = MediaSeeking_GetPositions(iface, &time, pStop); return hr; } @@ -5641,7 +5660,6 @@ fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->pause_time = 0; - fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; fimpl->version = 0; Modified: trunk/reactos/dll/directx/wine/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -268,11 +268,10 @@ const char * qzdebugstr_guid( const GUID * id ) { int i; - char * name = NULL; - - for (i=0;InterfaceDesc[i].name && !name;i++) { + + for (i=0; InterfaceDesc[i].name; i++) if (IsEqualGUID(&InterfaceDesc[i].riid, id)) return InterfaceDesc[i].name; - } + return debugstr_guid(id); } 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 Mar 1 22:48:56 2015 @@ -79,7 +79,6 @@ } static const WCHAR wszAudioStream[] = {'A','u','d','i','o',0}; -static const WCHAR wszVideoStream[] = {'V','i','d','e','o',0}; static const DWORD freqs[10] = { 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0 }; @@ -692,8 +691,7 @@ if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -66,7 +66,6 @@ hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info ); @@ -260,7 +259,7 @@ props.cbAlign = 1; props.cbPrefix = 0; - if (SUCCEEDED(hr) && (This->fnQueryAccept(This->pUserData, pmt) != S_OK)) + if (This->fnQueryAccept(This->pUserData, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ 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 Mar 1 22:48:56 2015 @@ -457,14 +457,12 @@ static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) { struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)\n", This); - if (!pVMR9->mode && SUCCEEDED(hr)) - hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed); - - if (SUCCEEDED(hr)) + if (pVMR9->mode || + SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) hr = VMR9_maybe_init(pVMR9, FALSE); return hr; Modified: trunk/reactos/dll/directx/wine/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/wa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] Sun Mar 1 22:48:56 2015 @@ -101,7 +101,7 @@ if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; @@ -274,7 +274,7 @@ amt.cbFormat = chunk.cb; amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); + IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); amt.subtype = MEDIATYPE_Audio; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; @@ -360,7 +360,7 @@ if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; 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 Mar 1 22:48:56 2015 @@ -46,7 +46,7 @@ reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/quartz # Synced to Wine-1.7.27 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37 reactos/dll/win32/activeds # Synced to Wine-1.7.27

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 March 2015