Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39344: - Add more stubs - Fix return value for PathIsTemporaryW

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Feb 3 13:41:15 2009 New Revision: 39344 URL: http://svn.reactos.org/svn/reactos?rev=39344&view=rev Log: - Add more stubs - Fix return value for PathIsTemporaryW Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/stubs.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] Tue Feb 3 13:41:15 2009 @@ -77,7 +77,7 @@ 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 -80 stub SHOpenPropSheetW +80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) 81 stdcall OpenAs_RunDLLA(long long str long) 82 stub -noname DDECreatePostNotify 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) @@ -361,7 +361,7 @@ 361 stdcall ShellExecuteExA (long) 362 stdcall ShellExecuteExW (long) 363 stdcall ShellExecuteW(long wstr wstr wstr wstr long) -364 stub ShellHookProc +364 stdcall ShellHookProc(long ptr ptr) 365 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA 366 stdcall Shell_NotifyIconA(long ptr) 367 stdcall Shell_NotifyIconW(long ptr) @@ -385,29 +385,29 @@ 385 stdcall StrRChrIA(str str long) shlwapi.StrRChrIA 386 stdcall StrRChrIW(str str long) shlwapi.StrRChrIW 387 stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW -388 stub StrRStrA +388 stdcall StrRStrA(str str str) 389 stdcall StrRStrIA(str str str) shlwapi.StrRStrIA 390 stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -391 stub StrRStrW +391 stdcall StrRStrW(wstr wstr wstr) 392 stdcall StrStrA(str str) shlwapi.StrStrA 393 stdcall StrStrIA(str str) shlwapi.StrStrIA 394 stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW 395 stdcall StrStrW(wstr wstr) shlwapi.StrStrW -396 stub WOWShellExecute +396 stdcall WOWShellExecute(ptr wstr wstr wstr wstr long ptr) 520 stdcall SHAllocShared(ptr long long) 521 stdcall SHLockShared(long long) 522 stdcall SHUnlockShared(ptr) 523 stdcall SHFreeShared(long long) 524 stdcall RealDriveType(long long) -525 stub -noname RealDriveTypeFlags +525 stdcall -noname RealDriveTypeFlags(long long) 526 stdcall SHFlushSFCache() 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) 641 stdcall -noname NTSHChangeNotifyDeregister(long) -643 stub -noname SHChangeNotifyReceive # Fixme +643 stdcall -noname SHChangeNotifyReceive(long long ptr ptr) 644 stdcall SHChangeNotification_Lock(long long ptr ptr) 645 stdcall SHChangeNotification_Unlock(long) -646 stub -noname SHChangeRegistrationReceive # Fixme -648 stub -noname SHWaitOp_Operate +646 stdcall -noname SHChangeRegistrationReceive(ptr long) +648 stdcall -noname SHWaitOp_Operate(ptr long) 650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW # Fixme 651 stdcall -noname OldReadCabinetState(long long) ReadCabinetState 652 stdcall WriteCabinetState(long) @@ -415,7 +415,7 @@ 654 stdcall ReadCabinetState(long long) 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() -681 stub -noname SHGetAppCompatFlags +681 stdcall -noname SHGetAppCompatFlags(long) shlwapi.SHGetAppCompatFlags 683 stub -noname SHStgOpenStorageW 684 stub -noname SHStgOpenStorageA 685 stub SHPropStgCreate @@ -423,35 +423,35 @@ 689 stub SHPropStgWriteMultiple 690 stub -noname SHIsLegacyAnsiProperty 691 stub -noname SHFileSysBindToStorage -700 stub CDefFolderMenu_Create +700 stdcall CDefFolderMenu_Create(ptr ptr long ptr ptr ptr ptr ptr ptr) 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) -702 stub -noname CDefFolderMenu_MergeMenu -703 stub -noname GUIDFromStringA # Fixme -704 stdcall -noname GUIDFromStringW(wstr ptr) # Fixme -707 stub -noname SHOpenPropSheetA # Fixme -708 stub -noname SHGetSetFolderCustomSettingsA -709 stub SHGetSetFolderCustomSettingsW -711 stub -noname CheckWinIniForAssocs -712 stub -noname SHCopyMonikerToTemp # Fixme -713 stub -noname PathIsTemporaryA +702 stdcall -noname CDefFolderMenu_MergeMenu(ptr long long ptr) +703 stdcall -noname GUIDFromStringA(str ptr) +704 stdcall -noname GUIDFromStringW(wstr ptr) +707 stdcall -noname SHOpenPropSheetA(str ptr long ptr ptr ptr str) +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) +713 stdcall -noname PathIsTemporaryA(str) 714 stdcall -noname PathIsTemporaryW(wstr) -715 stub -noname SHCreatePropertyBag # Fixme -716 stub SHMultiFileProperties -719 stub -noname SHParseDarwinIDFromCacheW -720 stub -noname MakeShellURLFromPathA -721 stub -noname MakeShellURLFromPathW +715 stdcall -noname SHCreatePropertyBag(ptr ptr) +716 stdcall SHMultiFileProperties(ptr long) +719 stdcall -noname SHParseDarwinIDFromCacheW(wstr wstr) +720 stdcall -noname MakeShellURLFromPathA(str str long) +721 stdcall -noname MakeShellURLFromPathW(wstr wstr long) 722 stub -noname SHCreateInstance -723 stub -noname SHCreateSessionKey -724 stub -noname SHIsTempDisplayMode -725 stub -noname GetFileDescriptor -726 stub -noname CopyStreamUI +723 stdcall -noname SHCreateSessionKey(long ptr) +724 stdcall -noname SHIsTempDisplayMode() +725 stdcall -noname GetFileDescriptor(ptr long long wstr) +726 stdcall -noname CopyStreamUI(ptr ptr ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall RestartDialogEx(long wstr long long) 731 stub -noname SHRegisterDarwinLink -732 stub -noname SHReValidateDarwinCache -733 stub -noname CheckDiskSpace +732 stdcall -noname SHReValidateDarwinCache() +733 stdcall -noname CheckDiskSpace() 740 stub -noname SHCreateFileDataObject -743 stub SHCreateFileExtractIconW +743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) 744 stub -noname Create_IEnumUICommand 745 stub -noname Create_IUIElement 747 stdcall SHLimitInputEdit(ptr ptr) @@ -462,7 +462,7 @@ 752 stub -noname SHGetComputerDisplayNameW 753 stub -noname CheckStagingArea 754 stub -noname SHLimitInputEditWithFlags -755 stub -noname PathIsEqualOrSubFolder +755 stdcall -noname PathIsEqualOrSubFolder(wstr wstr) 756 stub -noname DeleteFileThumbnail # Functions exported by the WinVista shell32.dll Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Feb 3 13:41:15 2009 @@ -1563,6 +1563,15 @@ } /************************************************************************* + * GUIDFromStringA [SHELL32.703] + */ +BOOL WINAPI GUIDFromStringA(LPCSTR str, LPGUID guid) +{ + TRACE("GUIDFromStringA() stub\n"); + return FALSE; +} + +/************************************************************************* * GUIDFromStringW [SHELL32.704] */ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) @@ -1576,10 +1585,19 @@ /************************************************************************* * PathIsTemporaryW [SHELL32.714] */ -DWORD WINAPI PathIsTemporaryW(LPWSTR Str) +BOOL WINAPI PathIsTemporaryW(LPWSTR Str) { FIXME("(%s)stub\n", debugstr_w(Str)); - return 0; + return FALSE; +} + +/************************************************************************* + * PathIsTemporaryA [SHELL32.713] + */ +BOOL WINAPI PathIsTemporaryA(LPSTR Str) +{ + FIXME("(%s)stub\n", debugstr_a(Str)); + return FALSE; } typedef struct _PSXA Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Tue Feb 3 13:41:15 2009 @@ -105,3 +105,358 @@ FIXME("SHLimitInputCombo() stub\n"); return FALSE; } + +/* + * Unimplemented + */ +BOOL +WINAPI +PathIsEqualOrSubFolder(LPWSTR lpFolder, LPWSTR lpSubFolder) +{ + FIXME("PathIsEqualOrSubFolder() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHCreateFileExtractIconW(LPCWSTR pszPath, + DWORD dwFileAttributes, + LPVOID lpUnknown1, + LPVOID lpUnknown2) +{ + FIXME("SHCreateFileExtractIconW() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +VOID +WINAPI +CheckDiskSpace(VOID) +{ + FIXME("CheckDiskSpace() stub\n"); +} + +/* + * Unimplemented + */ +VOID +WINAPI +SHReValidateDarwinCache(VOID) +{ + FIXME("SHReValidateDarwinCache() stub\n"); +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +CopyStreamUI(IStream *pSrc, IStream *pDst, IProgressDialog *pProgDlg) +{ + FIXME("CopyStreamUI() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +FILEDESCRIPTOR* +WINAPI +GetFileDescriptor(FILEGROUPDESCRIPTOR *pFileGroupDesc, BOOL bUnicode, INT iIndex, LPWSTR lpName) +{ + FIXME("GetFileDescriptor() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHIsTempDisplayMode(VOID) +{ + FIXME("SHIsTempDisplayMode() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +LONG +WINAPI +SHCreateSessionKey(REGSAM regSam, PHKEY phKey) +{ + FIXME("SHCreateSessionKey() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +MakeShellURLFromPathW(LPCWSTR lpPath, LPWSTR lpUrl, INT cchMax) +{ + FIXME("MakeShellURLFromPathW() stub\n"); + lpUrl = NULL; + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +MakeShellURLFromPathA(LPCSTR lpPath, LPSTR lpUrl, INT cchMax) +{ + FIXME("MakeShellURLFromPathA() stub\n"); + lpUrl = NULL; + return FALSE; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHParseDarwinIDFromCacheW(LPCWSTR lpUnknown1, LPWSTR lpUnknown2) +{ + FIXME("SHParseDarwinIDFromCacheW() stub\n"); + lpUnknown2 = NULL; + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHMultiFileProperties(IDataObject *pDataObject, DWORD dwFlags) +{ + FIXME("SHMultiFileProperties() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHCreatePropertyBag(REFIID refIId, LPVOID *lpUnknown) +{ + /* Call SHCreatePropertyBagOnMemory() from shlwapi.dll */ + FIXME("SHCreatePropertyBag() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHCopyMonikerToTemp(IMoniker *pMoniker, LPCWSTR lpInput, LPWSTR lpOutput, INT cchMax) +{ + /* Unimplemented in XP SP3 */ + TRACE("SHCopyMonikerToTemp() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HLOCAL +WINAPI +CheckWinIniForAssocs(VOID) +{ + FIXME("CheckWinIniForAssocs() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHGetSetFolderCustomSettingsW(LPSHFOLDERCUSTOMSETTINGSW pfcs, + LPCWSTR pszPath, + DWORD dwReadWrite) +{ + FIXME("SHGetSetFolderCustomSettingsW() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHGetSetFolderCustomSettingsA(LPSHFOLDERCUSTOMSETTINGSA pfcs, + LPCSTR pszPath, + DWORD dwReadWrite) +{ + FIXME("SHGetSetFolderCustomSettingsA() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHOpenPropSheetA(LPSTR lpCaption, + HKEY hKeys[], + UINT uCount, + CLSID *pClsID, + IDataObject *pDataObject, + IShellBrowser *pShellBrowser, + LPSTR lpStartPage) +{ + FIXME("SHOpenPropSheetA() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHOpenPropSheetW(LPWSTR lpCaption, + HKEY hKeys[], + UINT uCount, + CLSID *pClsID, + IDataObject *pDataObject, + IShellBrowser *pShellBrowser, + LPWSTR lpStartPage) +{ + FIXME("SHOpenPropSheetW() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +VOID +WINAPI +CDefFolderMenu_MergeMenu(HINSTANCE hInstance, + UINT uMainMerge, + UINT uPopupMerge, + LPQCMINFO lpQcmInfo) +{ + FIXME("CDefFolderMenu_MergeMenu() stub\n"); +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +CDefFolderMenu_Create(PCIDLIST_ABSOLUTE pidlFolder, + HWND hwnd, + UINT uidl, + PCUITEMID_CHILD_ARRAY *apidl, + IShellFolder *psf, + LPFNDFMCALLBACK lpfn, + HKEY hProgID, + HKEY hBaseProgID, + IContextMenu **ppcm) +{ + FIXME("CDefFolderMenu_Create() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) +{ + FIXME("SHChangeRegistrationReceive() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +VOID +WINAPI +SHWaitOp_Operate(LPVOID lpUnknown1, DWORD dwUnknown2) +{ + FIXME("SHWaitOp_Operate() stub\n"); +} + +/* + * Unimplemented + */ +VOID +WINAPI +SHChangeNotifyReceive(LONG lUnknown, UINT uUnknown, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + FIXME("SHChangeNotifyReceive() stub\n"); +} + +/* + * Unimplemented + */ +INT +WINAPI +RealDriveTypeFlags(INT iDrive, BOOL bUnknown) +{ + FIXME("RealDriveTypeFlags() stub\n"); + return 1; +} + +/* + * Unimplemented + */ +HINSTANCE +WINAPI +WOWShellExecute(HWND hwnd, + LPCWSTR lpOperation, + LPCWSTR lpFile, + LPCWSTR lpParameters, + LPCWSTR lpDirectory, + INT nShowCmd, + void *lpfnCBWinExec) +{ + FIXME("WOWShellExecute() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +LPWSTR +WINAPI +StrRStrW(LPWSTR lpSrc, LPWSTR lpLast, LPWSTR lpSearch) +{ + FIXME("StrRStrW() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +LPWSTR +WINAPI +StrRStrA(LPSTR lpSrc, LPSTR lpLast, LPSTR lpSearch) +{ + FIXME("StrRStrA() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +LONG +WINAPI +ShellHookProc(INT iCode, WPARAM wParam, LPARAM lParam) +{ + /* Unimplemented in WinXP SP3 */ + return 0; +}

16 years, 5 months

[gschneider] 39343: Delete old XLateObj before creating a new one, fixes a mem leak when installing .Net 2.0 Framework

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Feb 3 13:37:18 2009 New Revision: 39343 URL: http://svn.reactos.org/svn/reactos?rev=39343&view=rev Log: Delete old XLateObj before creating a new one, fixes a mem leak when installing .Net 2.0 Framework Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Tue Feb 3 13:37:18 2009 @@ -539,7 +539,10 @@ // Create the XLATEOBJ for device managed DCs if(dc->DC_Type != DC_TYPE_MEMORY) { - // Device managed DC + if (palGDI->logicalToSystem != NULL) + { + EngDeleteXlate(palGDI->logicalToSystem); + } palGDI->logicalToSystem = IntEngCreateXlate(sysMode, palMode, systemPalette, dc->DcLevel.hpal); }

16 years, 5 months

[tkreuzer] 39342: Fix broken and overcomplicated pointer arithmetic

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 13:26:00 2009 New Revision: 39342 URL: http://svn.reactos.org/svn/reactos?rev=39342&view=rev Log: Fix broken and overcomplicated pointer arithmetic Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksuser/ksuser.c Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Tue Feb 3 13:26:00 2009 @@ -153,7 +153,7 @@ PHANDLE ConnectionHandle) { ULONG BufferSize = sizeof(KSPIN_CONNECT); - PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) ); + PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)(Connect + 1); if (DataFormat->Flags & KSDATAFORMAT_ATTRIBUTES) {

16 years, 5 months

[gbrunmar] 39341: D3D9: * Fixed compilation error * Implemented IDirect3DBaseTexture9's and IDirect3DTexture9's GetAutoGenFilterType(), GetLOD() and GetLevelCount()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Tue Feb 3 12:55:20 2009 New Revision: 39341 URL: http://svn.reactos.org/svn/reactos?rev=39341&view=rev Log: D3D9: * Fixed compilation error * Implemented IDirect3DBaseTexture9's and IDirect3DTexture9's GetAutoGenFilterType(), GetLOD() and GetLevelCount() Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c trunk/reactos/dll/directx/d3d9/d3d9_resource.h trunk/reactos/dll/directx/d3d9/d3d9_texture.c trunk/reactos/dll/directx/d3d9/d3d9_texture.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -6,7 +6,6 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -#define _WIN32_WINNT 0x0502 #include "d3d9_common.h" #include <d3d9.h> #include <ddraw.h> Modified: trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -7,6 +7,8 @@ */ #ifndef _D3D9_BASETEXTURE_H_ #define _D3D9_BASETEXTURE_H_ + +#include "d3d9_resource.h" // Work-around for: // "warning: 'FilterType' is narrower than values of its type" @@ -31,9 +33,10 @@ /* 0x005a */ D3DTEXTUREFILTERTYPE FilterType : 8; struct { -/* 0x005a */ DWORD dwFilterType : 8; -/* 0x005b */ BOOL bIsAutoGenMipMap : 8; -/* 0x005c */ DWORD MipMapLevels2 : 16; +/* 0x005a */ DWORD dwFilterType : 8; +/* 0x005b */ BOOL bIsAutoGenMipMap : 8; +/* 0x005c */ DWORD MipMapLevels2 : 8; +/* 0x005d */ DWORD MaxLOD : 8; }; }; /* 0x005e */ WORD wPaletteIndex; Modified: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -7,6 +7,7 @@ */ #include "d3d9_mipmap.h" #include "debug.h" +#include "d3d9_texture.h" #include "d3d9_device.h" #include "d3d9_helpers.h" #include <d3d9.h> @@ -54,7 +55,7 @@ return D3D9BaseObject_Release(&This->BaseTexture.BaseResource.BaseObject); } -/* IDirect3DBaseTexture9 */ +/* IDirect3DResource9 */ /*++ * @name IDirect3DTexture9::GetDevice @@ -74,7 +75,8 @@ * If ppDevice is a bad pointer the return value will be D3DERR_INVALIDCALL. * If the texture didn't contain any device, the return value will be D3DERR_INVALIDDEVICE. * -*/HRESULT WINAPI D3D9MipMap_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) +*/ +HRESULT WINAPI D3D9MipMap_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) { LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); LOCK_D3DDEVICE9(); @@ -132,6 +134,7 @@ UNIMPLEMENTED } +/* IDirect3DBaseTexture9 */ D3DRESOURCETYPE WINAPI D3D9MipMap_GetType(LPDIRECT3DTEXTURE9 iface) { UNIMPLEMENTED @@ -144,16 +147,44 @@ return 0; } +/*++ +* @name IDirect3DTexture9::GetLOD +* @implemented +* +* The function D3D9MipMap_GetLOD returns the number +* max LODs for the specified texture, if it's managed. +* +* @param LPDIRECT3DTEXTURE9 iface +* Pointer to a IDirect3DTexture9 object returned from IDirect3D9Device::CreateTexture(). +* +* @return DWORD +* Returns the number of LODs in the specified texture if it's managed. +* +*/ DWORD WINAPI D3D9MipMap_GetLOD(LPDIRECT3DTEXTURE9 iface) { - UNIMPLEMENTED - return 0; -} - + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + return D3D9Texture_GetLOD( (IDirect3DBaseTexture9*)&This->BaseTexture.lpVtbl ); +} + +/*++ +* @name IDirect3DTexture9::GetLevelCount +* @implemented +* +* The function D3D9MipMap_GetLevelCount returns the number of mip map levels +* in the specified texture. +* +* @param LPDIRECT3DTEXTURE9 iface +* Pointer to a IDirect3DTexture9 object returned from IDirect3D9Device::CreateTexture(). +* +* @return DWORD +* Returns the number of levels in the specified texture. +* +*/ DWORD WINAPI D3D9MipMap_GetLevelCount(LPDIRECT3DTEXTURE9 iface) { - UNIMPLEMENTED - return 0; + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + return D3D9Texture_GetLevelCount( (IDirect3DBaseTexture9*)&This->BaseTexture.lpVtbl ); } HRESULT WINAPI D3D9MipMap_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) @@ -162,10 +193,24 @@ return D3D_OK; } +/*++ +* @name IDirect3DTexture9::GetAutoGenFilterType +* @implemented +* +* The function D3D9MipMap_GetAutoGenFilterType returns filter type +* that is used when automated mipmaping is set. +* +* @param LPDIRECT3DTEXTURE9 iface +* Pointer to a IDirect3DTexture9 object returned from IDirect3D9Device::CreateTexture(). +* +* @return D3DTEXTUREFILTERTYPE +* Filter type used when automated mipmaping is set for the specified texture. +* +*/ D3DTEXTUREFILTERTYPE WINAPI D3D9MipMap_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) { - UNIMPLEMENTED - return D3DRTYPE_TEXTURE; + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + return D3D9Texture_GetAutoGenFilterType( (IDirect3DBaseTexture9*)&This->BaseTexture.lpVtbl ); } void WINAPI D3D9MipMap_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) @@ -220,6 +265,8 @@ D3D9MipMap_SetPriority, D3D9MipMap_GetPriority, D3D9MipMap_PreLoad, + + /* IDirect3DBaseTexture9 methods */ D3D9MipMap_GetType, D3D9MipMap_SetLOD, D3D9MipMap_GetLOD, Modified: trunk/reactos/dll/directx/d3d9/d3d9_resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_reso… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -13,12 +13,12 @@ typedef struct _Direct3DResource9_INT { /* 0x0000 */ D3D9BaseObject BaseObject; -/* 0x0020 */ DWORD dwUnknown20; +/* 0x0020 */ BOOL bIsManaged; /* 0x0024 */ DWORD dwUnknown24; /* 0x0028 */ DWORD dwUnknown28; /* 0x002c */ DWORD dwUnknown2c; -/* 0x0030 */ DWORD dwUnknown30; -/* 0x0034 */ DWORD dwUnknown34; +/* 0x0030 */ DWORD dwPriority; +/* 0x0034 */ BOOL bIsDirty; /* 0x0038 */ D3DPOOL Pool; /* 0x003c */ LPDWORD dwUnknown3c; /* 0x0040 */ LPDWORD dwUnknown40; Modified: trunk/reactos/dll/directx/d3d9/d3d9_texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.c [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -6,6 +6,18 @@ * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> */ #include "d3d9_texture.h" + +#define LOCK_D3DDEVICE9() D3D9BaseObject_LockDevice(&This->BaseResource.BaseObject) +#define UNLOCK_D3DDEVICE9() D3D9BaseObject_UnlockDevice(&This->BaseResource.BaseObject) + +/* Convert a IDirect3DBaseTexture9 pointer safely to the internal implementation struct */ +Direct3DBaseTexture9_INT* IDirect3DBaseTexture9ToImpl(LPDIRECT3DBASETEXTURE9 iface) +{ + if (NULL == iface) + return NULL; + + return (Direct3DBaseTexture9_INT*)((ULONG_PTR)iface - FIELD_OFFSET(Direct3DBaseTexture9_INT, lpVtbl)); +} void InitDirect3DBaseTexture9(Direct3DBaseTexture9_INT* pBaseTexture, IDirect3DBaseTexture9Vtbl* pVtbl, @@ -22,9 +34,88 @@ pBaseTexture->Format = Format; pBaseTexture->wPaletteIndex = 0xFFFF; pBaseTexture->Usage = Usage; - pBaseTexture->MipMapLevels = - pBaseTexture->MipMapLevels2 = (WORD)Levels; + pBaseTexture->MipMapLevels = Levels; + pBaseTexture->MipMapLevels2 = Levels; pBaseTexture->FilterType = D3DTEXF_LINEAR; pBaseTexture->bIsAutoGenMipMap = (Usage & D3DUSAGE_AUTOGENMIPMAP) != 0; } + +/*++ +* @name IDirect3DBaseTexture9::GetAutoGenFilterType +* @implemented +* +* The function D3D9Texture_GetAutoGenFilterType returns filter type +* that is used when automated mipmaping is set. +* +* @param LPDIRECT3DBASETEXTURE9 iface +* Pointer to a IDirect3DBaseTexture9 interface +* +* @return D3DTEXTUREFILTERTYPE +* Filter type used when automated mipmaping is set for the specified texture. +* +*/ +D3DTEXTUREFILTERTYPE WINAPI D3D9Texture_GetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface) +{ + D3DTEXTUREFILTERTYPE FilterType; + Direct3DBaseTexture9_INT* This = IDirect3DBaseTexture9ToImpl(iface); + LOCK_D3DDEVICE9(); + + FilterType = This->dwFilterType; + + UNLOCK_D3DDEVICE9(); + return FilterType; +} + +/*++ +* @name IDirect3DBaseTexture9::GetLOD +* @implemented +* +* The function D3D9Texture_GetLOD returns the number +* max LODs for the specified texture, if it's managed. +* +* @param LPDIRECT3DBASETEXTURE9 iface +* Pointer to a IDirect3DBaseTexture9 interface +* +* @return DWORD +* Returns the number of LODs in the specified texture if it's managed. +* +*/ +DWORD WINAPI D3D9Texture_GetLOD(LPDIRECT3DBASETEXTURE9 iface) +{ + DWORD MaxLOD = 0; + Direct3DBaseTexture9_INT* This = IDirect3DBaseTexture9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (This->BaseResource.bIsManaged) + MaxLOD = This->MaxLOD; + + UNLOCK_D3DDEVICE9(); + return MaxLOD; +} + +/*++ +* @name IDirect3DBaseTexture9::GetLevelCount +* @implemented +* +* The function D3D9Texture_GetLevelCount returns the number of mip map levels +* in the specified texture. +* +* @param LPDIRECT3DBASETEXTURE9 iface +* Pointer to a IDirect3DBaseTexture9 interface +* +* @return DWORD +* Returns the number of levels in the specified texture. +* +*/ +DWORD WINAPI D3D9Texture_GetLevelCount(LPDIRECT3DBASETEXTURE9 iface) +{ + DWORD MipMapLevels; + Direct3DBaseTexture9_INT* This = IDirect3DBaseTexture9ToImpl(iface); + LOCK_D3DDEVICE9(); + + MipMapLevels = This->MipMapLevels; + + UNLOCK_D3DDEVICE9(); + return MipMapLevels; +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_texture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] Tue Feb 3 12:55:20 2009 @@ -22,4 +22,9 @@ struct _Direct3DDevice9_INT* pDevice, enum REF_TYPE RefType); + +D3DTEXTUREFILTERTYPE WINAPI D3D9Texture_GetAutoGenFilterType(struct IDirect3DBaseTexture9* iface); +DWORD WINAPI D3D9Texture_GetLOD(struct IDirect3DBaseTexture9* iface); +DWORD WINAPI D3D9Texture_GetLevelCount(struct IDirect3DBaseTexture9* iface); + #endif // _D3D9_TEXTURE_H_

16 years, 5 months

[cfinck] 39340: Revert 39295 on request of hpoussin

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 11:27:10 2009 New Revision: 39340 URL: http://svn.reactos.org/svn/reactos?rev=39340&view=rev Log: Revert 39295 on request of hpoussin Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Tue Feb 3 11:27:10 2009 @@ -175,9 +175,6 @@ SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; - UNICODE_STRING VariableName; - UNICODE_STRING VariableValue; - WCHAR AppDataPath[MAX_PATH]; /* Loading personal settings */ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); @@ -221,18 +218,6 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - - /* Use SHGetFolderPathW for getting the AppData path */ - if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL) - { - WARN("WL: SHGetFolderPathW() failed\n"); - goto cleanup; - } - - /* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */ - RtlInitUnicodeString(&VariableName, L"APPDATA"); - RtlInitUnicodeString(&VariableValue, AppDataPath); - RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue); if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) { @@ -278,8 +263,6 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); - - /* FIXME: Set the "Volatile Environment" key for the new user */ /* Set default language */ if (!SetDefaultLanguage(TRUE)) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Tue Feb 3 11:27:10 2009 @@ -39,7 +39,6 @@ #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> -#include <shlobj.h> #include <reactos/winlogon.h> Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Tue Feb 3 11:27:10 2009 @@ -9,7 +9,6 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> - <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file>

16 years, 5 months

[janderwald] 39339: - fix bug 4126 by Mario Kacmar

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 3 10:55:54 2009 New Revision: 39339 URL: http://svn.reactos.org/svn/reactos?rev=39339&view=rev Log: - fix bug 4126 by Mario Kacmar Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -52,7 +52,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -73,7 +73,7 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 60, LBS_NOTIFY - LTEXT "D&NS-Serveraddressen in Verwendungsreihenfolge", -1, 5, 5, 180, 12 + LTEXT "D&NS-Serveradressen in Verwendungsreihenfolge", -1, 5, 5, 180, 12 PUSHBUTTON "Aufwärts", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Abwärts", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Hinzufügen...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP @@ -91,7 +91,7 @@ PUSHBUTTON "Entfernen", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP LTEXT "DNS-Suffix für diese Verbindung:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "Addressen dieser Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Adressen dieser Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "DNS-Suffix dieser Verbindung in DNS-Registrierung verwenden", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -48,22 +48,22 @@ IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "IP Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 +CAPTION "IP nastavenia" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Adresy IP", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Prida...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Upravi...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Odstráni", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP - GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 + GROUPBOX "Predvolené brány:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 PUSHBUTTON "Prida...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Upravi...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Odstráni", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Interface metric:", -1, 15, 215, 90, 12 + LTEXT "Metrika rozhrania:", -1, 15, 215, 90, 12 // Interface metric EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -52,7 +52,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Tue Feb 3 10:55:54 2009 @@ -51,7 +51,7 @@ CAPTION "IP Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP addresses", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP

16 years, 5 months

[tkreuzer] 39338: deconstify target in interlocked intrinsics

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 10:48:50 2009 New Revision: 39338 URL: http://svn.reactos.org/svn/reactos?rev=39338&view=rev Log: deconstify target in interlocked intrinsics Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Tue Feb 3 10:48:50 2009 @@ -97,27 +97,27 @@ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * Destination, const char Exchange, const char Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * Destination, const short Exchange, const short Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) +static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * Destination, const long Exchange, const long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * const Exchange, void * const Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * Target, const long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -125,7 +125,7 @@ } #if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedExchange64(volatile long long * const Target, const long long Value) +static __inline__ __attribute__((always_inline)) long long _InterlockedExchange64(volatile long long * Target, const long long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -133,80 +133,80 @@ } #endif -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * Target, void * const Value) { /* NOTE: ditto */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * Addend, const short Value) { return __sync_fetch_and_add(Addend, Value); } -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * Addend, const long Value) { return __sync_fetch_and_add(Addend, Value); } #if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value) +static __inline__ __attribute__((always_inline)) long long _InterlockedExchangeAdd64(volatile long long * Addend, const long long Value) { return __sync_fetch_and_add(Addend, Value); } #endif -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * value, const char mask) { return __sync_fetch_and_and(value, mask); } -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * value, const short mask) { return __sync_fetch_and_and(value, mask); } -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * value, const long mask) { return __sync_fetch_and_and(value, mask); } #if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long _InterlockedAnd64(volatile long long * const value, const long long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedAnd64(volatile long long * value, const long long mask) { return __sync_fetch_and_and(value, mask); } #endif -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * value, const char mask) { return __sync_fetch_and_or(value, mask); } -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * value, const short mask) { return __sync_fetch_and_or(value, mask); } -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * value, const long mask) { return __sync_fetch_and_or(value, mask); } #if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long _InterlockedOr64(volatile long long * const value, const long long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedOr64(volatile long long * value, const long long mask) { return __sync_fetch_and_or(value, mask); } #endif -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * value, const char mask) { return __sync_fetch_and_xor(value, mask); } -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * value, const short mask) { return __sync_fetch_and_xor(value, mask); } @@ -218,63 +218,63 @@ #else -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * Destination, const char Exchange, const char Comperand) { char retval = Comperand; __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * Destination, const short Exchange, const short Comperand) { short retval = Comperand; __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) +static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * Destination, const long Exchange, const long Comperand) { long retval = Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * const Exchange, void * const Comperand) { void * retval = (void *)Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * Target, const long Value) { long retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * Target, void * const Value) { void * retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * Addend, const short Value) { long retval = Value; __asm__("lock; xaddw %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * Addend, const long Value) { long retval = Value; __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * value, const char mask) { char x; char y; @@ -291,7 +291,7 @@ return y; } -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * value, const short mask) { short x; short y; @@ -308,7 +308,7 @@ return y; } -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * value, const long mask) { long x; long y; @@ -325,7 +325,7 @@ return y; } -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * value, const char mask) { char x; char y; @@ -342,7 +342,7 @@ return y; } -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * value, const short mask) { short x; short y; @@ -359,7 +359,7 @@ return y; } -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * value, const long mask) { long x; long y; @@ -376,7 +376,7 @@ return y; } -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) +static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * value, const char mask) { char x; char y; @@ -393,7 +393,7 @@ return y; } -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * value, const short mask) { short x; short y; @@ -410,7 +410,7 @@ return y; } -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) +static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * value, const long mask) { long x; long y; @@ -431,14 +431,14 @@ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * Destination, const long long Exchange, const long long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } #else -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * Destination, const long long Exchange, const long long Comperand) { long long retval = Comperand; @@ -457,7 +457,7 @@ #endif -static __inline__ __attribute__((always_inline)) long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value) +static __inline__ __attribute__((always_inline)) long _InterlockedAddLargeStatistic(volatile long long * Addend, const long Value) { __asm__ ( @@ -473,33 +473,33 @@ return Value; } -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) +static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, -1) - 1; } -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) +static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, 1) + 1; } -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * const lpAddend) +static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, -1) - 1; } -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * const lpAddend) +static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } #if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedDecrement64(volatile long long * const lpAddend) +static __inline__ __attribute__((always_inline)) long long _InterlockedDecrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, -1) - 1; } -static __inline__ __attribute__((always_inline)) long long _InterlockedIncrement64(volatile long long * const lpAddend) +static __inline__ __attribute__((always_inline)) long long _InterlockedIncrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, 1) + 1; }

16 years, 5 months

[gschneider] 39337: Testcase extension by Evgeny Boltik <BSTSoft AT narod DOT ru>: - Test StretchBlt ROP codes similar to BitBlt - Offset drawing coordinates with SetWindowOrgEx - Show an overview of several hatched brushes - This was used to test r39336, r39332 and r39326 and the src&dst StretchBlt ROP support

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Feb 3 10:11:31 2009 New Revision: 39337 URL: http://svn.reactos.org/svn/reactos?rev=39337&view=rev Log: Testcase extension by Evgeny Boltik <BSTSoft AT narod DOT ru>: - Test StretchBlt ROP codes similar to BitBlt - Offset drawing coordinates with SetWindowOrgEx - Show an overview of several hatched brushes - This was used to test r39336, r39332 and r39326 and the src&dst StretchBlt ROP support Modified: trunk/rostests/dibtests/bltrop/bltrop.c Modified: trunk/rostests/dibtests/bltrop/bltrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/bltrop.c?… ============================================================================== --- trunk/rostests/dibtests/bltrop/bltrop.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/bltrop/bltrop.c [iso-8859-1] Tue Feb 3 10:11:31 2009 @@ -39,7 +39,40 @@ /* fill destination with brush */ brush = CreateHatchBrush(HS_DIAGCROSS, RGB(255,0,0)); SelectObject(hdc, brush); - PatBlt(hdc, 0, 0, 4*bitmap.bmWidth, 4*bitmap.bmHeight, PATCOPY); + PatBlt(hdc, 30, 0, 4*bitmap.bmWidth*2, 4*bitmap.bmHeight, PATCOPY); + + /* hatched brushes */ + INT l = 66; + brush = CreateHatchBrush(HS_DIAGCROSS, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 0, 30, l, PATCOPY); + DeleteObject(brush); + + brush = CreateHatchBrush(HS_CROSS, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 1*l, 30, l, PATCOPY); + DeleteObject(brush); + + brush = CreateHatchBrush(HS_FDIAGONAL, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 2*l, 30, l, PATCOPY); + DeleteObject(brush); + + brush = CreateHatchBrush(HS_BDIAGONAL, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 3*l, 30, l, PATCOPY); + DeleteObject(brush); + + brush = CreateHatchBrush(HS_VERTICAL, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 4*l, 30, l, PATCOPY); + DeleteObject(brush); + + brush = CreateHatchBrush(HS_HORIZONTAL, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 5*l, 30, l, PATCOPY); + DeleteObject(brush); + /* set up a second brush */ brush2 = CreateHatchBrush(HS_VERTICAL, RGB(127,127,127)); @@ -47,27 +80,51 @@ SelectObject(hdc, brush2); SetBkColor(hdc, RGB(0, 255, 0)); - /* 15 blt op's */ + /* 15 blt op's with bitblt */ SelectObject(hdcMem, hBmpTest); - BitBlt(hdc, 0, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCCOPY); - BitBlt(hdc, 100, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, DSTINVERT); - BitBlt(hdc, 200, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGECOPY); - BitBlt(hdc, 300, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGEPAINT); - - BitBlt(hdc, 0, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCCOPY); - BitBlt(hdc, 100, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCERASE); - BitBlt(hdc, 200, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATCOPY); - BitBlt(hdc, 300, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATINVERT); - - BitBlt(hdc, 0, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATPAINT); - BitBlt(hdc, 100, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCAND); - BitBlt(hdc, 200, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCERASE); - BitBlt(hdc, 300, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCINVERT); - - BitBlt(hdc, 0, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, BLACKNESS); - BitBlt(hdc, 100, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCPAINT); - BitBlt(hdc, 200, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, WHITENESS); - + /* offset coordinates */ + SetWindowOrgEx(hdc, -10, -10, NULL); + BitBlt(hdc, 30, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCCOPY); + BitBlt(hdc, 130, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, DSTINVERT); + BitBlt(hdc, 230, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGECOPY); + BitBlt(hdc, 330, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGEPAINT); + + BitBlt(hdc, 30, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCCOPY); + BitBlt(hdc, 130, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCERASE); + BitBlt(hdc, 230, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATCOPY); + BitBlt(hdc, 330, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATINVERT); + + BitBlt(hdc, 30, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATPAINT); + BitBlt(hdc, 130, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCAND); + BitBlt(hdc, 230, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCERASE); + BitBlt(hdc, 330, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCINVERT); + + BitBlt(hdc, 30, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, BLACKNESS); + BitBlt(hdc, 130, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCPAINT); + BitBlt(hdc, 230, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, WHITENESS); + + /* 15 blt op's with stretchblt */ + StretchBlt(hdc, 30+400, 0, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCCOPY); + StretchBlt(hdc, 130+400, 0, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, DSTINVERT); + StretchBlt(hdc, 230+400, 0, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, MERGECOPY); + StretchBlt(hdc, 330+400, 0, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, MERGEPAINT); + + StretchBlt(hdc, 30+400, 100, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, NOTSRCCOPY); + StretchBlt(hdc, 130+400, 100, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, NOTSRCERASE); + StretchBlt(hdc, 230+400, 100, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, PATCOPY); + StretchBlt(hdc, 330+400, 100, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, PATINVERT); + + StretchBlt(hdc, 30+400, 200, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, PATPAINT); + StretchBlt(hdc, 130+400, 200, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCAND); + StretchBlt(hdc, 230+400, 200, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCERASE); + StretchBlt(hdc, 330+400, 200, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCINVERT); + + StretchBlt(hdc, 30+400, 300, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, BLACKNESS); + StretchBlt(hdc, 130+400, 300, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCPAINT); + StretchBlt(hdc, 230+400, 300, bitmap.bmWidth/2, bitmap.bmHeight/2, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, WHITENESS); + + DeleteObject(brush); + DeleteObject(brush2); DeleteDC(hdcMem); EndPaint(hWnd, &ps); break; @@ -119,7 +176,7 @@ WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 440, + 840, 440, NULL, NULL,

16 years, 5 months

[gschneider] 39336: Offset the source and destination rectangles as pointed out in bug #4107. Remove respective FIXME.

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Feb 3 09:58:46 2009 New Revision: 39336 URL: http://svn.reactos.org/svn/reactos?rev=39336&view=rev Log: Offset the source and destination rectangles as pointed out in bug #4107. Remove respective FIXME. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue Feb 3 09:58:46 2009 @@ -805,7 +805,6 @@ IntGdiSelectBrush(DCDest,Dc_Attr->hbrush); /* Offset the destination and source by the origin of their DCs. */ - // FIXME: ptlDCOrig is in device coordinates! XOriginDest += DCDest->ptlDCOrig.x; YOriginDest += DCDest->ptlDCOrig.y; if (UsesSource) @@ -818,11 +817,16 @@ DestRect.top = YOriginDest; DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; + IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; SourceRect.right = XOriginSrc+WidthSrc; SourceRect.bottom = YOriginSrc+HeightSrc; + if (UsesSource) + { + IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); + } /* Determine surfaces to be used in the bitblt */ BitmapDest = SURFACE_LockSurface(DCDest->w.hBitmap);

16 years, 5 months

[tkreuzer] 39335: fix prototype of RtlAllocateHeap

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 09:43:51 2009 New Revision: 39335 URL: http://svn.reactos.org/svn/reactos?rev=39335&view=rev Log: fix prototype of RtlAllocateHeap Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Tue Feb 3 09:43:51 2009 @@ -58,7 +58,7 @@ RtlAllocateHeap ( HANDLE Heap, ULONG Flags, - ULONG Size + SIZE_T Size ); NTSYSAPI

16 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs