Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[pborobia] 23820: * update dc.c
by pborobia＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: pborobia Date: Thu Aug 31 00:36:12 2006 New Revision: 23820 URL: http://svn.reactos.org/svn/reactos?rev=23820&view=rev Log: * update dc.c Modified: branches/clipboard/subsystems/win32/win32k/objects/dc.c Modified: branches/clipboard/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/objects/dc.c (original) +++ branches/clipboard/subsystems/win32/win32k/objects/dc.c Thu Aug 31 00:36:12 2006 @@ -2974,14 +2974,44 @@ return Ret; } + DWORD STDCALL NtGdiGetLayout(HDC hdc) { - return 0; -} + PDC dc; + DWORD ret = GDI_ERROR; + + if ((dc = DC_LockDc(hdc))) + { + ret = dc->layout; + DC_UnlockDc(dc); + } + else + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + } + + return ret; +} + DWORD STDCALL NtGdiSetLayout(HDC hdc, LONG wox, DWORD layout) { - return 0; -} + PDC dc; + DWORD ret = GDI_ERROR; + + if ((dc = DC_LockDc(hdc))) + { + ret = dc->layout; + dc->layout = layout; + DC_UnlockDc(dc); + } + else + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + } + + return ret; +} + /* EOF */

1 0

[pborobia] 23819: * more win32k clipboard stuff * GetLayout win32k stubs
by pborobia＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: pborobia Date: Thu Aug 31 00:32:36 2006 New Revision: 23819 URL: http://svn.reactos.org/svn/reactos?rev=23819&view=rev Log: * more win32k clipboard stuff * GetLayout win32k stubs Modified: branches/clipboard/subsystems/win32/win32k/include/clipboard.h branches/clipboard/subsystems/win32/win32k/include/dc.h branches/clipboard/subsystems/win32/win32k/include/winsta.h branches/clipboard/subsystems/win32/win32k/objects/dc.c Modified: branches/clipboard/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/include/clipboard.h (original) +++ branches/clipboard/subsystems/win32/win32k/include/clipboard.h Thu Aug 31 00:32:36 2006 @@ -1,7 +1,48 @@ #ifndef _WIN32K_CLIPBOARD_H #define _WIN32K_CLIPBOARD_H +#include "window.h" + +VOID FASTCALL IntIncrementSecuenceNumber(VOID); + +typedef struct _ClipboardChainElement +{ + PWINDOW_OBJECT window; + struct _ClipboardChainElement *next; +} CLIPBOARDCHAINELEMENT, *PCLIPBOARDCHAINELEMENT; + +typedef struct _ClipboardElement +{ + UINT format; + HANDLE hData; + DWORD size; // data may be delayed o synth render + struct _ClipboardElement *next; +} CLIPBOARDELEMENT, *PCLIPBOARDELEMENT; + +typedef struct _CLIPBOARDSYSTEM +{ + PW32THREAD ClipboardThread; + PW32THREAD ClipboardOwnerThread; + PWINDOW_OBJECT ClipboardWindow; + PWINDOW_OBJECT ClipboardViewerWindow; + PWINDOW_OBJECT ClipboardOwnerWindow; + BOOL sendDrawClipboardMsg; + BOOL recentlySetClipboard; + BOOL delayedRender; + UINT lastEnumClipboardFormats; + DWORD ClipboardSequenceNumber; + + PCLIPBOARDCHAINELEMENT WindowsChain; + PCLIPBOARDELEMENT ClipboardData; + + PCHAR synthesizedData; + DWORD synthesizedDataSize; + +} CLIPBOARDSYSTEM, *PCLIPBOARDSYSTEM; + +/* UINT FASTCALL IntEnumClipboardFormats(UINT format); +*/ #endif /* _WIN32K_CLIPBOARD_H */ Modified: branches/clipboard/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/include/dc.h (original) +++ branches/clipboard/subsystems/win32/win32k/include/dc.h Thu Aug 31 00:32:36 2006 @@ -115,6 +115,8 @@ XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; + DWORD layout; + INT saveLevel; BOOL IsIC; Modified: branches/clipboard/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/include/winsta.h (original) +++ branches/clipboard/subsystems/win32/win32k/include/winsta.h Thu Aug 31 00:32:36 2006 @@ -2,6 +2,7 @@ #define _WIN32K_WINSTA_H #include "msgqueue.h" +#include "clipboard.h" #define WINSTA_ROOT_NAME L"\\Windows\\WindowStations" #define WINSTA_ROOT_NAME_LENGTH 23 @@ -45,7 +46,10 @@ ULONG Flags; struct _DESKTOP_OBJECT* ActiveDesktop; - /* FIXME: Clipboard */ + + PCLIPBOARDSYSTEM Clipboard; + DWORD ClipboardSequenceNumber; + } WINSTATION_OBJECT, *PWINSTATION_OBJECT; extern WINSTATION_OBJECT *InputWindowStation; Modified: branches/clipboard/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/objects/dc.c (original) +++ branches/clipboard/subsystems/win32/win32k/objects/dc.c Thu Aug 31 00:32:36 2006 @@ -2974,5 +2974,14 @@ return Ret; } - +DWORD STDCALL +NtGdiGetLayout(HDC hdc) +{ + return 0; +} +DWORD STDCALL +NtGdiSetLayout(HDC hdc, LONG wox, DWORD layout) +{ + return 0; +} /* EOF */

1 0

[gedmurphy] 23818: update comctl32 winetest
by gedmurphy＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: gedmurphy Date: Thu Aug 31 00:28:33 2006 New Revision: 23818 URL: http://svn.reactos.org/svn/reactos?rev=23818&view=rev Log: update comctl32 winetest Modified: trunk/reactos/regtests/winetests/comctl32/comboex.c trunk/reactos/regtests/winetests/comctl32/header.c trunk/reactos/regtests/winetests/comctl32/listview.c Modified: trunk/reactos/regtests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/comctl3… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/comboex.c (original) +++ trunk/reactos/regtests/winetests/comctl32/comboex.c Thu Aug 31 00:28:33 2006 @@ -72,12 +72,14 @@ HWND myHwnd = 0; LONG res = -1; COMBOBOXEXITEM cbexItem; - -#define FIRST_ITEM "First Item" -#define SECOND_ITEM "Second Item" -#define THIRD_ITEM "Third Item" -#define MIDDLE_ITEM "Between First and Second Items" -#define REPLACEMENT_ITEM "Between First and Second Items" + static TCHAR first_item[] = {'F','i','r','s','t',' ','I','t','e','m',0}, + second_item[] = {'S','e','c','o','n','d',' ','I','t','e','m',0}, + third_item[] = {'T','h','i','r','d',' ','I','t','e','m',0}, + middle_item[] = {'B','e','t','w','e','e','n',' ','F','i','r','s','t',' ','a','n','d',' ', + 'S','e','c','o','n','d',' ','I','t','e','m','s',0}, + replacement_item[] = {'B','e','t','w','e','e','n',' ','F','i','r','s','t',' ','a','n','d',' ', + 'S','e','c','o','n','d',' ','I','t','e','m','s',0}, + out_of_range_item[] = {'O','u','t',' ','o','f',' ','R','a','n','g','e',' ','I','t','e','m',0}; /* Allocate space for result */ textBuffer = malloc(MAX_CHARS); @@ -86,19 +88,19 @@ myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); /* Add items onto the end of the combobox */ - res = addItem(myHwnd, -1, FIRST_ITEM); + res = addItem(myHwnd, -1, first_item); ok(res == 0, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, -1, SECOND_ITEM); + res = addItem(myHwnd, -1, second_item); ok(res == 1, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, 2, THIRD_ITEM); + res = addItem(myHwnd, 2, third_item); ok(res == 2, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, 1, MIDDLE_ITEM); + res = addItem(myHwnd, 1, middle_item); ok(res == 1, "Inserting simple item failed (%ld)\n", res); /* Add an item completely out of range */ - res = addItem(myHwnd, 99, "Out Of Range Item"); + res = addItem(myHwnd, 99, out_of_range_item); ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); - res = addItem(myHwnd, 5, "Out Of Range Item"); + res = addItem(myHwnd, 5, out_of_range_item); ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); /* Removed: Causes traps on Windows XP res = addItem(myHwnd, -2, "Out Of Range Item"); @@ -116,32 +118,32 @@ /* Get an item in range */ res = getItem(myHwnd, 0, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(FIRST_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(first_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 1, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(MIDDLE_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(middle_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 2, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(SECOND_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(second_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 3, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(THIRD_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(third_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); /* Set an item completely out of range */ - res = setItem(myHwnd, 99, REPLACEMENT_ITEM); + res = setItem(myHwnd, 99, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); - res = setItem(myHwnd, 4, REPLACEMENT_ITEM); + res = setItem(myHwnd, 4, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); - res = setItem(myHwnd, -2, REPLACEMENT_ITEM); + res = setItem(myHwnd, -2, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); /* Set an item in range */ - res = setItem(myHwnd, 0, REPLACEMENT_ITEM); + res = setItem(myHwnd, 0, replacement_item); ok(res != 0, "Setting first item failed (%ld)\n", res); - res = setItem(myHwnd, 3, REPLACEMENT_ITEM); + res = setItem(myHwnd, 3, replacement_item); ok(res != 0, "Setting last item failed (%ld)\n", res); /* Remove items completely out of range (4 items in control at this point) */ Modified: trunk/reactos/regtests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/comctl3… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/header.c (original) +++ trunk/reactos/regtests/winetests/comctl32/header.c Thu Aug 31 00:28:33 2006 @@ -56,7 +56,7 @@ unexpectedNotify[nUnexpectedNotify++] = iCode; } -static BOOL notifies_received() +static BOOL notifies_received(void) { BOOL fRet = (nExpectedNotify == nReceivedNotify); nExpectedNotify = nReceivedNotify = 0; @@ -323,7 +323,7 @@ /* field from comctl >4.0 not tested as the system probably won't touch them */ } -static void check_mask() +static void check_mask(void) { HDITEMA hdi; static CHAR text[] = "ABC"; Modified: trunk/reactos/regtests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/comctl3… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/listview.c (original) +++ trunk/reactos/regtests/winetests/comctl32/listview.c Thu Aug 31 00:28:33 2006 @@ -24,19 +24,15 @@ #include "wine/test.h" -START_TEST(listview) +static void test_images(void) { HWND hwnd, hwndparent = 0; - INITCOMMONCONTROLSEX icc; DWORD r; LVITEM item; HIMAGELIST himl; HBITMAP hbmp; RECT r1, r2; - - icc.dwICC = 0; - icc.dwSize = sizeof icc; - InitCommonControlsEx(&icc); + static CHAR hello[] = "hello"; himl = ImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -71,7 +67,7 @@ ok(r == -1, "should fail\n"); item.iSubItem = 0; - item.pszText = "hello"; + item.pszText = hello; r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); @@ -83,7 +79,7 @@ ok(r == TRUE, "should not fail\n"); item.iSubItem = 0; - item.pszText = "hello"; + item.pszText = hello; r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); @@ -95,3 +91,145 @@ DestroyWindow(hwnd); } + +static void test_checkboxes(void) +{ + HWND hwnd, hwndparent = 0; + LVITEMA item; + DWORD r; + static CHAR text[] = "Text", + text2[] = "Text2", + text3[] = "Text3"; + + hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + /* first without LVS_EX_CHECKBOXES set and an item and check that state is preserved */ + item.mask = LVIF_TEXT | LVIF_STATE; + item.stateMask = 0xffff; + item.state = 0xfccc; + item.iItem = 0; + item.iSubItem = 0; + item.pszText = text; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %ld\n", r); + + item.iItem = 0; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0xfccc, "state %x\n", item.state); + + /* Don't set LVIF_STATE */ + item.mask = LVIF_TEXT; + item.stateMask = 0xffff; + item.state = 0xfccc; + item.iItem = 1; + item.iSubItem = 0; + item.pszText = text; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 1, "ret %ld\n", r); + + item.iItem = 1; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0, "state %x\n", item.state); + + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); + ok(r == 0, "should return zero\n"); + + /* Having turned on checkboxes, check that all existing items are set to 0x1000 (unchecked) */ + item.iItem = 0; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1ccc, "state %x\n", item.state); + + /* Now add an item without specifying a state and check that it's state goes to 0x1000 */ + item.iItem = 2; + item.mask = LVIF_TEXT; + item.state = 0; + item.pszText = text2; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 2, "ret %ld\n", r); + + item.iItem = 2; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1000, "state %x\n", item.state); + + /* Add a further item this time specifying a state and still it's state goes to 0x1000 */ + item.iItem = 3; + item.mask = LVIF_TEXT | LVIF_STATE; + item.stateMask = 0xffff; + item.state = 0x2aaa; + item.pszText = text3; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 3, "ret %ld\n", r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1aaa, "state %x\n", item.state); + + /* Set an item's state to checked */ + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xf000; + item.state = 0x2000; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x2aaa, "state %x\n", item.state); + + /* Set the style again and check that doesn't change an item's state */ + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); + ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x2aaa, "state %x\n", item.state); + + /* Unsetting the checkbox extended style doesn't change an item's state */ + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, 0); + ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x2aaa, "state %x\n", item.state); + + /* Now setting the style again will change an item's state */ + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); + ok(r == 0, "ret %lx\n", r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1aaa, "state %x\n", item.state); + + DestroyWindow(hwnd); +} + +START_TEST(listview) +{ + INITCOMMONCONTROLSEX icc; + + icc.dwICC = 0; + icc.dwSize = sizeof icc; + InitCommonControlsEx(&icc); + + test_images(); + test_checkboxes(); +}

1 0

[pborobia] 23817: clipboard implementatin win32k/ntuser part
by pborobia＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: pborobia Date: Thu Aug 31 00:25:00 2006 New Revision: 23817 URL: http://svn.reactos.org/svn/reactos?rev=23817&view=rev Log: clipboard implementatin win32k/ntuser part Modified: branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c branches/clipboard/subsystems/win32/win32k/ntuser/input.c branches/clipboard/subsystems/win32/win32k/ntuser/misc.c branches/clipboard/subsystems/win32/win32k/ntuser/useratom.c branches/clipboard/subsystems/win32/win32k/ntuser/window.c branches/clipboard/subsystems/win32/win32k/ntuser/winpos.c branches/clipboard/subsystems/win32/win32k/ntuser/winsta.c Modified: branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c Thu Aug 31 00:25:00 2006 @@ -1,318 +1,1247 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Clipboard routines * FILE: subsys/win32k/ntuser/clipboard.c * PROGRAMER: Filip Navara <xnavara(a)volny.cz> + * Pablo Borobia <pborobia(a)gmail.com> */ #include <w32k.h> -#define NDEBUG +#define DEBUG #include <debug.h> -#define CHECK_LOCK \ - if (ClipboardThread && ClipboardThread != PsGetCurrentThreadWin32Thread()) \ - { \ - SetLastWin32Error(ERROR_LOCKED); \ - return FALSE; \ - } - -PW32THREAD ClipboardThread; -HWND ClipboardWindow; -HWND tempClipboardWindow; -HANDLE hCBData; -UINT uCBFormat; - -ULONG FASTCALL -IntGetClipboardFormatName(UINT format, PUNICODE_STRING FormatName) -{ - - return IntGetAtomName((RTL_ATOM)format, FormatName->Buffer, - FormatName->MaximumLength); -} - -UINT FASTCALL -IntEnumClipboardFormats(UINT format) -{ - - CHECK_LOCK - - if (!hCBData) - return FALSE; - //UNIMPLEMENTED; - return 1; +#define CF_DIBV5 17 + +#define DATA_DELAYED_RENDER 0 +#define DATA_SYNTHESIZED_RENDER -1 + +#define USE_WINSTA \ + PWINSTATION_OBJECT WinStaObj; \ + WinStaObj = PsGetCurrentThreadWin32Thread()->Desktop->WindowStation; + +#define WINSTA_ClipboardThread WinStaObj->Clipboard->ClipboardThread +#define WINSTA_ClipboardOwnerThread WinStaObj->Clipboard->ClipboardOwnerThread +#define WINSTA_ClipboardWindow WinStaObj->Clipboard->ClipboardWindow +#define WINSTA_ClipboardViewerWindow WinStaObj->Clipboard->ClipboardViewerWindow +#define WINSTA_ClipboardOwnerWindow WinStaObj->Clipboard->ClipboardOwnerWindow +#define WINSTA_sendDrawClipboardMsg WinStaObj->Clipboard->sendDrawClipboardMsg +#define WINSTA_recentlySetClipboard WinStaObj->Clipboard->recentlySetClipboard +#define WINSTA_delayedRender WinStaObj->Clipboard->delayedRender +#define WINSTA_lastEnumClipboardFormats WinStaObj->Clipboard->lastEnumClipboardFormats +#define WINSTA_ClipboardSequenceNumber WinStaObj->Clipboard->ClipboardSequenceNumber +#define WINSTA_WindowsChain WinStaObj->Clipboard->WindowsChain +#define WINSTA_ClipboardData WinStaObj->Clipboard->ClipboardData +#define WINSTA_synthesizedData WinStaObj->Clipboard->synthesizedData +#define WINSTA_synthesizedDataSize WinStaObj->Clipboard->synthesizedDataSize + +PW32THREAD ClipboardThread; +PW32THREAD ClipboardOwnerThread; +PWINDOW_OBJECT ClipboardWindow; +PWINDOW_OBJECT ClipboardViewerWindow; +PWINDOW_OBJECT ClipboardOwnerWindow; +BOOL sendDrawClipboardMsg; +BOOL recentlySetClipboard; +BOOL delayedRender; +UINT lastEnumClipboardFormats; +DWORD ClipboardSequenceNumber = 0; + +PCLIPBOARDCHAINELEMENT WindowsChain = NULL; +PCLIPBOARDELEMENT ClipboardData = NULL; + +PCHAR synthesizedData; +DWORD synthesizedDataSize; + + +/*==============================================================*/ + +/* return the pointer to the prev window of the finded window, + if NULL does not exists in the chain */ +PCLIPBOARDCHAINELEMENT FASTCALL +IntIsWindowInChain(PWINDOW_OBJECT window) +{ + PCLIPBOARDCHAINELEMENT wce = WindowsChain; + + while (wce) + { + if (wce->window == window) + { + break; + } + wce = wce->next; + } + + return wce; +} + +VOID FASTCALL printChain() +{ + /*test*/ + PCLIPBOARDCHAINELEMENT wce2 = WindowsChain; + while (wce2) + { + DPRINT1("chain: %p\n", wce2->window->hSelf); + wce2 = wce2->next; + } +} + +/* the new window always have to be the first in the chain */ +PCLIPBOARDCHAINELEMENT FASTCALL +IntAddWindowToChain(PWINDOW_OBJECT window) +{ + PCLIPBOARDCHAINELEMENT wce = NULL; + + if (!IntIsWindowInChain(window)) + { + wce = WindowsChain; + + wce = ExAllocatePool(PagedPool, sizeof(CLIPBOARDCHAINELEMENT)); + if (wce == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto exit_addChain; + } + + wce->window = window; + wce->next = WindowsChain; + + WindowsChain = wce; + + //printChain(); + } +exit_addChain: + + /* return the next window to beremoved later */ + return wce; +} + +PCLIPBOARDCHAINELEMENT FASTCALL +IntRemoveWindowFromChain(PWINDOW_OBJECT window) +{ + PCLIPBOARDCHAINELEMENT wce = WindowsChain; + PCLIPBOARDCHAINELEMENT *link = &WindowsChain; + + if (IntIsWindowInChain(window)) + { + while (wce != NULL) + { + if (wce->window == window) + { + *link = wce->next; + break; + } + + link = &wce->next; + wce = wce->next; + } + + //printChain(); + + return wce; + } + else + { + return NULL; + } +} + + +/*==============================================================*/ +/* if format exists, returns a non zero value (pointing to format object) */ +PCLIPBOARDELEMENT FASTCALL +intIsFormatAvailable(format) +{ + PCLIPBOARDELEMENT ret = NULL; + PCLIPBOARDELEMENT ce = ClipboardData; + + while(ce) + { + if (ce->format == format) + { + ret = ce; + break; + } + ce = ce->next; + } + return ret; +} + +/* counts how many distinct format were are in the clipboard */ +DWORD FASTCALL +IntCountClipboardFormats() +{ + DWORD ret = 0; + PCLIPBOARDELEMENT ce = ClipboardData; + + while(ce) + { + ret++; + ce = ce->next; + } + return ret; +} + +/* adds a new format and data to the clipboard */ +PCLIPBOARDELEMENT FASTCALL +intAddFormatedData(UINT format, HANDLE hData, DWORD size) +{ + PCLIPBOARDELEMENT ce = NULL; + + ce = ExAllocatePool(PagedPool, sizeof(CLIPBOARDELEMENT)); + if (ce == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + ce->format = format; + ce->size = size; + ce->hData = hData; + ce->next = ClipboardData; + + ClipboardData = ce; + + IntIncrementSecuenceNumber(); + } + + return ce; +} + +/* removes a format and its data from the clipboard */ +BOOL FASTCALL +intRemoveFormatedData(UINT format) +{ + BOOL ret = FALSE; + PCLIPBOARDELEMENT ce = ClipboardData; + PCLIPBOARDELEMENT *link = &ClipboardData; + + if (intIsFormatAvailable(format)) + { + while (ce != NULL) + { + if (ce->format == format) + { + *link = ce->next; + break; + } + + link = &ce->next; + ce = ce->next; + } + + if (ce->hData) + { + ExFreePool(ce->hData); + } + ExFreePool(ce); + ret = TRUE; + } + + return ret; +} + +VOID FASTCALL +IntEmptyClipboardData() +{ + PCLIPBOARDELEMENT ce = ClipboardData; + PCLIPBOARDELEMENT tmp; + + while(ce) + { + tmp = ce->next; + ExFreePool(ce->hData); + ExFreePool(ce); + ce = tmp; + } + + ClipboardData = NULL; +} + +/*==============================================================*/ + +HANDLE FASTCALL +renderBITMAPfromDIB(LPBYTE hDIB) +{ + HDC hdc; + HBITMAP hbitmap; + unsigned int offset; + BITMAPINFOHEADER *ih; + + //hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); + hdc = UserGetDCEx(ClipboardWindow, NULL, DCX_USESTYLE); + + ih = (BITMAPINFOHEADER *)hDIB; + + offset = sizeof(BITMAPINFOHEADER) + ((ih->biBitCount <= 8) ? (sizeof(RGBQUAD) * (1 << ih->biBitCount)) : 0); + + hbitmap = NtGdiCreateDIBitmap(hdc, ih, CBM_INIT, (LPBYTE)ih + offset, (LPBITMAPINFO)ih, DIB_RGB_COLORS); + + //UserReleaseDC(NULL, hdc, FALSE); + UserReleaseDC(ClipboardWindow, hdc, FALSE); + + return hbitmap; +} + +BOOL FASTCALL +canSinthesize(UINT format) +{ + BOOL ret = FALSE; + + switch(format) + { + case CF_BITMAP: + case CF_METAFILEPICT: + ret = TRUE; + } + + return ret; +} + +/* returns the size of the sinthesized data */ +DWORD FASTCALL +synthesizeData(UINT format) +{ + DWORD ret = 0; + + synthesizedData = NULL; + synthesizedDataSize = 0; + + if (!canSinthesize(format)) + { + return 0; + } + + switch (format) + { + case CF_BITMAP: + { + break; + } + + case CF_METAFILEPICT: + { + break; + } + } + + ret = 1; + + return ret; +} + +VOID FASTCALL +freeSynthesizedData() +{ + ExFreePool(synthesizedData); +} + +/*==============================================================*/ + +BOOL FASTCALL +intIsClipboardOpenByMe() +{ + /* check if we open the clipboard */ + if (ClipboardThread && ClipboardThread == PsGetCurrentThreadWin32Thread()) + { + /* yes, we got a thread and its the same that opens the clipboard */ + return TRUE; + + } + /* will fail if not thread (closed) or not open by me*/ + return FALSE; +} + +/* IntClipboardFreeWindow it's called when a window was destroyed */ +VOID FASTCALL +IntClipboardFreeWindow(PWINDOW_OBJECT window) +{ + /* called from co_UserFreeWindow in window.c */ + /* check if clipboard is not locked by this window, if yes, unlock it */ + if (ClipboardThread == PsGetCurrentThreadWin32Thread()) + { + /* the window that opens the clipboard was destroyed */ + ClipboardThread = NULL; + ClipboardWindow = NULL; + //TODO: free clipboard + } + if (window == ClipboardOwnerWindow) + { + /* the owner window was destroyed */ + ClipboardOwnerWindow = NULL; + ClipboardOwnerThread = NULL; + } + /* remove window from window chain */ + if (IntIsWindowInChain(window)) + { + PCLIPBOARDCHAINELEMENT w = IntRemoveWindowFromChain(window); + if (w) + { + ExFreePool(w); + } + } } BOOL STDCALL NtUserOpenClipboard(HWND hWnd, DWORD Unknown1) { - CHECK_LOCK - - tempClipboardWindow = hWnd; - ClipboardThread = PsGetCurrentThreadWin32Thread(); - return TRUE; + + PWINDOW_OBJECT Window; + BOOL ret = FALSE; + + UserEnterExclusive(); + + sendDrawClipboardMsg = FALSE; + recentlySetClipboard = FALSE; + + if (ClipboardThread) + { + /* clipboard is already open */ + if (ClipboardThread == PsGetCurrentThreadWin32Thread()) + { + if (ClipboardOwnerWindow) + { + if (ClipboardOwnerWindow->hSelf == hWnd) + { + ret = TRUE; + } + } + else + { + if (hWnd == NULL) + { + ret = TRUE; + } + } + } + } + else + { + + if (hWnd != NULL) + { + Window = UserGetWindowObject(hWnd); + + if (Window != NULL) + { + ClipboardWindow = Window; + ClipboardThread = PsGetCurrentThreadWin32Thread(); + ret = TRUE; + } + else + { + ClipboardWindow = NULL; + ClipboardThread = NULL; + ClipboardOwnerWindow = NULL; + ClipboardOwnerThread = NULL; + } + } + else + { + ClipboardWindow = NULL; + ClipboardThread = PsGetCurrentThreadWin32Thread(); + ret = TRUE; + } + } + + UserLeave(); + + return ret; } BOOL STDCALL NtUserCloseClipboard(VOID) { - CHECK_LOCK - - ClipboardWindow = 0; - ClipboardThread = NULL; - return TRUE; -} - -/* - * @unimplemented - */ + BOOL ret = FALSE; + + UserEnterExclusive(); + + if (intIsClipboardOpenByMe()) + { + ClipboardWindow = NULL; + ClipboardThread = NULL; + ret = TRUE; + } + else + { + SetLastWin32Error(ERROR_CLIPBOARD_NOT_OPEN); + } + + recentlySetClipboard = FALSE; + + UserLeave(); + + if (sendDrawClipboardMsg && WindowsChain) + { + /* only send message to the first window in the chain, then they'll do the chain */ + /* commented because it makes a crash in co_MsqSendMessage + ASSERT(WindowsChain->window); + ASSERT(WindowsChain->window->hSelf); + DPRINT1("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", WindowsChain->window->hSelf); + co_IntSendMessage(WindowsChain->window->hSelf, WM_DRAWCLIPBOARD, 0, 0); + */ + } + + return ret; +} + HWND STDCALL NtUserGetOpenClipboardWindow(VOID) { - /* - UNIMPLEMENTED - return 0; - */ - return ClipboardWindow; + HWND ret = NULL; + + UserEnterShared(); + + if (ClipboardWindow) + { + ret = ClipboardWindow->hSelf; + } + + UserLeave(); + + return ret; } BOOL STDCALL NtUserChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext) { - UNIMPLEMENTED - return 0; + BOOL ret = FALSE; + PCLIPBOARDCHAINELEMENT w = NULL; + + UserEnterExclusive(); + + PWINDOW_OBJECT removeWindow = UserGetWindowObject(hWndRemove); + + if (removeWindow) + { + if ((ret = !!IntIsWindowInChain(removeWindow))) + { + w = IntRemoveWindowFromChain(removeWindow); + if (w) + { + ExFreePool(w); + } + } + } + + if (ret && WindowsChain) + { + // only send message to the first window in the chain, + // then they do the chain + DPRINT1("Message: WM_CHANGECBCHAIN to %p", WindowsChain->window->hSelf); + /* WindowsChain->window may be NULL */ + LPARAM lparam = WindowsChain->window == NULL ? 0 : (LPARAM)WindowsChain->window->hSelf; + co_IntSendMessage(WindowsChain->window->hSelf, WM_CHANGECBCHAIN, (WPARAM)hWndRemove, lparam); + } + + UserLeave(); + + return ret; } DWORD STDCALL NtUserCountClipboardFormats(VOID) { - UNIMPLEMENTED - return 0; + DWORD ret = 0; + + if (ClipboardData) + { + ret = IntCountClipboardFormats(); + } + + return ret; } DWORD STDCALL NtUserEmptyClipboard(VOID) { - CHECK_LOCK - - // if (!hCBData) - // return FALSE; - - // FIXME! - // GlobalUnlock(hCBData); - // GlobalFree(hCBData); - hCBData = NULL; - uCBFormat = 0; - ClipboardWindow = tempClipboardWindow; - - return TRUE; + BOOL ret = FALSE; + + UserEnterExclusive(); + + if (intIsClipboardOpenByMe()) + { + if (ClipboardData) + { + IntEmptyClipboardData(); + } + + ClipboardOwnerWindow = ClipboardWindow; + ClipboardOwnerThread = ClipboardThread; + + IntIncrementSecuenceNumber(); + + ret = TRUE; + } + else + { + SetLastWin32Error(ERROR_CLIPBOARD_NOT_OPEN); + } + + if (ret && ClipboardOwnerWindow) + { + DPRINT1("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf); + co_IntSendMessage( ClipboardOwnerWindow->hSelf, WM_DESTROYCLIPBOARD, 0, 0); + } + + UserLeave(); + + return ret; } HANDLE STDCALL NtUserGetClipboardData(UINT uFormat, DWORD Unknown1) { - CHECK_LOCK - - if ((uFormat==1 && uCBFormat==13) || (uFormat==13 && uCBFormat==1)) - uCBFormat = uFormat; - - if (uFormat != uCBFormat) - return FALSE; - - return hCBData; + HANDLE ret = NULL; + PCHAR buffer; + + UserEnterShared(); + + if (intIsClipboardOpenByMe()) + { + /* when Unknown1 is zero, we returns to user32 the data size */ + if (Unknown1 == 0) + { + PCLIPBOARDELEMENT data = intIsFormatAvailable(uFormat); + + if (data) + { + /* format exists in clipboard */ + if (data->size == DATA_DELAYED_RENDER) + { + /* tell owner what data needs to be rendered */ + if (ClipboardOwnerWindow) + { + ASSERT(ClipboardOwnerWindow->hSelf); + co_IntSendMessage(ClipboardOwnerWindow->hSelf, WM_RENDERFORMAT, (WPARAM)uFormat, 0); + data = intIsFormatAvailable(uFormat); + ASSERT(data->size); + ret = (HANDLE)data->size; + } + } + else + { + if (data->size == DATA_SYNTHESIZED_RENDER) + { + data->size = synthesizeData(uFormat); + } + + } + ret = (HANDLE)data->size; + } + else + { + /* there is no data in this format */ + //ret = (HANDLE)FALSE; + } + } + else + { + PCLIPBOARDELEMENT data = intIsFormatAvailable(uFormat); + + if (data) + { + if (data->size == DATA_DELAYED_RENDER) + { + // we rendered it in 1st call of getclipboard data + } + else + { + if (data->size == DATA_SYNTHESIZED_RENDER) + { + if (uFormat == CF_BITMAP) + { + /* BITMAP & METAFILEs returns a GDI handle */ + PCLIPBOARDELEMENT data = intIsFormatAvailable(CF_DIB); + if (data) + { + ret = renderBITMAPfromDIB(data->hData); + } + } + else + { + buffer = (PCHAR)Unknown1; + memcpy(buffer, (PCHAR)synthesizedData, synthesizedDataSize); + + freeSynthesizedData(); + + ret = (HANDLE)Unknown1; + } + } + else + { + buffer = (PCHAR)Unknown1; + memcpy(buffer, (PCHAR)data->hData, data->size); + + ret = (HANDLE)Unknown1; + } + } + + } + + } + } + else + { + SetLastWin32Error(ERROR_CLIPBOARD_NOT_OPEN); + } + + UserLeave(); + + return ret; } INT STDCALL NtUserGetClipboardFormatName(UINT format, PUNICODE_STRING FormatName, INT cchMaxCount) { - NTSTATUS Status; - PWSTR Buf; - UNICODE_STRING SafeFormatName, BufFormatName; - ULONG Ret; - - if((cchMaxCount < 1) || !FormatName) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - /* copy the FormatName UNICODE_STRING structure */ - Status = MmCopyFromCaller(&SafeFormatName, FormatName, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - /* Allocate memory for the string */ - Buf = ExAllocatePoolWithTag(PagedPool, cchMaxCount * sizeof(WCHAR), TAG_STRING); - if(!Buf) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - /* Setup internal unicode string */ - BufFormatName.Length = 0; - BufFormatName.MaximumLength = min(cchMaxCount * sizeof(WCHAR), SafeFormatName.MaximumLength); - BufFormatName.Buffer = Buf; - - if(BufFormatName.MaximumLength < sizeof(WCHAR)) - { - ExFreePool(Buf); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - if (format >= 0xC000) - { - Ret = IntGetClipboardFormatName(format, &BufFormatName); - } - else - { - SetLastNtError(NO_ERROR); - return 0; - } - - /* copy the UNICODE_STRING buffer back to the user */ - Status = MmCopyToCaller(SafeFormatName.Buffer, BufFormatName.Buffer, BufFormatName.MaximumLength); - if(!NT_SUCCESS(Status)) - { - ExFreePool(Buf); - SetLastNtError(Status); - return 0; - } - - BufFormatName.MaximumLength = SafeFormatName.MaximumLength; - BufFormatName.Buffer = SafeFormatName.Buffer; - - /* update the UNICODE_STRING structure (only the Length member should change) */ - Status = MmCopyToCaller(FormatName, &BufFormatName, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - ExFreePool(Buf); - SetLastNtError(Status); - return 0; - } - - ExFreePool(Buf); - return Ret; -} + UNICODE_STRING sFormatName; + INT ret = 0; + + /* if the format is built-in we fail */ + if (format < 0xc000) + { + /* registetrated formats are >= 0xc000 */ + return 0; + } + + if((cchMaxCount < 1) || !FormatName) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + _SEH_TRY + { + ProbeForWriteUnicodeString(FormatName); + sFormatName = *(volatile UNICODE_STRING *)FormatName; + ProbeForWrite(sFormatName.Buffer, sFormatName.MaximumLength, 1); + + ret = IntGetAtomName((RTL_ATOM)format, sFormatName.Buffer, cchMaxCount * sizeof(WCHAR)); + + if (ret >= 0) + { + ret = ret / sizeof(WCHAR); + sFormatName.Length = ret; + } + else + { + ret = 0; + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + } + _SEH_END; + + return ret; +} + +UINT STDCALL +NtUserRegisterClipboardFormat(PUNICODE_STRING FormatName) +{ + UINT ret = 0; + UNICODE_STRING cFormatName = {0}; + + if (FormatName == NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return ret; + } + + UserEnterExclusive(); + + _SEH_TRY + { + cFormatName = ProbeForReadUnicodeString(FormatName); + + if (cFormatName.Length > 0) + { + ret = (UINT)IntAddAtom(cFormatName.Buffer); + //RtlFreeUnicodeString(&cFormatName); + } + else + { + SetLastWin32Error(ERROR_INVALID_NAME); + _SEH_LEAVE; + } + + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + } + _SEH_END; + + UserLeave(); + + return ret; +} + HWND STDCALL NtUserGetClipboardOwner(VOID) { - return ClipboardWindow; + HWND ret = NULL; + + UserEnterShared(); + + if (ClipboardOwnerWindow) + { + ret = ClipboardOwnerWindow->hSelf; + } + + UserLeave(); + + return ret; +} + +HWND STDCALL +NtUserGetClipboardViewer(VOID) +{ + HWND ret = NULL; + + UserEnterShared(); + + if (WindowsChain) + { + ret = WindowsChain->window->hSelf; + } + + UserLeave(); + + return ret; +} + +INT STDCALL +NtUserGetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats) +{ + UINT i; + UINT *priorityList; + INT ret = 0; + + UserEnterExclusive(); + + _SEH_TRY + { + if (IntCountClipboardFormats() == 0) + { + ret = 0; + } + else + { + ProbeForRead(paFormatPriorityList, cFormats, sizeof(UINT)); + + priorityList = paFormatPriorityList; + + ret = -1; + + for (i = 0; i < cFormats; i++) + { + if (intIsFormatAvailable(priorityList[i])) + { + ret = priorityList[i]; + break; + } + } + + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + } + _SEH_END; + + UserLeave(); + + return ret; + +} + +BOOL STDCALL +NtUserIsClipboardFormatAvailable(UINT format) +{ + BOOL ret = FALSE; + + UserEnterShared(); + + ret = (intIsFormatAvailable(format) != NULL); + + UserLeave(); + + return ret; +} + + + +HANDLE STDCALL +NtUserSetClipboardData(UINT uFormat, HANDLE hMem, DWORD size) +{ + HANDLE hCBData = NULL; + UNICODE_STRING unicodeString; + OEM_STRING oemString; + ANSI_STRING ansiString; + + UserEnterExclusive(); + + /* to place data here the we need to be the owner */ + if (ClipboardOwnerThread == PsGetCurrentThreadWin32Thread()) + { + PCLIPBOARDELEMENT data = intIsFormatAvailable(uFormat); + if (data) + { + + if (data->size == DATA_DELAYED_RENDER) + { + intRemoveFormatedData(uFormat); + } + else + { + // we already have this format on clipboard + goto exit_setCB; + } + } + + if (hMem) + { + _SEH_TRY + { + ProbeForRead(hMem, size, 1); + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + goto exit_setCB; + } + _SEH_END; + + if (intIsClipboardOpenByMe()) + { + delayedRender = FALSE; + } + + if (!canSinthesize(uFormat)) + { + hCBData = ExAllocatePool(PagedPool, size); + memcpy(hCBData, hMem, size); + intAddFormatedData(uFormat, hCBData, size); + DPRINT1("Data stored\n"); + } + + sendDrawClipboardMsg = TRUE; + recentlySetClipboard = TRUE; + lastEnumClipboardFormats = uFormat; + + /* conversions */ + switch (uFormat) + { + case CF_TEXT: + { + //TODO : sinthesize CF_UNICODETEXT & CF_OEMTEXT + // CF_TEXT -> CF_UNICODETEXT + RtlAnsiStringToUnicodeString(&unicodeString, hCBData, TRUE); + intAddFormatedData(CF_UNICODETEXT, unicodeString.Buffer, unicodeString.Length * sizeof(WCHAR)); + // CF_TEXT -> CF_OEMTEXT + RtlUnicodeStringToOemString(&oemString, &unicodeString, TRUE); + intAddFormatedData(CF_OEMTEXT, oemString.Buffer, oemString.Length); + //HKCU\Control Panel\International\Locale + //intAddFormatedData(CF_LOCALE, oemString.Buffer, oemString.Length); + break; + } + case CF_UNICODETEXT: + { + //TODO : sinthesize CF_TEXT & CF_OEMTEXT + //CF_UNICODETEXT -> CF_TEXT + unicodeString.Buffer = hCBData; + unicodeString.Length = size; + RtlUnicodeStringToAnsiString(&ansiString, &unicodeString, TRUE); + intAddFormatedData(CF_TEXT, ansiString.Buffer, ansiString.Length); + //CF_UNICODETEXT -> CF_OEMTEXT + RtlUnicodeStringToOemString(&oemString, &unicodeString, TRUE); + intAddFormatedData(CF_OEMTEXT, oemString.Buffer, oemString.Length); + break; + } + case CF_OEMTEXT: + { + //TODO : sinthesize CF_TEXT & CF_UNICODETEXT + //CF_OEMTEXT -> CF_UNICODETEXT + oemString.Buffer = hCBData; + oemString.Length = size; + RtlOemStringToUnicodeString(&unicodeString, &oemString, TRUE); + intAddFormatedData(CF_UNICODETEXT, unicodeString.Buffer, unicodeString.Length * sizeof(WCHAR)); + //CF_OEMTEXT -> CF_TEXT + RtlUnicodeStringToAnsiString(&ansiString, &unicodeString, TRUE); + intAddFormatedData(CF_TEXT, ansiString.Buffer, ansiString.Length); + break; + } + case CF_BITMAP: + { + // we need to render the DIB or DIBV5 format as soon as possible + // because pallette information may change + + HDC hdc; + INT ret; + BITMAP bm; + BITMAPINFO bi; + + hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); + + BITMAPOBJ *BitmapObj; + BitmapObj = BITMAPOBJ_LockBitmap(hMem); + BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (LPSTR)&bm); + if(BitmapObj) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + } + + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = bm.bmWidth; + bi.bmiHeader.biHeight = bm.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = bm.bmPlanes * bm.bmBitsPixel; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = 0; + bi.bmiHeader.biXPelsPerMeter = 0; + bi.bmiHeader.biYPelsPerMeter = 0; + bi.bmiHeader.biClrUsed = 0; + + ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS); + + size = bi.bmiHeader.biSizeImage + sizeof(BITMAPINFOHEADER); + + hCBData = ExAllocatePool(PagedPool, size); + memcpy(hCBData, &bi, sizeof(BITMAPINFOHEADER)); + + ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS); + + UserReleaseDC(NULL, hdc, FALSE); + + intAddFormatedData(CF_DIB, hCBData, size); + intAddFormatedData(CF_BITMAP, 0, DATA_SYNTHESIZED_RENDER); + // intAddFormatedData(CF_DIBV5, hCBData, size); + + break; + } + case CF_DIB: + { + intAddFormatedData(CF_BITMAP, 0, DATA_SYNTHESIZED_RENDER); + // intAddFormatedData(CF_DIBV5, hCBData, size); + /* investigate */ + // intAddFormatedData(CF_PALETTE, hCBData, size); + break; + } + case CF_DIBV5: + // intAddFormatedData(CF_BITMAP, hCBData, size); + // intAddFormatedData(CF_PALETTE, hCBData, size); + // intAddFormatedData(CF_DIB, hCBData, size); + break; + case CF_ENHMETAFILE: + // intAddFormatedData(CF_METAFILEPICT, hCBData, size); + break; + case CF_METAFILEPICT: + // intAddFormatedData(CF_ENHMETAFILE, hCBData, size); + break; + } + + } + else + { + // the window provides data in the specified format + delayedRender = TRUE; + sendDrawClipboardMsg = TRUE; + intAddFormatedData(uFormat, NULL, 0); + DPRINT1("SetClipboardData delayed format: %d\n", uFormat); + } + + + } + +exit_setCB: + + UserLeave(); + + return hMem; +} + +HWND STDCALL +NtUserSetClipboardViewer(HWND hWndNewViewer) +{ + HWND ret = NULL; + PCLIPBOARDCHAINELEMENT newWC = NULL; + + UserEnterExclusive(); + + PWINDOW_OBJECT window = UserGetWindowObject(hWndNewViewer); + + if (window) + { + if ((newWC = IntAddWindowToChain(window))) + { + if (newWC) + { + // newWC->next may be NULL if we are the first window in the chain + if (newWC->next) + { + // return the next HWND available window in the chain + ret = newWC->next->window->hSelf; + } + } + } + } + + UserLeave(); + + return ret; +} + +UINT STDCALL +NtUserEnumClipboardFormats(UINT uFormat) +{ + UINT ret = 0; + + UserEnterShared(); + + if (intIsClipboardOpenByMe()) + { + if (uFormat == 0) + { + if (recentlySetClipboard) + { + ret = lastEnumClipboardFormats; + } + else + { + /* return the first available format */ + if (ClipboardData) + { + ret = ClipboardData->format; + } + } + } + else + { + if (recentlySetClipboard) + { + ret = 0; + } + else + { + /* querying nextt available format */ + PCLIPBOARDELEMENT data = intIsFormatAvailable(uFormat); + + if (data) + { + if (data->next) + { + ret = data->next->format; + } + else + { + /* reached the end */ + ret = 0; + } + } + } + + } + } + else + { + SetLastWin32Error(ERROR_CLIPBOARD_NOT_OPEN); + } + + UserLeave(); + + return ret; +} + +// This number is incremented whenever the contents of the clipboard change +// or the clipboard is emptied. +// If clipboard rendering is delayed, +// the sequence number is not incremented until the changes are rendered. +VOID FASTCALL +IntIncrementSecuenceNumber(VOID) +{ + + USE_WINSTA + + WINSTA_ClipboardSequenceNumber++; + } DWORD STDCALL NtUserGetClipboardSequenceNumber(VOID) { - UNIMPLEMENTED - return 0; -} - -HWND STDCALL -NtUserGetClipboardViewer(VOID) -{ - UNIMPLEMENTED - return 0; -} - -INT STDCALL -NtUserGetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats) -{ - UNIMPLEMENTED - return 0; -} - -BOOL STDCALL -NtUserIsClipboardFormatAvailable(UINT format) -{ - //UNIMPLEMENTED - - if (format != 1 && format != 13) - { - DbgPrint("Clipboard Format unavailable (%d)\n", format); - return FALSE; - } - - if ((format==1 && uCBFormat==13) || (format==13 && uCBFormat==1)) - uCBFormat = format; - - if (format != uCBFormat) - return FALSE; - - return TRUE; -} - -//SetClipboardData(CF_UNICODETEXT, hdst); -HANDLE STDCALL -NtUserSetClipboardData(UINT uFormat, HANDLE hMem, DWORD Unknown2) -{ - // LPVOID pMem; - CHECK_LOCK - - - if (uFormat != 1 && uFormat != 13) - { - DbgPrint("Clipboard unsupported format (%d)\n", uFormat); - return FALSE; - } - - if (hMem) - { - uCBFormat = uFormat; - hCBData = hMem; - //pMem = GlobalLock(hMem); - /* - switch (uFormat) { - default: - DbgPrint("Clipboard unsupported format (%d)\n", uFormat); - return FALSE; - case CF_TEXT: // 1 - break; - case CF_UNICODETEXT: // 13 - break; - case CF_BITMAP: // 2 - break; - case CF_OEMTEXT: // 7 - break; - } */ - } - else - { - //the window provides data in the specified format - } - return hMem; -} - -HWND STDCALL -NtUserSetClipboardViewer(HWND hWndNewViewer) -{ - HWND hwndPrev = 0; - DbgPrint("NtUserSetClipboardViewer is UNIMPLEMENTED (%p): returning %p\n", hWndNewViewer, hwndPrev); - return hwndPrev; + //windowstation sequence number + //if no WINSTA_ACCESSCLIPBOARD access to the window station, + //the function returns zero. + DWORD sn; + + HWINSTA WinSta; + PWINSTATION_OBJECT WinStaObj; + NTSTATUS Status; + + WinSta = UserGetProcessWindowStation(); + + Status = IntValidateWindowStationHandle(WinSta, UserMode, WINSTA_ACCESSCLIPBOARD, &WinStaObj); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("No WINSTA_ACCESSCLIPBOARD access\n"); + SetLastNtError(Status); + return 0; + } + + sn = WinStaObj->ClipboardSequenceNumber; + + ObDereferenceObject(WinStaObj); + + //local copy + //sn = ClipboardSequenceNumber; + + return sn; +} + +BOOL FASTCALL +IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) +{ + WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); + if (WinStaObj->Clipboard) + { + RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM)); + return TRUE; + } + return FALSE; +} + +/**************** VISTA FUNCTIONS******************/ + +BOOL STDCALL NtUserAddClipboardFormatListener( + HWND hwnd +) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL NtUserRemoveClipboardFormatListener( + HWND hwnd +) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL NtUserGetUpdatedClipboardFormats( + PUINT lpuiFormats, + UINT cFormats, + PUINT pcFormatsOut +) +{ + UNIMPLEMENTED; + return FALSE; } /* EOF */ Modified: branches/clipboard/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/input.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/input.c Thu Aug 31 00:25:00 2006 @@ -54,6 +54,8 @@ static BOOLEAN InputThreadsRunning = FALSE; PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue = 0; +static LARGE_INTEGER lastInputInfoTicks; + /* FUNCTIONS *****************************************************************/ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam,PVOID pvParam, UINT fWinIni); @@ -326,6 +328,8 @@ return; //(Status); } DPRINT("MouseEvent\n"); + + KeQueryTickCount(&lastInputInfoTicks); KeQuerySystemTime(&MouseInputCurrentTime); @@ -636,6 +640,8 @@ DPRINT1("Win32K: Failed to read from keyboard.\n"); return; //(Status); } + + KeQueryTickCount(&lastInputInfoTicks); KeQuerySystemTime(&KeyboardInputCurrentTime); @@ -1360,4 +1366,37 @@ END_CLEANUP; } +BOOL +STDCALL +NtUserGetLastInputInfo(PLASTINPUTINFO plii) +{ + BOOL ret = TRUE; + + UserEnterShared(); + + _SEH_TRY + { + if (ProbeForReadUint(&plii->cbSize) != sizeof(LASTINPUTINFO)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ret = FALSE; + _SEH_LEAVE; + } + + ProbeForWrite(plii, sizeof(LASTINPUTINFO), sizeof(DWORD)); + + plii->dwTime = lastInputInfoTicks.u.LowPart; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + ret = FALSE; + } + _SEH_END; + + UserLeave(); + + return ret; +} + /* EOF */ Modified: branches/clipboard/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/misc.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/misc.c Thu Aug 31 00:25:00 2006 @@ -346,10 +346,10 @@ case ONEPARAM_ROUTINE_SETCARETBLINKTIME: RETURN( (DWORD)IntSetCaretBlinkTime((UINT)Param)); - +/* case ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS: - RETURN( (DWORD)IntEnumClipboardFormats((UINT)Param)); - + RETURN( (DWORD)NtUserEnumClipboardFormats((UINT)Param)); +*/ case ONEPARAM_ROUTINE_GETWINDOWINSTANCE: { PWINDOW_OBJECT Window; Modified: branches/clipboard/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/useratom.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/useratom.c Thu Aug 31 00:25:00 2006 @@ -32,7 +32,6 @@ RTL_ATOM FASTCALL IntAddAtom(LPWSTR AtomName) { - PWINSTATION_OBJECT WinStaObject; NTSTATUS Status = STATUS_SUCCESS; RTL_ATOM Atom; @@ -41,9 +40,9 @@ SetLastNtError(Status); return (RTL_ATOM)0; } - WinStaObject = PsGetCurrentThreadWin32Thread()->Desktop->WindowStation; - Status = RtlAddAtomToAtomTable(WinStaObject->AtomTable, - AtomName, &Atom); + + Status = RtlAddAtomToAtomTable(gAtomTable, AtomName, &Atom); + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -55,7 +54,6 @@ ULONG FASTCALL IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG nSize) { - PWINSTATION_OBJECT WinStaObject; NTSTATUS Status = STATUS_SUCCESS; ULONG Size = nSize; @@ -64,9 +62,9 @@ SetLastNtError(Status); return 0; } - WinStaObject = PsGetCurrentThreadWin32Thread()->Desktop->WindowStation; - Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, - nAtom, NULL, NULL, lpBuffer, &Size); + + Status = RtlQueryAtomInAtomTable(gAtomTable, nAtom, NULL, NULL, lpBuffer, &Size); + if (Size < nSize) *(lpBuffer + Size) = 0; if (!NT_SUCCESS(Status)) Modified: branches/clipboard/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/window.c Thu Aug 31 00:25:00 2006 @@ -30,7 +30,7 @@ #include <w32k.h> -#define NDEBUG +#define YDEBUG #include <debug.h> /* dialog resources appear to pass this in 16 bits, handle them properly */ @@ -460,6 +460,8 @@ RtlFreeUnicodeString(&Window->WindowName); UserDerefObject(Window); + + IntClipboardFreeWindow(Window); return 0; } @@ -1871,16 +1873,18 @@ /* Calculate the non-client size. */ MaxPos.x = Window->WindowRect.left; MaxPos.y = Window->WindowRect.top; + + DPRINT("IntCreateWindowEx(): About to get non-client size.\n"); /* WinPosGetNonClientSize SENDS THE WM_NCCALCSIZE message */ Result = co_WinPosGetNonClientSize(Window, &Window->WindowRect, &Window->ClientRect); - IntGdiOffsetRect(&Window->WindowRect, MaxPos.x - Window->WindowRect.left, MaxPos.y - Window->WindowRect.top); + if (NULL != ParentWindow) { Modified: branches/clipboard/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/winpos.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/winpos.c Thu Aug 31 00:25:00 2006 @@ -968,6 +968,8 @@ } WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect); + + //DPRINT1("co_WinPosDoNCCALCSize"); /* Relink windows. (also take into account shell window in hwndShellWindow) */ if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) @@ -1385,7 +1387,8 @@ break; case SW_SHOWNOACTIVATE: - Swp |= SWP_NOZORDER; + //Swp |= SWP_NOZORDER; + Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOWNORMAL: case SW_SHOWDEFAULT: @@ -1408,6 +1411,7 @@ } ShowFlag = (Cmd != SW_HIDE); + if (ShowFlag != WasVisible) { co_IntSendMessage(Window->hSelf, WM_SHOWWINDOW, ShowFlag, 0); @@ -1477,6 +1481,7 @@ MAKELONG(Window->ClientRect.left, Window->ClientRect.top)); IntEngWindowChanged(Window, WOC_RGN_CLIENT); + } /* Activate the window if activation is not requested and the window is not minimized */ Modified: branches/clipboard/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win3… ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/winsta.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/winsta.c Thu Aug 31 00:25:00 2006 @@ -520,7 +520,13 @@ CurInfo->DblClickHeight = 4; WindowStationObject->SystemCursor = CurInfo; - + + + if (!IntSetupClipboard(WindowStationObject)) + { + DPRINT1("WindowStation: Error Setting up the clipboard!!!\n"); + } + if (!IntSetupCurIconHandles(WindowStationObject)) { DPRINT1("Setting up the Cursor/Icon Handle table failed!\n");

1 0

[hpoussin] 23816: avifil32.dll can now be autosynced with Wine
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Thu Aug 31 00:16:11 2006 New Revision: 23816 URL: http://svn.reactos.org/svn/reactos?rev=23816&view=rev Log: avifil32.dll can now be autosynced with Wine Added: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff (with props) Modified: trunk/reactos/media/doc/README.WINE Added: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32_ros.diff (added) +++ trunk/reactos/dll/win32/avifil32/avifil32_ros.diff Thu Aug 31 00:16:11 2006 @@ -1,0 +1,25 @@ +Index: avifil32.rbuild +=================================================================== +--- avifil32.rbuild (revision 23782) ++++ avifil32.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="avifil32.spec.def" /> + <include base="avifil32">.</include> + <include base="ReactOS">include/reactos/wine</include> +Index: avifile_private.h +=================================================================== +--- avifile_private.h (revision 23782) ++++ avifile_private.h (working copy) +@@ -23,6 +23,10 @@ + #define MAX_AVISTREAMS 8 + #endif + ++#ifndef comptypeDIB ++#define comptypeDIB mmioFOURCC('D','I','B',' ') ++#endif ++ + #ifndef DIBWIDTHBYTES + #define WIDTHBYTES(i) (((i+31)&(~31))/8) + #define DIBWIDTHBYTES(bi) WIDTHBYTES((bi).biWidth * (bi).biBitCount) Propchange: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native 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 (original) +++ trunk/reactos/media/doc/README.WINE Thu Aug 31 00:16:11 2006 @@ -37,7 +37,7 @@ The following libraries are shared with Wine. -reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 +reactos/dll/win32/avifil32 # Autosync reactos/dll/win32/cabinet # Autosync reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16

1 0

[hpoussin] 23815: wineimport.cmd (>= r23814) is now able to handle msi.dll autosync. Mark it as such.
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Thu Aug 31 00:01:42 2006 New Revision: 23815 URL: http://svn.reactos.org/svn/reactos?rev=23815&view=rev Log: wineimport.cmd (>= r23814) is now able to handle msi.dll autosync. Mark it as such. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Aug 31 00:01:42 2006 @@ -54,7 +54,7 @@ reactos/dll/win32/mpr # Synced to Wine-0_9_5 reactos/dll/win32/msacm # Out of sync reactos/dll/win32/msimg32 # Autosync -reactos/dll/win32/msi # Synced to Wine-0_9_5 +reactos/dll/win32/msi # Autosync reactos/dll/win32/msvideo # Out of sync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync

1 0

[hpoussin] 23814: Allow a _ros.diff file to create files and don't let wineimport.cmd commit a deletion Fix a few more bugs
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Wed Aug 30 23:59:04 2006 New Revision: 23814 URL: http://svn.reactos.org/svn/reactos?rev=23814&view=rev Log: Allow a _ros.diff file to create files and don't let wineimport.cmd commit a deletion Fix a few more bugs Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=23814&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Wed Aug 30 23:59:04 2006 @@ -32,7 +32,7 @@ ) :startdownload ECHO Downloading %2 ... -IF NOT EXIST "wine\dlls\%2" ( +IF NOT EXIST "wine\dlls\%2\makefile.in" ( >NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 IF NOT EXIST "wine\dlls\%2\" ( ECHO Error when downloading %2. Are you sure it does exist? @@ -58,12 +58,12 @@ GOTO :createrbuildnext ) -SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789 -SET WINE_UPPER=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. +SET WINE_UPPER=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. SET WINE_LINE=%2 SET WINE_UPPERCASE= -FOR /L %%i IN (0, 1, 8) DO ( - FOR /L %%j IN (0, 1, 35) DO ( +FOR /L %%i IN (0, 1, 13) DO ( + FOR /L %%j IN (0, 1, 37) DO ( IF "!WINE_LOWER:~%%j,1!" == "!WINE_LINE:~%%i,1!" ( SET WINE_UPPERCASE=!WINE_UPPERCASE!!WINE_UPPER:~%%j,1! ) @@ -137,6 +137,7 @@ IF NOT EXIST "wine\dlls\%2" GOTO :mergenext ATTRIB -R "%WINE_ROS_DIR%\dll\win32\%2\*" >NUL COPY /Y "wine\dlls\%2\*.*" "%WINE_ROS_DIR%\dll\win32\%2" >NUL +SET WINE_FILES_DELETED= FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( IF "%%f" == ".cvsignore" ( svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL @@ -150,6 +151,7 @@ svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL IF ERRORLEVEL 2 GOTO :helpsvn IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f ) ) ELSE ( svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL @@ -170,6 +172,14 @@ ECHO Error when executing patch.exe. Try to download the lastest version at ECHO http://unxutils.sourceforge.net/ GOTO :eof + ) + FOR %%f IN (%WINE_FILES_DELETED%) DO ( + IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" ( + REN "%WINE_ROS_DIR%\dll\win32\%2\%%f" "%WINE_TMPFILE1%" + svn.exe revert -q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL + DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + REN "%WINE_ROS_DIR%\dll\win32\%2\%WINE_TMPFILE1%" "%%f" + ) ) ) GOTO :mergenext

1 0

[pborobia] 23813: * Added more clipboard regression tests
by pborobia＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: pborobia Date: Wed Aug 30 23:46:40 2006 New Revision: 23813 URL: http://svn.reactos.org/svn/reactos?rev=23813&view=rev Log: * Added more clipboard regression tests Modified: trunk/reactos/regtests/winetests/user32/clipboard.c Modified: trunk/reactos/regtests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/user32/… ============================================================================== --- trunk/reactos/regtests/winetests/user32/clipboard.c (original) +++ trunk/reactos/regtests/winetests/user32/clipboard.c Wed Aug 30 23:46:40 2006 @@ -18,17 +18,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define _WIN32_WINNT 0x0501 + #include "wine/test.h" #include "windows.h" static BOOL is_win9x = FALSE; +static DWORD sn; /* to test Secuence Number */ #define test_last_error(expected_error) \ do \ { \ if (!is_win9x) \ ok(GetLastError() == expected_error, \ - "Last error should be set to %d, not %ld\n", \ + "Last error should be set to %ld, not %ld\n", \ expected_error, GetLastError()); \ } while (0) @@ -55,7 +58,12 @@ ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); test_last_error(ERROR_CLIPBOARD_NOT_OPEN); + SetLastError(0xdeadbeef); ok(OpenClipboard(0), "OpenClipboard failed\n"); + test_last_error((long)0xdeadbeef); + ok(OpenClipboard(0), "OpenClipboard failed\n"); + test_last_error((long)0xdeadbeef); + ok(!GetClipboardOwner(), "clipboard should still be not owned\n"); ok(!OpenClipboard(hWnd1), "OpenClipboard should fail since clipboard already opened\n"); ret = CloseClipboard(); @@ -78,15 +86,114 @@ "OpenClipboard should fail without setting last error value\n"); ret = CloseClipboard(); - ok( ret, "CloseClipboard error %ld\n", GetLastError()); + ok(ret, "CloseClipboard error %ld\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should still be owned\n"); - + ret = DestroyWindow(hWnd1); - ok( ret, "DestroyWindow error %ld\n", GetLastError()); + ok(ret, "DestroyWindow error %ld\n", GetLastError()); ret = DestroyWindow(hWnd2); - ok( ret, "DestroyWindow error %ld\n", GetLastError()); + ok(ret, "DestroyWindow error %ld\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + + hWnd1 = CreateWindowExA(0, "static", NULL, WS_POPUP, + 0, 0, 10, 10, 0, 0, 0, NULL); + ok(hWnd1 != 0, "CreateWindowExA error %ld\n", GetLastError()); + trace("hWnd1 = %p\n", hWnd1); + ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + ret = DestroyWindow(hWnd1); + ok(ret, "DestroyWindow error %ld\n", GetLastError()); + ok(OpenClipboard(0), "OpenClipboard should not fail\n"); + ok(CloseClipboard(), "CloseClipboard error %ld\n", GetLastError()); + + DWORD asn = GetClipboardSequenceNumber(); + ok(asn == sn + 2, "GetClipboardSequenceNumber() returns %d, not %d\n", (int)asn, (int)sn + 2); +} + +static void test_EnumClipboardFormats(void) +{ + + SetLastError(0xdeadbeef); + ok(!EnumClipboardFormats(0), "EnumClipboardFormats failed\n"); + test_last_error(ERROR_CLIPBOARD_NOT_OPEN); + + UINT j = 0; + UINT i = 1; + /* + ok( OpenClipboard(NULL), "OpenClipboard error %ld\n", GetLastError()); + ok(!(j = EnumClipboardFormats(0)), "EnumClipboardFormats failed\n"); + while (j!=0) + { + j = EnumClipboardFormats(j); + i++; + } + ok(!(j != CountClipboardFormats()), "EnumClipboardFormats failed\n"); + */ + ok(OpenClipboard(NULL), "OpenClipboard error %ld\n", GetLastError()); + ok(EmptyClipboard(), "EmptyClipboard error %ld\n", GetLastError()); + + WCHAR *s = L"Pedor"; + HGLOBAL hdst = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, 7 * sizeof(WCHAR)); + PCHAR dst = GlobalLock(hdst); + memcpy(dst, s, 6 * sizeof(WCHAR)); + GlobalUnlock(hdst); + + ok(SetClipboardData(CF_UNICODETEXT, hdst) != 0, "SetClipboardData error %ld\n", GetLastError()); + + /* this test is very bogus, depends on data entered, need more test ;) + ok((j = EnumClipboardFormats(0)), "EnumClipboardFormats failed \n"); + while (j!=0) + { + j = EnumClipboardFormats(j); + i++; + } + ok(j != CountClipboardFormats(), "EnumClipboardFormats failed\n"); + + ok(j != 1, "EnumClipboardFormats must be 1\n"); + */ + + ok( CloseClipboard(), "CloseClipboard error %ld\n", GetLastError()); + + ok(OpenClipboard(NULL), "OpenClipboard error %ld\n", GetLastError()); + ok((j = EnumClipboardFormats(0)), "EnumClipboardFormats failed (%ld)\n", GetLastError()); + while (j!=0) + { + j = EnumClipboardFormats(j); + i++; + } + ok(j != CountClipboardFormats(), "EnumClipboardFormats failed\n"); + ok( CloseClipboard(), "CloseClipboard error %ld\n", GetLastError()); + + DWORD asn = GetClipboardSequenceNumber(); + ok(asn == sn + 7, "GetClipboardSequenceNumber() returns %d, not %d\n", (int)asn, (int)sn + 7); + +} + +static void test_Owner(void) +{ + HWND hWnd1; + BOOL ret; + + /* get owner */ + ok(OpenClipboard(0), "OpenClipboard should not fail\n"); + ok(CloseClipboard(), "CloseClipboard error %ld\n", GetLastError()); + hWnd1 = CreateWindowExA(0, "static", NULL, WS_POPUP, + 0, 0, 10, 10, 0, 0, 0, NULL); + ok(hWnd1 != 0, "CreateWindowExA error %ld\n", GetLastError()); + + ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + + HGLOBAL hdst = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, 7 * sizeof(WCHAR)); + + ok((int)SetClipboardData(CF_UNICODETEXT, hdst), "SetClipboardData error we can't put data if not be the owner (%ld)\n", GetLastError()); + ok(CloseClipboard(), "CloseClipboard error %ld\n", GetLastError()); + + ret = DestroyWindow(hWnd1); + ok(ret, "DestroyWindow error %ld\n", GetLastError()); + + /* tets secuence number*/ + DWORD asn = GetClipboardSequenceNumber(); + ok(asn == sn + 8, "GetClipboardSequenceNumber() returns %d, not %d\n", (int)asn, (int)sn + 8); } static void test_RegisterClipboardFormatA(void) @@ -97,6 +204,14 @@ int len; BOOL ret; + SetLastError(0xdeadbeef); + ok(!(format_id = RegisterClipboardFormatA(0)), "RegisterClipboardFormat should fail\n"); + test_last_error(ERROR_INVALID_PARAMETER); + + SetLastError(0xdeadbeef); + ok(!(format_id = RegisterClipboardFormatA("")), "RegisterClipboardFormat should fail\n"); + test_last_error(ERROR_INVALID_NAME); + format_id = RegisterClipboardFormatA("my_cool_clipboard_format"); ok(format_id > 0xc000 && format_id < 0xffff, "invalid clipboard format id %04x\n", format_id); @@ -106,6 +221,11 @@ len = GetClipboardFormatNameA(format_id, buf, 256); ok(len == lstrlenA("my_cool_clipboard_format"), "wrong format name length %d\n", len); ok(!lstrcmpA(buf, "my_cool_clipboard_format"), "wrong format name \"%s\"\n", buf); + + WCHAR buf2[256]; + len = GetClipboardFormatNameW(format_id, buf2, 256); + ok(len == lstrlenW(L"my_cool_clipboard_format"), "wrong format name length %d\n", len); + ok(!lstrcmpW(buf2, L"my_cool_clipboard_format"), "wrong format name \"%S\"\n", buf2); lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); @@ -154,6 +274,8 @@ } #endif + ok(!GetClipboardFormatNameA(1, buf, 256), "GetClipboardFormatNameA should fail\n"); + ret = OpenClipboard(0); ok( ret, "OpenClipboard error %ld\n", GetLastError()); @@ -183,7 +305,83 @@ SetLastError(0xdeadbeef); ok(!EmptyClipboard(), "EmptyClipboard should fail if clipboard wasn't open\n"); test_last_error(ERROR_CLIPBOARD_NOT_OPEN); -} + + DWORD asn = GetClipboardSequenceNumber(); + ok(asn == sn + 1, "GetClipboardSequenceNumber() returns %d, not %d\n", (int)asn, (int)sn + 1); +} + +static void test_RegisterClipboardFormatW(void) +{ + ATOM atom_id; + UINT format_id, format_id2; + WCHAR buf[256]; + int len; + BOOL ret; + + SetLastError(0xdeadbeef); + ok(!(format_id = RegisterClipboardFormatW(0)), "RegisterClipboardFormatW should fail\n"); + test_last_error(ERROR_INVALID_PARAMETER); + + SetLastError(0xdeadbeef); + ok(!(format_id = RegisterClipboardFormatW(L"")), "RegisterClipboardFormatW should fail\n"); + test_last_error(ERROR_INVALID_NAME); + + format_id = RegisterClipboardFormatW(L"my_cool_clipboard_format"); + ok(format_id > 0xc000 && format_id < 0xffff, "invalid clipboard format id %04x\n", format_id); + + format_id2 = RegisterClipboardFormatW(L"MY_COOL_CLIPBOARD_FORMAT"); + ok(format_id2 == format_id, "invalid clipboard format id %04x\n", format_id2); + + len = GetClipboardFormatNameW(format_id, buf, 256); + ok(len == lstrlenW(L"my_cool_clipboard_format"), "wrong format name length %d\n", len); + ok(!lstrcmpW(buf, L"my_cool_clipboard_format"), "wrong format name \"%S\"\n", buf); + + lstrcpyW(buf, L"foo"); + SetLastError(0xdeadbeef); + len = GetAtomNameW((ATOM)format_id, buf, 256); + ok(len == 0, "GetAtomNameA should fail\n"); + test_last_error(ERROR_INVALID_HANDLE); + + + lstrcpyW(buf, L"foo"); + SetLastError(0xdeadbeef); + len = GlobalGetAtomNameW((ATOM)format_id, buf, 256); + ok(len == 0, "GlobalGetAtomNameA should fail\n"); + test_last_error(ERROR_INVALID_HANDLE); + + SetLastError(0xdeadbeef); + atom_id = FindAtomW(L"my_cool_clipboard_format"); + ok(atom_id == 0, "FindAtomA should fail\n"); + test_last_error(ERROR_FILE_NOT_FOUND); + + ok(!GetClipboardFormatNameW(1, buf, 256), "GetClipboardFormatNameA should fail\n"); + + ret = OpenClipboard(0); + ok( ret, "OpenClipboard error %ld\n", GetLastError()); + + trace("# of formats available: %d\n", CountClipboardFormats()); + + format_id = 0; + while ((format_id = EnumClipboardFormats(format_id))) + { + ok(IsClipboardFormatAvailable(format_id), "format %04x was listed as available\n", format_id); + len = GetClipboardFormatNameW(format_id, buf, 256); + trace("%04x: %S\n", format_id, len ? buf : L""); + } + + ret = EmptyClipboard(); + ok(ret, "EmptyClipboard error %ld\n", GetLastError()); + ret = CloseClipboard(); + ok(ret, "CloseClipboard error %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!EmptyClipboard(), "EmptyClipboard should fail if clipboard wasn't open\n"); + test_last_error(ERROR_CLIPBOARD_NOT_OPEN); + + DWORD asn = GetClipboardSequenceNumber(); + ok(asn == sn + 9, "GetClipboardSequenceNumber() returns %d, not %d\n", (int)asn, (int)sn + 9); +} + START_TEST(clipboard) { @@ -191,6 +389,16 @@ FindAtomW(NULL); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) is_win9x = TRUE; + sn = GetClipboardSequenceNumber(); + trace("Current Secuence Number: %d\n", (int)sn); + test_RegisterClipboardFormatA(); test_ClipboardOwner(); -} + test_EnumClipboardFormats(); + test_Owner(); + test_RegisterClipboardFormatW(); + + /* + ok(0, "GetClipboardSequenceNumber() returns 0x%x\n", GetClipboardSequenceNumber()); + */ +}

1 0

[hpoussin] 23812: Add msi_ros.diff
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Wed Aug 30 23:41:09 2006 New Revision: 23812 URL: http://svn.reactos.org/svn/reactos?rev=23812&view=rev Log: Add msi_ros.diff Added: trunk/reactos/dll/win32/msi/msi_ros.diff Modified: trunk/reactos/dll/win32/msi/alter.c (contents, props changed) trunk/reactos/dll/win32/msi/msi_main.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… Added: trunk/reactos/dll/win32/msi/msi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_ros.diff…

1 0

[pborobia] 23811: shel32.dll part: * Clipboard implemtation in win32k and user32 * Added a clipboard system for each Window Station * GetLastInputInfo implementation * GetLayout in win32k Stubs * Shell32 changes to cut/copy & paste link/paste * Implemented ALT+PrintScreen to clipboard
by pborobia＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: pborobia Date: Wed Aug 30 23:35:54 2006 New Revision: 23811 URL: http://svn.reactos.org/svn/reactos?rev=23811&view=rev Log: shel32.dll part: * Clipboard implemtation in win32k and user32 * Added a clipboard system for each Window Station * GetLastInputInfo implementation * GetLayout in win32k Stubs * Shell32 changes to cut/copy & paste link/paste * Implemented ALT+PrintScreen to clipboard Modified: trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shlfileop.c trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Wed Aug 30 23:35:54 2006 @@ -148,6 +148,8 @@ BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI); BOOL SHELL_DeleteFileA(LPCSTR pszFile, BOOL bShowUI); BOOL SHELL_ConfirmDialog(int nKindOfDialog, LPCSTR szDir); +DWORD SHNotifyMoveFileA(LPCSTR src, LPCSTR dest); +DWORD SHNotifyCopyFileA(LPCSTR src, LPCSTR dest, BOOL bFailIfExists); /* 16-bit functions */ void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c Wed Aug 30 23:35:54 2006 @@ -1154,6 +1154,8 @@ return hres; } +extern BOOL fileMoving; + /**************************************************************************** * ISFHelper_fnDeleteItems * @@ -1168,7 +1170,7 @@ BOOL bConfirm = TRUE; TRACE ("(%p)(%u %p)\n", This, cidl, apidl); - + /* deleting multiple items so give a slightly different warning */ if (cidl != 1) { char tmp[8]; @@ -1178,7 +1180,7 @@ return E_FAIL; bConfirm = FALSE; } - + for (i = 0; i < cidl; i++) { strcpy (szPath, This->sPathTarget); PathAddBackslashA (szPath); @@ -1236,7 +1238,8 @@ LPITEMIDLIST pidl; if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { - for (i = 0; i < cidl; i++) { + for (i = 0; i < cidl; i++) + { SHGetPathFromIDListA (pidl, szSrcPath); PathAddBackslashA (szSrcPath); _ILSimpleGetText (apidl[i], szSrcPath + strlen (szSrcPath), @@ -1244,9 +1247,43 @@ strcpy (szDstPath, This->sPathTarget); PathAddBackslashA (szDstPath); - _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), - MAX_PATH); - MESSAGE ("would copy %s to %s\n", szSrcPath, szDstPath); + _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), MAX_PATH); + DPRINT1 ("copy %s to %s\n", szSrcPath, szDstPath); + + if (fileMoving) + { + fileMoving = FALSE; + SHNotifyMoveFileA(szSrcPath, szDstPath); + } + else + { + SHNotifyCopyFileA(szSrcPath, szDstPath, TRUE); + } + + /* + SHFILEOPSTRUCTA op; + + if (fileMoving) + { + op.wFunc = FO_MOVE; + fileMoving = FALSE; + } + else + { + op.wFunc = FO_COPY; + } + + op.pTo = szDstPath; + op.pFrom = szSrcPath; + op.fFlags = FOF_SIMPLEPROGRESS; + op.hwnd = NULL; + op.hNameMappings = NULL; + op.lpszProgressTitle = NULL; + + UINT bRes = SHFileOperationA(&op); + DbgPrint("CopyItems SHFileOperationA 0x%08x\n", bRes); + */ + } SHFree (pidl); } @@ -1558,9 +1595,11 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyState, POINTL pt, DWORD * pdwEffect) { + DWORD dwEffect = *pdwEffect; + IGenericSFImpl *This = impl_from_IDropTarget(iface); - FIXME ("(%p) object dropped\n", This); + FIXME ("(%p) object dropped(%d)\n", This, dwKeyState); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c Wed Aug 30 23:35:54 2006 @@ -478,6 +478,65 @@ return GetLastError(); } +DWORD SHNotifyMoveFileA(LPCSTR src, LPCSTR dest) +{ + BOOL ret; + LPWSTR destW; + + ret = MoveFileA(src, dest); + if (!ret) + { + DWORD dwAttr; + + SHELL32_AnsiToUnicodeBuf(dest, &destW, 0); + dwAttr = SHFindAttrW(destW, FALSE); + SHELL32_FreeUnicodeBuf(destW); + if (INVALID_FILE_ATTRIBUTES == dwAttr) + { + /* Source file may be write protected or a system file */ + dwAttr = GetFileAttributesA(src); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesA(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = MoveFileA(src, dest); + } + } + if (ret) + { + //SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHA, src, dest); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHA, dest, NULL); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHA, src, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); +} + +/************************************************************************ + * SHNotifyCopyFile [internal] + * + * Copies a file. Also triggers a change notify if one exists. + * + * PARAMS + * src [I] path to source file to move + * dest [I] path to target file to move to + * bFailIfExists [I] if TRUE, the target file will not be overwritten if + * a file with this name already exists + * + * RETURNS + * ERROR_SUCCESS if successful + */ +DWORD SHNotifyCopyFileA(LPCSTR src, LPCSTR dest, BOOL bFailIfExists) +{ + BOOL ret; + + ret = CopyFileA(src, dest, bFailIfExists); + if (ret) + { + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHA, dest, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); +} + /************************************************************************* * SHCreateDirectory [SHELL32.165] * @@ -649,7 +708,29 @@ } return dwAttr; } - +/* +DWORD SHFindAttrA(LPSTR pName, BOOL fileOnly) +{ + WIN32_FIND_DATAA wfd; + BOOL b_FileMask = fileOnly && (NULL != StrPBrkA(pName, wWildcardChars)); + DWORD dwAttr = INVALID_FILE_ATTRIBUTES; + HANDLE hFind = FindFirstFileA(pName, &wfd); + + if (INVALID_HANDLE_VALUE != hFind) + { + do + { + if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) + continue; + dwAttr = wfd.dwFileAttributes; + break; + } + while (FindNextFileA(hFind, &wfd)); + FindClose(hFind); + } + return dwAttr; +} +*/ /************************************************************************* * * SHFileStrICmp HelperFunction for SHFileOperationW Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Wed Aug 30 23:35:54 2006 @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +extern BOOL fileMoving; + /************************************************************************** * IContextMenu Implementation */ @@ -215,6 +217,198 @@ } } +/***************************************************************************/ +static BOOL DoLink(LPCSTR pSrcFile, LPCSTR pDstFile) +{ + IShellLinkA *psl = NULL; + IPersistFile *pPf = NULL; + HRESULT hres; + WCHAR widelink[MAX_PATH]; + BOOL ret = FALSE; + + CoInitialize(0); + + hres = CoCreateInstance( &CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IShellLinkA, + (LPVOID )&psl); + + if(SUCCEEDED(hres)) { + + hres = IShellLinkA_QueryInterface(psl, &IID_IPersistFile, + (LPVOID *)&pPf); + if(FAILED(hres)) + { + ERR("failed QueryInterface for IPersistFile %08lx\n", hres); + goto fail; + } + + DPRINT1("shortcut point to %s\n", pSrcFile); + + hres = IShellLinkA_SetPath(psl, pSrcFile); + + if(FAILED(hres)) + { + ERR("failed Set{IDList|Path} %08lx\n", hres); + goto fail; + } + + MultiByteToWideChar(CP_ACP, 0, pDstFile, -1, + widelink, MAX_PATH); + + /* create the short cut */ + hres = IPersistFile_Save(pPf, widelink, TRUE); + + if(FAILED(hres)) + { + ERR("failed IPersistFile::Save %08lx\n", hres); + IPersistFile_Release(pPf); + IShellLinkA_Release(psl); + goto fail; + } + + hres = IPersistFile_SaveCompleted(pPf, widelink); + IPersistFile_Release(pPf); + IShellLinkA_Release(psl); + DPRINT1("shortcut %s has been created, result=%08lx\n", + pDstFile, hres); + ret = TRUE; + } + else { + DPRINT1("CoCreateInstance failed, hres=%08lx\n", hres); + } + + fail: + CoUninitialize(); + return ret; +} + +static BOOL MakeLink( + IContextMenu2 *iface) +{ + BgCmImpl *This = (BgCmImpl *)iface; + BOOL bSuccess = FALSE; + IDataObject * pda; + + TRACE("\n"); + + if(SUCCEEDED(OleGetClipboard(&pda))) + { + STGMEDIUM medium; + FORMATETC formatetc; + + TRACE("pda=%p\n", pda); + + /* Set the FORMATETC structure*/ + InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + + /* Get the pidls from IDataObject */ + if(SUCCEEDED(IDataObject_GetData(pda, &formatetc, &medium))) + { + LPITEMIDLIST * apidl; + LPITEMIDLIST pidl; + IShellFolder *psfFrom = NULL, *psfDesktop; + + LPIDA lpcida = GlobalLock(medium.u.hGlobal); + TRACE("cida=%p\n", lpcida); + + apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + + /* bind to the source shellfolder */ + SHGetDesktopFolder(&psfDesktop); + if(psfDesktop) + { + IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); + IShellFolder_Release(psfDesktop); + } + + if (psfFrom) + { + /* get source and destination shellfolder */ + IPersistFolder2 *ppfdst = NULL; + IPersistFolder2 *ppfsrc = NULL; + IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppfdst); + IShellFolder_QueryInterface(psfFrom, &IID_IPersistFolder2, (LPVOID*)&ppfsrc); + + + DPRINT1("[%p,%p]\n",ppfdst,ppfsrc); + + /* do the link/s */ + /* hack to get desktop path */ + if ( (ppfdst && ppfsrc) || (This->bDesktop && ppfsrc) ) + { + + int i; + char szSrcPath[MAX_PATH]; + char szDstPath[MAX_PATH]; + BOOL ret = FALSE; + LPITEMIDLIST pidl2; + char filename[MAX_PATH]; + char linkFilename[MAX_PATH]; + char srcFilename[MAX_PATH]; + + DbgPrint("&&&"); + IPersistFolder2_GetCurFolder(ppfsrc, &pidl2); + SHGetPathFromIDListA (pidl2, szSrcPath); + + if (This->bDesktop) + { + SHGetSpecialFolderLocation(0, CSIDL_DESKTOPDIRECTORY, &pidl2); + SHGetPathFromIDListA (pidl2, szDstPath); + } + else + { + IPersistFolder2_GetCurFolder(ppfdst, &pidl2); + SHGetPathFromIDListA (pidl2, szDstPath); + } + + + for (i = 0; i < lpcida->cidl; i++) + { + _ILSimpleGetText (apidl[i], filename, MAX_PATH); + + DbgPrint("filename %s\n", filename); + + lstrcpyA(linkFilename, szDstPath); + PathAddBackslashA(linkFilename); + //lstrcatA(linkFilename, "Shortcut to "); + lstrcatA(linkFilename, filename); + lstrcatA(linkFilename, ".lnk"); + + DbgPrint("linkFilename %s\n", linkFilename); + + lstrcpyA(srcFilename, szSrcPath); + PathAddBackslashA(srcFilename); + lstrcatA(srcFilename, filename); + + DbgPrint("srcFilename %s\n", srcFilename); + + ret = DoLink(srcFilename, linkFilename); + + if (ret) + { + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHA, linkFilename, NULL); + } + } + + } + if(ppfdst) IPersistFolder2_Release(ppfdst); + if(ppfsrc) IPersistFolder2_Release(ppfsrc); + IShellFolder_Release(psfFrom); + } + + _ILFreeaPidl(apidl, lpcida->cidl); + SHFree(pidl); + + /* release the medium*/ + ReleaseStgMedium(&medium); + } + IDataObject_Release(pda); + } + return bSuccess; + +} /************************************************************************** * DoPaste */ @@ -226,19 +420,19 @@ IDataObject * pda; TRACE("\n"); - + if(SUCCEEDED(OleGetClipboard(&pda))) { STGMEDIUM medium; FORMATETC formatetc; TRACE("pda=%p\n", pda); - + /* Set the FORMATETC structure*/ InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); /* Get the pidls from IDataObject */ - if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) + if(SUCCEEDED(IDataObject_GetData(pda, &formatetc, &medium))) { LPITEMIDLIST * apidl; LPITEMIDLIST pidl; @@ -248,7 +442,7 @@ TRACE("cida=%p\n", lpcida); apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - + /* bind to the source shellfolder */ SHGetDesktopFolder(&psfDesktop); if(psfDesktop) @@ -261,17 +455,28 @@ { /* get source and destination shellfolder */ ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlpdst); + if (This->bDesktop) + { + /* unimplemented*/ + SHGetDesktopFolder(&psfDesktop); + IFSFolder_Constructor(psfDesktop, &IID_ISFHelper, (LPVOID*)&psfhlpdst); + IShellFolder_QueryInterface(psfhlpdst, &IID_ISFHelper, (LPVOID*)&psfhlpdst); + } + else + { + IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlpdst); + } + IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (LPVOID*)&psfhlpsrc); - + + DPRINT1("[%p,%p]\n",psfhlpdst,psfhlpsrc); + /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); - */ } + if(psfhlpdst) ISFHelper_Release(psfhlpdst); if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); IShellFolder_Release(psfFrom); @@ -285,30 +490,7 @@ } IDataObject_Release(pda); } -#if 0 - HGLOBAL hMem; - - OpenClipboard(NULL); - hMem = GetClipboardData(CF_HDROP); - - if(hMem) - { - char * pDropFiles = (char *)GlobalLock(hMem); - if(pDropFiles) - { - int len, offset = sizeof(DROPFILESTRUCT); - - while( pDropFiles[offset] != 0) - { - len = strlen(pDropFiles + offset); - TRACE("%s\n", pDropFiles + offset); - offset += len+1; - } - } - GlobalUnlock(hMem); - } - CloseClipboard(); -#endif + return bSuccess; } @@ -335,7 +517,6 @@ IShellView_GetWindow(lpSV, &hWndSV); } } - if(HIWORD(lpcmi->lpVerb)) { TRACE("%s\n",lpcmi->lpVerb); @@ -371,6 +552,10 @@ case FCIDM_SHVIEW_INSERT: DoPaste(iface); + break; + + case FCIDM_SHVIEW_INSERTLINK: + MakeLink(iface); break; case FCIDM_SHVIEW_PROPERTIES: Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Wed Aug 30 23:35:54 2006 @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* ugly hack for cut&psate files */ +BOOL fileMoving = FALSE; + + /************************************************************************** * IContextMenu Implementation */ @@ -98,7 +102,7 @@ { cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); } - + TRACE("(%p)->()\n",cm); return (IContextMenu2*)cm; @@ -374,9 +378,10 @@ LPDATAOBJECT lpDo; TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut); - + fileMoving = bCut; + /* get the active IShellView */ - if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0))) + if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER, 0, 0))) { if (SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) {

1 0

← Newer
1
2
3
4
5
6
7
...
45
Older →

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 August 2006