Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[pschweitzer] 65613: [NTFS] Ach! Wir können noch nicht mit dem ID öffnen! So far, bail out when we are requested to open a file with its MFT index instead of its name. nfi triggers this a lot. Like...
by pschweitzer＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: pschweitzer Date: Thu Dec 11 22:15:49 2014 New Revision: 65613 URL: http://svn.reactos.org/svn/reactos?rev=65613&view=rev Log: [NTFS] Ach! Wir können noch nicht mit dem ID öffnen! So far, bail out when we are requested to open a file with its MFT index instead of its name. nfi triggers this a lot. Likely to be implemented ;-) CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Thu Dec 11 22:15:49 2014 @@ -186,6 +186,12 @@ return STATUS_INVALID_PARAMETER; } + if (RequestedOptions & FILE_OPEN_BY_FILE_ID) + { + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + FileObject = Stack->FileObject; if (RequestedDisposition == FILE_CREATE ||

1 0

[pschweitzer] 65612: [NTFS] My dear Pierre, in FSCTL_GET_NTFS_FILE_RECORD, you have METHOD_BUFFERED (yes, read well ; -)). So if you want it to work, you HAVE to return the size of the data you wrot...
by pschweitzer＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: pschweitzer Date: Thu Dec 11 21:58:45 2014 New Revision: 65612 URL: http://svn.reactos.org/svn/reactos?rev=65612&view=rev Log: [NTFS] My dear Pierre, in FSCTL_GET_NTFS_FILE_RECORD, you have METHOD_BUFFERED (yes, read well ;-)). So if you want it to work, you HAVE to return the size of the data you wrote to the output buffer... This makes FSCTL_GET_NTFS_FILE_RECORD finally working in ReactOS... nfi.exe finally goes a bit farther, displays some files names and dies. Definitely still needs love. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Dec 11 21:58:45 2014 @@ -650,6 +650,8 @@ ExFreePoolWithTag(FileRecord, TAG_NTFS); + Irp->IoStatus.Information = FIELD_OFFSET(NTFS_FILE_RECORD_OUTPUT_BUFFER, FileRecordBuffer) + DeviceExt->NtfsInfo.BytesPerFileRecord; + return STATUS_SUCCESS; } @@ -699,6 +701,8 @@ Stack = IoGetCurrentIrpStackLocation(Irp); + Irp->IoStatus.Information = 0; + switch (Stack->MinorFunction) { case IRP_MN_KERNEL_CALL: @@ -727,7 +731,6 @@ } Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[gadamopoulos] 65611: [EXPLORER] * Use LoadLibrary instead of GetModuleHandle in the wrapper of WinList_Init. * Shdocvw was never loaded till that point so WinList_Init was not called. * Should fix...
by gadamopoulos＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: gadamopoulos Date: Thu Dec 11 21:18:36 2014 New Revision: 65611 URL: http://svn.reactos.org/svn/reactos?rev=65611&view=rev Log: [EXPLORER] * Use LoadLibrary instead of GetModuleHandle in the wrapper of WinList_Init. * Shdocvw was never loaded till that point so WinList_Init was not called. * Should fix Opening link location in windows. Modified: trunk/reactos/base/shell/explorer/rshell.cpp Modified: trunk/reactos/base/shell/explorer/rshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/rshell… ============================================================================== --- trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] Thu Dec 11 21:18:36 2014 @@ -135,7 +135,7 @@ } } - hFallback = GetModuleHandleW(L"shdocvw.dll"); + hFallback = LoadLibraryW(L"shdocvw.dll"); if (hFallback) {

1 0

[zguo] 65610: [SHIMGVW] Implement rotation of images, but does not save changes or warn of quality loss. CORE-7567
by zguo＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: zguo Date: Thu Dec 11 20:01:52 2014 New Revision: 65610 URL: http://svn.reactos.org/svn/reactos?rev=65610&view=rev Log: [SHIMGVW] Implement rotation of images, but does not save changes or warn of quality loss. CORE-7567 Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu Dec 11 20:01:52 2014 @@ -322,6 +322,13 @@ } static VOID +ImageView_UpdateWindow(HWND hwnd) +{ + InvalidateRect(hwnd, NULL, FALSE); + UpdateWindow(hwnd); +} + +static VOID ImageView_DrawImage(HWND hwnd) { GpGraphics *graphics; @@ -561,9 +568,17 @@ break; case IDC_ROT1: + { + GdipImageRotateFlip(image, Rotate270FlipNone); + ImageView_UpdateWindow(hwnd); + } break; case IDC_ROT2: + { + GdipImageRotateFlip(image, Rotate90FlipNone); + ImageView_UpdateWindow(hwnd); + } break; }

1 0

[zguo] 65609: [CORE-8302] Fix aspect ratio calculation in shell image viewer. Patch by Ricardo Hanke.
by zguo＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: zguo Date: Thu Dec 11 19:57:03 2014 New Revision: 65609 URL: http://svn.reactos.org/svn/reactos?rev=65609&view=rev Log: [CORE-8302] Fix aspect ratio calculation in shell image viewer. Patch by Ricardo Hanke. Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu Dec 11 19:57:03 2014 @@ -352,65 +352,27 @@ { FillRect(hdc, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH)); - if ((rect.right == uImgWidth)&&(rect.bottom == uImgHeight)) - { - x = 0, y = 0, width = rect.right, height = rect.bottom; - } - else if ((rect.right >= uImgWidth)&&(rect.bottom >= uImgHeight)) - { - x = (rect.right/2)-(uImgWidth/2); - y = (rect.bottom/2)-(uImgHeight/2); + if ((rect.right >= uImgWidth)&&(rect.bottom >= uImgHeight)) + { width = uImgWidth; height = uImgHeight; } - else if ((rect.right < uImgWidth)||(rect.bottom < uImgHeight)) - { - if (rect.bottom < uImgHeight) - { - height = rect.bottom; - width = uImgWidth*(UINT)rect.bottom/uImgHeight; - x = (rect.right/2)-(width/2); - y = (rect.bottom/2)-(height/2); - } - if (rect.right < uImgWidth) + else + { + height = uImgHeight * (UINT)rect.right / uImgWidth; + if (height <= rect.bottom) { width = rect.right; - height = uImgHeight*(UINT)rect.right/uImgWidth; - x = (rect.right/2)-(width/2); - y = (rect.bottom/2)-(height/2); } - if ((height > rect.bottom)||(width > rect.right)) + else { - for (;;) - { - if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; - width -= 1; - height -= 1; - y = (rect.bottom/2)-(height/2); - x = (rect.right/2)-(width/2); - if ((height < rect.bottom)&&(width < rect.right)) break; - } + width = uImgWidth * (UINT)rect.bottom / uImgHeight; + height = rect.bottom; } } - else if ((rect.right <= uImgWidth)&&(rect.bottom <= uImgHeight)) - { - height = uImgHeight*(UINT)rect.right/uImgWidth; - y = (rect.bottom/2)-(height/2); - width = rect.right; - - if ((height > rect.bottom)||(width > rect.right)) - { - for (;;) - { - if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; - width -= 1; - height -= 1; - y = (rect.bottom/2)-(height/2); - x = (rect.right/2)-(width/2); - if ((height < rect.bottom)&&(width < rect.right)) break; - } - } - } + + y = (rect.bottom / 2) - (height / 2); + x = (rect.right / 2) - (width / 2); DPRINT("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d\n", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); Rectangle(hdc, x - 1, y - 1, x + width + 1, y + height + 1);

1 0

[zguo] 65608: [CORE-7737] Implement browsing with the shell image viewer. Patch by Ricardo Hanke.
by zguo＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: zguo Date: Thu Dec 11 19:52:47 2014 New Revision: 65608 URL: http://svn.reactos.org/svn/reactos?rev=65608&view=rev Log: [CORE-7737] Implement browsing with the shell image viewer. Patch by Ricardo Hanke. Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/shimgvw/shimgvw.h Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Thu Dec 11 19:52:47 2014 @@ -10,5 +10,5 @@ add_library(shimgvw SHARED ${SOURCE}) set_module_type(shimgvw win32dll) target_link_libraries(shimgvw wine) -add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 msvcrt kernel32 ntdll) +add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET shimgvw DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu Dec 11 19:52:47 2014 @@ -26,6 +26,7 @@ #include <gdiplus.h> #include <tchar.h> #include <strsafe.h> +#include <shlwapi.h> #define NDEBUG #include <debug.h> @@ -35,6 +36,7 @@ HINSTANCE hInstance; SHIMGVW_SETTINGS shiSettings; +SHIMGVW_FILENODE *currentFile; GpImage *image; WNDPROC PrevProc = NULL; @@ -157,6 +159,166 @@ free(szFilterMask); free(codecInfo); +} + +static VOID +pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) +{ + WCHAR szTitleBuf[800]; + WCHAR szResStr[512]; + WCHAR *c; + + if (node) + { + c = wcsrchr(node->FileName, '\\'); + if (c) + { + c++; + } + + LoadStringW(hInstance, IDS_APPTITLE, szResStr, 512); + StringCbPrintfExW(szTitleBuf, 800, NULL, NULL, 0, L"%ls%ls%ls", szResStr, L" - ", c); + SetWindowTextW(hwnd, szTitleBuf); + + if (image) + { + GdipDisposeImage(image); + } + + pLoadImage(node->FileName); + InvalidateRect(hDispWnd, NULL, TRUE); + UpdateWindow(hDispWnd); + } +} + +static SHIMGVW_FILENODE* +pBuildFileList(LPWSTR szFirstFile) +{ + HANDLE hFindHandle; + WCHAR *extension; + WCHAR szSearchPath[MAX_PATH]; + WCHAR szSearchMask[MAX_PATH]; + WCHAR szFileTypes[MAX_PATH]; + WIN32_FIND_DATAW findData; + SHIMGVW_FILENODE *currentNode; + SHIMGVW_FILENODE *root; + SHIMGVW_FILENODE *conductor; + ImageCodecInfo *codecInfo; + UINT num; + UINT size; + UINT j; + + + wcscpy(szSearchPath, szFirstFile); + PathRemoveFileSpecW(szSearchPath); + + GdipGetImageDecodersSize(&num, &size); + codecInfo = malloc(size); + if (!codecInfo) + { + DPRINT1("malloc() failed in pLoadFileList()\n"); + return NULL; + } + + GdipGetImageDecoders(num, size, codecInfo); + + root = malloc(sizeof(SHIMGVW_FILENODE)); + if (!root) + { + DPRINT1("malloc() failed in pLoadFileList()\n"); + free(codecInfo); + return NULL; + } + + conductor = root; + + for (j = 0; j < num; ++j) + { + StringCbPrintfExW(szFileTypes, MAX_PATH, NULL, NULL, 0, L"%ls", codecInfo[j].FilenameExtension); + + extension = wcstok(szFileTypes, L";"); + while (extension != NULL) + { + StringCbPrintfExW(szSearchMask, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", extension); + + hFindHandle = FindFirstFileW(szSearchMask, &findData); + if (hFindHandle != INVALID_HANDLE_VALUE) + { + do + { + StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", findData.cFileName); + + // compare the name of the requested file with the one currently found. + // if the name matches, the current node is returned by the function. + if (wcscmp(szFirstFile, conductor->FileName) == 0) + { + currentNode = conductor; + } + + conductor->Next = malloc(sizeof(SHIMGVW_FILENODE)); + + // if malloc fails, make circular what we have and return it + if (!conductor->Next) + { + DPRINT1("malloc() failed in pLoadFileList()\n"); + + conductor->Next = root; + root->Prev = conductor; + + FindClose(hFindHandle); + free(codecInfo); + return conductor; + } + + conductor->Next->Prev = conductor; + conductor = conductor->Next; + } + while (FindNextFileW(hFindHandle, &findData) != 0); + + FindClose(hFindHandle); + } + + extension = wcstok(NULL, L";"); + } + } + + // we now have a node too much in the list. In case the requested file was not found, + // we use this node to store the name of it, otherwise we free it. + if (currentNode == NULL) + { + StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls", szFirstFile); + currentNode = conductor; + } + else + { + conductor = conductor->Prev; + free(conductor->Next); + } + + // link the last node with the first one to make the list circular + conductor->Next = root; + root->Prev = conductor; + conductor = currentNode; + + free(codecInfo); + + return conductor; +} + +static VOID +pFreeFileList(SHIMGVW_FILENODE *root) +{ + SHIMGVW_FILENODE *conductor; + + root->Prev->Next = NULL; + root->Prev = NULL; + + while (root) + { + conductor = root; + root = conductor->Next; + free(conductor); + } } static VOID @@ -410,9 +572,17 @@ switch (wParam) { case IDC_PREV: + { + currentFile = currentFile->Prev; + pLoadImageFromNode(currentFile, hwnd); + } break; case IDC_NEXT: + { + currentFile = currentFile->Next; + pLoadImageFromNode(currentFile, hwnd); + } break; case IDC_ZOOMP: @@ -522,6 +692,7 @@ ULONG_PTR gdiplusToken; WNDCLASS WndClass = {0}; TCHAR szBuf[512]; + WCHAR szInitialFile[MAX_PATH]; HWND hMainWnd; MSG msg; @@ -560,6 +731,16 @@ CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, hInstance, NULL); + // make sure the path has no quotes on it + wcscpy(szInitialFile, szFileName); + PathUnquoteSpacesW(szInitialFile); + + currentFile = pBuildFileList(szInitialFile); + if (currentFile) + { + pLoadImageFromNode(currentFile, hMainWnd); + } + // Show it ShowWindow(hMainWnd, SW_SHOW); UpdateWindow(hMainWnd); @@ -570,6 +751,8 @@ TranslateMessage(&msg); DispatchMessageW(&msg); } + + pFreeFileList(currentFile); if (image) GdipDisposeImage(image); Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.h [iso-8859-1] Thu Dec 11 19:52:47 2014 @@ -13,3 +13,10 @@ INT Right; INT Bottom; } SHIMGVW_SETTINGS; + +typedef struct SHIMGVW_FILENODE_INTERNAL +{ + WCHAR FileName[MAX_PATH]; + struct SHIMGVW_FILENODE_INTERNAL *Prev; + struct SHIMGVW_FILENODE_INTERNAL *Next; +} SHIMGVW_FILENODE;

1 0

[zguo] 65607: [SHIMGVW] Fix tooltips for image viewer at least on Windows. Patch by Richardo Hanke. CORE-7740 #resolve
by zguo＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: zguo Date: Thu Dec 11 18:11:08 2014 New Revision: 65607 URL: http://svn.reactos.org/svn/reactos?rev=65607&view=rev Log: [SHIMGVW] Fix tooltips for image viewer at least on Windows. Patch by Richardo Hanke. CORE-7740 #resolve Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu Dec 11 18:11:08 2014 @@ -451,6 +451,7 @@ lpttt = (LPTOOLTIPTEXT)lParam; idButton = (UINT)lpttt->hdr.idFrom; + lpttt->hinst = hInstance; switch (idButton) {

1 0

[spetreolle] 65606: test
by spetreolle＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: spetreolle Date: Thu Dec 11 18:00:21 2014 New Revision: 65606 URL: http://svn.reactos.org/svn/reactos?rev=65606&view=rev Log: test Added: trunk/reactos/hello Added: trunk/reactos/hello URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hello?rev=65606 ============================================================================== --- trunk/reactos/hello (added) +++ trunk/reactos/hello [iso-8859-1] Thu Dec 11 18:00:21 2014 @@ -0,0 +1 @@ +hello

1 0

[gadamopoulos] 65605: [EXPLORER] - Simplify some code by using the IUnknown_ exports of shlwapi and using CComPtr.
by gadamopoulos＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: gadamopoulos Date: Thu Dec 11 17:42:56 2014 New Revision: 65605 URL: http://svn.reactos.org/svn/reactos?rev=65605&view=rev Log: [EXPLORER] - Simplify some code by using the IUnknown_ exports of shlwapi and using CComPtr. Modified: trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/tbsite.cpp Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] Thu Dec 11 17:42:56 2014 @@ -272,55 +272,31 @@ virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite) { - HRESULT hRet = E_FAIL; + HRESULT hRet; + HWND hwndSite; TRACE("ITaskBand::SetSite(0x%p)\n", pUnkSite); - /* Release the current site */ - if (m_Site != NULL) - { - m_Site->Release(); - } - - m_Site = NULL; - m_hWnd = NULL; - - if (pUnkSite != NULL) - { - CComPtr<IOleWindow> OleWindow; - - /* Check if the site supports IOleWindow */ - hRet = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow)); - if (SUCCEEDED(hRet)) - { - HWND hWndParent = NULL; - - hRet = OleWindow->GetWindow(&hWndParent); - if (SUCCEEDED(hRet)) - { - /* Attempt to create the task switch window */ - - TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hWndParent); - m_hWnd = CreateTaskSwitchWnd(hWndParent, m_Tray); - if (m_hWnd != NULL) - { - m_Site = pUnkSite; - hRet = S_OK; - } - else - { - TRACE("CreateTaskSwitchWnd() failed!\n"); - hRet = E_FAIL; - } - } - } - else - { - TRACE("Querying IOleWindow failed: 0x%x\n", hRet); - } - } - - return hRet; + hRet = IUnknown_GetWindow(pUnkSite, &hwndSite); + if (FAILED(hRet)) + { + TRACE("Querying site window failed: 0x%x\n", hRet); + return hRet; + } + + TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hwndSite); + + HWND hwndTaskSwitch = CreateTaskSwitchWnd(hwndSite, m_Tray); + if (!hwndTaskSwitch) + { + ERR("CreateTaskSwitchWnd failed"); + return E_FAIL; + } + + m_Site = pUnkSite; + m_hWnd = hwndTaskSwitch; + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE GetSite( Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Thu Dec 11 17:42:56 2014 @@ -350,23 +350,9 @@ virtual HRESULT STDMETHODCALLTYPE AddBand(IN IUnknown *punk) { - IOleCommandTarget *pOct; - HRESULT hRet; - - hRet = punk->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOct)); - if (SUCCEEDED(hRet)) - { - /* Send the DBID_DELAYINIT command to initialize the band to be added */ - /* FIXME: Should be delayed */ - pOct->Exec( - &IID_IDeskBand, - DBID_DELAYINIT, - 0, - NULL, - NULL); - - pOct->Release(); - } + /* Send the DBID_DELAYINIT command to initialize the band to be added */ + /* FIXME: Should be delayed */ + IUnknown_Exec(punk, IID_IDeskBand, DBID_DELAYINIT, 0, NULL, NULL); return m_BandSite->AddBand(punk); }

1 0

[dquintana] 65604: Oops. That didn't happen.
by dquintana＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: dquintana Date: Thu Dec 11 16:33:43 2014 New Revision: 65604 URL: http://svn.reactos.org/svn/reactos?rev=65604&view=rev Log: Oops. That didn't happen. Modified: trunk/reactos/base/shell/explorer/precomp.h Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Dec 11 16:33:43 2014 @@ -1,7 +1,7 @@ #ifndef _EXPLORER_PRECOMP__H_ #define _EXPLORER_PRECOMP__H_ -#define WIN7_COMPAT_MODE 1 +#define WIN7_COMPAT_MODE 0 #include <stdio.h> #include <tchar.h>

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
39
Older →

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 December 2014