Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 66441: [NETAPI32] Implement the client side of NetWkstaSetInfo and NetWkstaUserEnum.
by ekohl＠svn.reactos.org 24 Feb '15

24 Feb '15

Author: ekohl Date: Tue Feb 24 22:15:58 2015 New Revision: 66441 URL: http://svn.reactos.org/svn/reactos?rev=66441&view=rev Log: [NETAPI32] Implement the client side of NetWkstaSetInfo and NetWkstaUserEnum. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -254,10 +254,10 @@ @ stub NetValidatePasswordPolicy @ stub NetValidatePasswordPolicyFree @ stdcall NetWkstaGetInfo(wstr long ptr) -@ stub NetWkstaSetInfo +@ stdcall NetWkstaSetInfo(wstr long ptr ptr) @ stub NetWkstaTransportAdd @ stub NetWkstaTransportDel -@ stdcall NetWkstaTransportEnum (wstr long ptr long ptr ptr ptr) +@ stdcall NetWkstaTransportEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) @ stub NetWkstaUserSetInfo Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -417,6 +417,7 @@ /************************************************************ * NetWkstaUserEnum (NETAPI32.@) */ +#if 0 NET_API_STATUS WINAPI NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, @@ -426,6 +427,7 @@ level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); return ERROR_INVALID_PARAMETER; } +#endif /************************************************************ * NetpGetComputerName (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -171,7 +171,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( - LMSTR servername, + LPWSTR servername, DWORD level, LPBYTE *bufptr) { @@ -194,4 +194,102 @@ return status; } + +NET_API_STATUS +WINAPI +NetWkstaSetInfo( + LPWSTR servername, + DWORD level, + LPBYTE buffer, + LPDWORD parm_err) +{ + NET_API_STATUS status; + + RpcTryExcept + { + status = NetrWkstaSetInfo(servername, + level, + (LPWKSTA_INFO)buffer, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaUserEnum( + LMSTR servername, + DWORD level, + LPBYTE *bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + LPDWORD resumehandle) +{ + WKSTA_USER_ENUM_STRUCT UserEnumInfo; + WKSTA_USER_INFO_0_CONTAINER Level0; + WKSTA_USER_INFO_1_CONTAINER Level1; + NET_API_STATUS status; + + TRACE("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + + UserEnumInfo.Level = level; + switch (level) + { + case 0: + UserEnumInfo.WkstaUserInfo.Level0 = &Level0; + UserEnumInfo.WkstaUserInfo.Level0->EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level0->Buffer = NULL; + break; + + case 1: + UserEnumInfo.WkstaUserInfo.Level1 = &Level1; + UserEnumInfo.WkstaUserInfo.Level1->EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level1->Buffer = NULL; + break; + + default: + return ERROR_INVALID_PARAMETER; + } + + RpcTryExcept + { + status = NetrWkstaUserEnum(servername, + &UserEnumInfo, + prefmaxlen, + totalentries, + resumehandle); + if (status == NERR_Success || status == ERROR_MORE_DATA) + { + switch (level) + { + case 0: + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level0->Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level0->EntriesRead; + break; + + case 1: + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level1->Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level1->EntriesRead; + break; + } + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + /* EOF */

1 0

[tfaber] 66440: [COM_APITEST] - Add IID_ITranslateShellChangeNotify, the answer to CORE-8844 - found by David - Fix some non-constant offsets - Re-alphabetize the lists
by tfaber＠svn.reactos.org 24 Feb '15

24 Feb '15

Author: tfaber Date: Tue Feb 24 12:52:18 2015 New Revision: 66440 URL: http://svn.reactos.org/svn/reactos?rev=66440&view=rev Log: [COM_APITEST] - Add IID_ITranslateShellChangeNotify, the answer to CORE-8844 - found by David - Fix some non-constant offsets - Re-alphabetize the lists Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -53,6 +53,7 @@ { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellService }, + { 0x8, &IID_ITranslateShellChangeNotify }, } }, { @@ -64,6 +65,7 @@ { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellFolder2 }, { 0x8, &IID_IShellService }, + { 0xc, &IID_ITranslateShellChangeNotify }, { 0x10, &IID_IDropTarget }, } }, @@ -76,6 +78,13 @@ { 0x8, &IID_IEnumString }, { 0xc, &IID_IAccessible }, { 0xc, &IID_IDispatch }, + } + }, + { + ID_NAME(CLSID_BackgroundTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, } }, { @@ -204,6 +213,16 @@ } }, { + ID_NAME(CLSID_ProgressDialog), + { + { 0x0, &IID_IProgressDialog }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IOleWindow }, + { 0x10, &IID_IObjectWithSite }, + }, + L"Both" + }, + { ID_NAME(CLSID_RebarBandSite), { { 0x0, &IID_IUnknown }, @@ -240,6 +259,13 @@ } }, { + ID_NAME(CLSID_SharedTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, + } + }, + { ID_NAME(CLSID_ShellSearchExt), { { 0x0, &IID_IContextMenu }, @@ -247,30 +273,6 @@ { 0x4, &IID_IObjectWithSite }, } }, - { - ID_NAME(CLSID_ProgressDialog), - { - { 0x0, &IID_IProgressDialog }, - { 0x0, &IID_IUnknown }, - { 0x4, &IID_IOleWindow }, - { 0x10, &IID_IObjectWithSite }, - }, - L"Both" - }, - { - ID_NAME(CLSID_SharedTaskScheduler), - { - { 0x0, &IID_IShellTaskScheduler }, - { 0x0, &IID_IUnknown }, - } - }, - { - ID_NAME(CLSID_BackgroundTaskScheduler), - { - { 0x0, &IID_IShellTaskScheduler }, - { 0x0, &IID_IUnknown }, - } - } }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -105,6 +105,8 @@ { ID_NAME(IID_IExtractImage2) }, { ID_NAME(IID_IFileDialog) }, { ID_NAME(IID_IFileDialog2), TRUE }, + { ID_NAME(IID_IFileOpenDialog) }, + { ID_NAME(IID_IFileSaveDialog) }, { ID_NAME(IID_IFileSearchBand) }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, @@ -199,6 +201,7 @@ { ID_NAME(IID_IShellMenuCallback), TRUE }, { ID_NAME(IID_IShellNameSpace) }, { ID_NAME(IID_IShellService), TRUE }, + { ID_NAME(IID_IShellTaskScheduler), TRUE }, { ID_NAME(IID_IShellView) }, { ID_NAME(IID_IShellView2) }, { ID_NAME(IID_IShellView3) }, @@ -213,6 +216,7 @@ { ID_NAME(IID_ITaskbarList) }, { ID_NAME(IID_ITaskbarList2) }, { ID_NAME(IID_ITrackShellMenu), TRUE }, + { ID_NAME(IID_ITranslateShellChangeNotify), TRUE }, { ID_NAME(IID_ITrayPriv), TRUE }, { ID_NAME(IID_ITrayPriv2), TRUE }, { ID_NAME(IID_IUnknown) }, @@ -235,7 +239,6 @@ { ID_NAME(IID_FolderItems3) }, { ID_NAME(IID_FolderItemVerb) }, { ID_NAME(IID_FolderItemVerbs) }, - { ID_NAME(IID_IShellTaskScheduler) }, { ID_NAME(CLSID_ShellDesktop), TRUE } }; Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -127,6 +127,7 @@ DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); +DEFINE_GUID(IID_ITranslateShellChangeNotify,0xb4df2675, 0xba23, 0x11d2, 0xb5, 0xee, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0, 0xcf, 0x00, 0xaa, 0x00, 0x60, 0x0a, 0xb8); DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -19,8 +19,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0xbc, &IID_IShellFolder2 }, - { 0xbc, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -229,6 +229,7 @@ { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellService }, + { 0x8, &IID_ITranslateShellChangeNotify }, { 0xc, &IID_IPersistFolder2 }, { 0xc, &IID_IPersistFolder }, { 0xc, &IID_IPersist }, @@ -254,8 +255,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0x64, &IID_IShellFolder2 }, - { 0x64, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -266,13 +267,12 @@ { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, - { 0x70, &IID_IShellIcon }, - { 0x78, &IID_IPersistFolder3 }, - { 0x78, &IID_IPersistFolder2 }, - { 0x7c, &IID_IStorage }, - { 0x8c, &IID_IContextMenuCB }, - { 0x94, &IID_IOleCommandTarget }, - + { FARAWY, &IID_IShellIcon }, + { FARAWY, &IID_IPersistFolder3 }, + { FARAWY, &IID_IPersistFolder2 }, + { FARAWY, &IID_IStorage }, + { FARAWY, &IID_IContextMenuCB }, + { FARAWY, &IID_IOleCommandTarget }, } }, { @@ -283,8 +283,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0xcc, &IID_IShellFolder2 }, - { 0xcc, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -410,6 +410,7 @@ { 0x8, &IID_IPersist }, { 0xc, &IID_IShellIcon }, { 0x14, &IID_IContextMenuCB }, + { 0x18, &IID_ITranslateShellChangeNotify }, { 0x20, &IID_IOleCommandTarget }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder },

1 0

[cwittich] 66439: [PSDK] add missing members to DISK_PERFORMANCE struct
by cwittich＠svn.reactos.org 24 Feb '15

24 Feb '15

Author: cwittich Date: Tue Feb 24 11:04:02 2015 New Revision: 66439 URL: http://svn.reactos.org/svn/reactos?rev=66439&view=rev Log: [PSDK] add missing members to DISK_PERFORMANCE struct Modified: trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Tue Feb 24 11:04:02 2015 @@ -367,9 +367,14 @@ LARGE_INTEGER BytesWritten; LARGE_INTEGER ReadTime; LARGE_INTEGER WriteTime; + LARGE_INTEGER IdleTime; DWORD ReadCount; DWORD WriteCount; DWORD QueueDepth; + DWORD SplitCount; + LARGE_INTEGER QueryTime; + DWORD StorageDeviceNumber; + WCHAR StorageManagerName[8]; } DISK_PERFORMANCE, *PDISK_PERFORMANCE; typedef struct _DISK_RECORD { LARGE_INTEGER ByteOffset;

1 0

[cwittich] 66438: [PSDK] fix NOTIFYICONDATA definition
by cwittich＠svn.reactos.org 24 Feb '15

24 Feb '15

Author: cwittich Date: Tue Feb 24 10:21:10 2015 New Revision: 66438 URL: http://svn.reactos.org/svn/reactos?rev=66438&view=rev Log: [PSDK] fix NOTIFYICONDATA definition Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Tue Feb 24 10:21:10 2015 @@ -203,7 +203,10 @@ UINT uFlags; UINT uCallbackMessage; HICON hIcon; -#if _WIN32_IE >= 0x0500 +#if (NTDDI_VERSION < NTDDI_WIN2K) + CHAR szTip[64]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN2K) CHAR szTip[128]; DWORD dwState; DWORD dwStateMask; @@ -217,8 +220,11 @@ #else CHAR szTip[64]; #endif -#if _WIN32_IE >= 0x600 +#if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) + HICON hBalloonIcon; #endif } NOTIFYICONDATAA,*PNOTIFYICONDATAA; @@ -229,7 +235,10 @@ UINT uFlags; UINT uCallbackMessage; HICON hIcon; -#if _WIN32_IE >= 0x0500 +#if (NTDDI_VERSION < NTDDI_WIN2K) + CHAR szTip[64]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN2K) WCHAR szTip[128]; DWORD dwState; DWORD dwStateMask; @@ -243,8 +252,11 @@ #else WCHAR szTip[64]; #endif -#if _WIN32_IE >= 0x600 +#if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW;

1 0

[dreimer] 66437: [NEWDEV] German update by GonzoMD Some tidy up in the *seemslikebuttonsthrownintoaguieditor* coordinates
by dreimer＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: dreimer Date: Mon Feb 23 23:14:51 2015 New Revision: 66437 URL: http://svn.reactos.org/svn/reactos?rev=66437&view=rev Log: [NEWDEV] German update by GonzoMD Some tidy up in the *seemslikebuttonsthrownintoaguieditor* coordinates Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/en-US.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/he-IL.rc trunk/reactos/dll/win32/newdev/lang/hu-HU.rc trunk/reactos/dll/win32/newdev/lang/id-ID.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/nl-NL.rc trunk/reactos/dll/win32/newdev/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/pl-PL.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/sq-AL.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/newdev/lang/tr-TR.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… Modified: trunk/reactos/dll/win32/newdev/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/en-U… Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… Modified: trunk/reactos/dll/win32/newdev/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I… Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H… Modified: trunk/reactos/dll/win32/newdev/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/id-I… Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N… Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N… Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S… Modified: trunk/reactos/dll/win32/newdev/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sq-A… Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… Modified: trunk/reactos/dll/win32/newdev/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/tr-T… Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U…

1 0

[ekohl] 66436: [NETAPI32] CORE-9248 Comment out NetGetJoinInformation and NetWkstaGetInfo in wksta.c and reimplement them as RPC client functions to the workstation service in wksta_new.c.
by ekohl＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: ekohl Date: Mon Feb 23 22:55:43 2015 New Revision: 66436 URL: http://svn.reactos.org/svn/reactos?rev=66436&view=rev Log: [NETAPI32] CORE-9248 Comment out NetGetJoinInformation and NetWkstaGetInfo in wksta.c and reimplement them as RPC client functions to the workstation service in wksta_new.c. Added: trunk/reactos/dll/win32/netapi32/wksta_new.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -1,8 +1,11 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/include/reactos/wine) + add_definitions(-D__WINESRC__) - spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) list(APPEND SOURCE access.c @@ -20,7 +23,9 @@ share.c user.c wksta.c - netapi32.h) + wksta_new.c + netapi32.h + ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) add_library(netapi32 SHARED ${SOURCE} @@ -28,8 +33,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) set_module_type(netapi32 win32dll) -target_link_libraries(netapi32 wine) -add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) +target_link_libraries(netapi32 wine ${PSEH_LIB}) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_delay_importlibs(netapi32 samlib secur32) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -464,6 +464,7 @@ return ERROR_INVALID_PARAMETER; } +#if 0 NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { @@ -566,4 +567,4 @@ return NERR_Success; } - +#endif Added: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c (added) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -0,0 +1,197 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/wksta_new.c + * PURPOSE: Workstation service interface code + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" +#include "wkssvc_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +handle_t __RPC_USER +WKSSVC_IDENTIFY_HANDLE_bind(WKSSVC_IDENTIFY_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("WKSSVC_IDENTIFY_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszSystemName, + L"\\pipe\\wkssvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +WKSSVC_IDENTIFY_HANDLE_unbind(WKSSVC_IDENTIFY_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("WKSSVC_IDENTIFY_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +WKSSVC_IMPERSONATE_HANDLE_bind(WKSSVC_IMPERSONATE_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("WKSSVC_IMPERSONATE_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszSystemName, + L"\\pipe\\wkssvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +WKSSVC_IMPERSONATE_HANDLE_unbind(WKSSVC_IMPERSONATE_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("WKSSVC_IMPERSONATE_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NET_API_STATUS +NET_API_FUNCTION +NetGetJoinInformation( + LPCWSTR Server, + LPWSTR *Name, + PNETSETUP_JOIN_STATUS type) +{ + NET_API_STATUS status; + + FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + + if (Name == NULL || type == NULL) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrGetJoinInformation((LPWSTR)Server, + Name, + type); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaGetInfo( + LMSTR servername, + DWORD level, + LPBYTE *bufptr) +{ + NET_API_STATUS status; + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrWkstaGetInfo(servername, + level, + (LPWKSTA_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/wksta_new.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 66435: [DINPUT] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: akhaldi Date: Mon Feb 23 20:20:45 2015 New Revision: 66435 URL: http://svn.reactos.org/svn/reactos?rev=66435&view=rev Log: [DINPUT] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/joystick.c trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/wine/dinput/keyboard.c trunk/reactos/dll/directx/wine/dinput/mouse.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -60,10 +60,6 @@ return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); } -static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) -{ - return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface); -} static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); Modified: trunk/reactos/dll/directx/wine/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -398,16 +398,38 @@ return JoystickWGenericImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); } +#define DEBUG_TYPE(x) case (x): str = #x; break void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { + int type = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); + const char *str; TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); - TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : - lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? "DIDEVTYPE_JOYSTICK" : - lpDIDevCaps->dwDevType == DIDEVTYPE_HID ? "DIDEVTYPE_HID" : "UNKNOWN"); + switch(type) + { + /* Directx <= 7 definitions */ + DEBUG_TYPE(DIDEVTYPE_DEVICE); + DEBUG_TYPE(DIDEVTYPE_MOUSE); + DEBUG_TYPE(DIDEVTYPE_KEYBOARD); + DEBUG_TYPE(DIDEVTYPE_JOYSTICK); + DEBUG_TYPE(DIDEVTYPE_HID); + /* Directx >= 8 definitions */ + DEBUG_TYPE(DI8DEVTYPE_DEVICE); + DEBUG_TYPE(DI8DEVTYPE_MOUSE); + DEBUG_TYPE(DI8DEVTYPE_KEYBOARD); + DEBUG_TYPE(DI8DEVTYPE_JOYSTICK); + DEBUG_TYPE(DI8DEVTYPE_GAMEPAD); + DEBUG_TYPE(DI8DEVTYPE_DRIVING); + DEBUG_TYPE(DI8DEVTYPE_FLIGHT); + DEBUG_TYPE(DI8DEVTYPE_1STPERSON); + DEBUG_TYPE(DI8DEVTYPE_DEVICECTRL); + DEBUG_TYPE(DI8DEVTYPE_SCREENPOINTER); + DEBUG_TYPE(DI8DEVTYPE_REMOTE); + DEBUG_TYPE(DI8DEVTYPE_SUPPLEMENTAL); + default: str = "UNKNOWN"; + } + + TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, str); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: %d\n", lpDIDevCaps->dwPOVs); @@ -419,6 +441,7 @@ TRACE("dwFFDriverVersion: %d\n", lpDIDevCaps->dwFFDriverVersion); } } +#undef DEBUG_TYPE HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -87,10 +87,7 @@ return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; @@ -149,6 +146,9 @@ WARN("ioctl(%s,JSIOCGAXES) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.axis_count = 2; } +#else + WARN("reading number of joystick axes unsupported in this platform, defaulting to 2\n"); + joydev.axis_count = 2; #endif #ifdef JSIOCGBUTTONS if (ioctl(fd, JSIOCGBUTTONS, &joydev.button_count) < 0) @@ -156,6 +156,9 @@ WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.button_count = 2; } +#else + WARN("reading number of joystick buttons unsupported in this platform, defaulting to 2\n"); + joydev.button_count = 2; #endif if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -124,10 +124,7 @@ return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; Modified: trunk/reactos/dll/directx/wine/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ke… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -318,6 +318,10 @@ if (len != This->base.data_format.user_df->dwDataSize ) return DIERR_INVALIDPARAM; + +#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); +#endif EnterCriticalSection(&This->base.crit); Modified: trunk/reactos/dll/directx/wine/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/mo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -66,10 +66,7 @@ { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This) -{ - return &This->base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) { return &This->base.IDirectInputDevice8W_iface; @@ -536,6 +533,10 @@ if(This->base.acquired == 0) return DIERR_NOTACQUIRED; +#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); +#endif + TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); _dump_mouse_state(&This->m_state); 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] Mon Feb 23 20:20:45 2015 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 +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/dmusic # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.27

1 0

[akhaldi] 66434: [D3DXOF] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: akhaldi Date: Mon Feb 23 19:47:46 2015 New Revision: 66434 URL: http://svn.reactos.org/svn/reactos?rev=66434&view=rev Log: [D3DXOF] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] Mon Feb 23 19:47:46 2015 @@ -28,7 +28,6 @@ static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj); 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] Mon Feb 23 19:47:46 2015 @@ -33,7 +33,7 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27 -reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27

1 0

[tfaber] 66433: [NTDLL:LDR] - Apply OffsetModuleName to the first import entry, not the current one in LdrpUpdateLoadCount3. Fixes missing reference updates on dependency-loaded DLLs. CORE-5125 COR...
by tfaber＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: tfaber Date: Mon Feb 23 19:03:08 2015 New Revision: 66433 URL: http://svn.reactos.org/svn/reactos?rev=66433&view=rev Log: [NTDLL:LDR] - Apply OffsetModuleName to the first import entry, not the current one in LdrpUpdateLoadCount3. Fixes missing reference updates on dependency-loaded DLLs. CORE-5125 CORE-7127 #resolve Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Feb 23 19:03:08 2015 @@ -223,6 +223,7 @@ OUT PUNICODE_STRING UpdateString) { PIMAGE_BOUND_FORWARDER_REF NewImportForwarder; + PIMAGE_BOUND_IMPORT_DESCRIPTOR FirstEntry; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry; PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_THUNK_DATA FirstThunk; @@ -256,12 +257,12 @@ ImportNameUnic = &NtCurrentTeb()->StaticUnicodeString; /* Try to get the new import entry */ - BoundEntry = (PIMAGE_BOUND_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(LdrEntry->DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, - &ImportSize); - - if (BoundEntry) + FirstEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, + &ImportSize); + + if (FirstEntry) { /* Set entry flags if refing/derefing */ if (Flags == LDRP_UPDATE_REFCOUNT) @@ -269,10 +270,11 @@ else if (Flags == LDRP_UPDATE_DEREFCOUNT) LdrEntry->Flags |= LDRP_UNLOAD_IN_PROGRESS; + BoundEntry = FirstEntry; while (BoundEntry->OffsetModuleName) { /* Get pointer to the current import name */ - ImportName = (PCHAR)BoundEntry + BoundEntry->OffsetModuleName; + ImportName = (LPSTR)FirstEntry + BoundEntry->OffsetModuleName; RtlInitAnsiString(&ImportNameAnsi, ImportName); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); @@ -315,9 +317,9 @@ /* Go through forwarders */ NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); - for (i=0; i<BoundEntry->NumberOfModuleForwarderRefs; i++) - { - ImportName = (PCHAR)BoundEntry + NewImportForwarder->OffsetModuleName; + for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++) + { + ImportName = (LPSTR)FirstEntry + NewImportForwarder->OffsetModuleName; RtlInitAnsiString(&ImportNameAnsi, ImportName); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE);

1 0

[akhaldi] 66432: [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: akhaldi Date: Mon Feb 23 19:01:22 2015 New Revision: 66432 URL: http://svn.reactos.org/svn/reactos?rev=66432&view=rev Log: [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stdcall -stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -35,6 +35,10 @@ #include <d3dx9.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + /*********************************************************************** * DllMain. */ @@ -62,3 +66,17 @@ else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}

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