Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 75624: [USETUP] Add type 0x96 as "CDFS/ISO-9660" to our list of partition types now that our ISOs flashed to USB use it.
by cfinck＠svn.reactos.org 19 Aug '17

19 Aug '17

Author: cfinck Date: Sat Aug 19 14:53:54 2017 New Revision: 75624 URL: http://svn.reactos.org/svn/reactos?rev=75624&view=rev Log: [USETUP] Add type 0x96 as "CDFS/ISO-9660" to our list of partition types now that our ISOs flashed to USB use it. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Aug 19 14:53:54 2017 @@ -126,6 +126,7 @@ { 0x87, "HPFS or NTFS mirrored" }, { 0x8E, "Linux LVM" }, { 0x93, "Hidden Linux" }, + { 0x96, "CDFS/ISO-9660" }, { 0x9F, "BSD/OS" }, { 0xA0, "Laptop hibernation" }, { 0xA1, "Laptop hibernation" },

1 0

[gadamopoulos] 75623: [SHELL32] -CFSDropTarget: Simplyfy the code path that handles the CFSTR_SHELLIDLIST format. Don't use FOF_MULTIDESTFILES to keep things simple. CORE-13176
by gadamopoulos＠svn.reactos.org 19 Aug '17

19 Aug '17

Author: gadamopoulos Date: Sat Aug 19 11:19:06 2017 New Revision: 75623 URL: http://svn.reactos.org/svn/reactos?rev=75623&view=rev Log: [SHELL32] -CFSDropTarget: Simplyfy the code path that handles the CFSTR_SHELLIDLIST format. Don't use FOF_MULTIDESTFILES to keep things simple. CORE-13176 Modified: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h Modified: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp [iso-8859-1] Sat Aug 19 11:19:06 2017 @@ -30,30 +30,21 @@ * Builds a list of paths like the one used in SHFileOperation from a table of * PIDLs relative to the given base folder */ -WCHAR * -BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls, BOOL bRelative) -{ - WCHAR *pwszPathsList; - WCHAR *pwszListPos; - int iPathLen, i; - - iPathLen = wcslen(wszBasePath); - pwszPathsList = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); - pwszListPos = pwszPathsList; - - for (i = 0; i < cidl; i++) - { - if (!_ILIsFolder(pidls[i]) && !_ILIsValue(pidls[i])) +static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) +{ + WCHAR *pwszPathsList = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); + WCHAR *pwszListPos = pwszPathsList; + + for (int i = 0; i < cidl; i++) + { + FileStructW* pDataW = _ILGetFileStructW(pidls[i]); + if (!pDataW) + { + ERR("Got garbage pidl\n"); continue; - - wcscpy(pwszListPos, wszBasePath); - pwszListPos += iPathLen; - - if (_ILIsFolder(pidls[i]) && bRelative) - continue; - - /* FIXME: abort if path too long */ - _ILSimpleGetTextW(pidls[i], pwszListPos, MAX_PATH - iPathLen); + } + + PathCombineW(pwszListPos, wszBasePath, pDataW->wszName); pwszListPos += wcslen(pwszListPos) + 1; } *pwszListPos = 0; @@ -68,119 +59,42 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) { - CComPtr<IPersistFolder2> ppf2 = NULL; - WCHAR szSrcPath[MAX_PATH]; - WCHAR szTargetPath[MAX_PATH]; - SHFILEOPSTRUCTW op; - LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; - int res, length; + LPWSTR pszSrcList; HRESULT hr; + WCHAR wszTargetPath[MAX_PATH + 1]; + + wcscpy(wszTargetPath, sPathTarget); + //Double NULL terminate. + wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); - hr = pSFFrom->QueryInterface (IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&pidl); - if (FAILED(hr)) - { - return hr; - } - - hr = SHGetPathFromIDListW(pidl, szSrcPath); - SHFree(pidl); - - if (FAILED(hr)) - return hr; - - pszSrc = PathAddBackslashW(szSrcPath); - - wcscpy(szTargetPath, sPathTarget); - pszTarget = PathAddBackslashW(szTargetPath); - - pszSrcList = BuildPathsList(szSrcPath, cidl, apidl, FALSE); - pszTargetList = BuildPathsList(szTargetPath, cidl, apidl, TRUE); - - if (!pszSrcList || !pszTargetList) - { - if (pszSrcList) - HeapFree(GetProcessHeap(), 0, pszSrcList); - - if (pszTargetList) - HeapFree(GetProcessHeap(), 0, pszTargetList); - - SHFree(pidl); - return E_OUTOFMEMORY; - } - - ZeroMemory(&op, sizeof(op)); - if (!pszSrcList[0]) - { - /* remove trailing backslash */ - pszSrc--; - pszSrc[0] = L'\0'; - op.pFrom = szSrcPath; - } - else - { - op.pFrom = pszSrcList; - } - - if (!pszTargetList[0]) - { - /* remove trailing backslash */ - if (pszTarget - szTargetPath > 3) - { - pszTarget--; - pszTarget[0] = L'\0'; - } - else - { - pszTarget[1] = L'\0'; - } - - op.pTo = szTargetPath; - op.fFlags = 0; - } - else - { - op.pTo = pszTargetList; - op.fFlags = FOF_MULTIDESTFILES; - } - op.hwnd = GetActiveWindow(); - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - - res = SHFileOperationW(&op); - - if (res == DE_SAMEFILE) - { - length = wcslen(szTargetPath); - - pszFileName = wcsrchr(pszSrcList, '\\'); - pszFileName++; - - if (LoadStringW(shell32_hInstance, IDS_COPY_OF, pszTarget, MAX_PATH - length)) - { - wcscat(szTargetPath, L" "); - } - - wcscat(szTargetPath, pszFileName); - op.pTo = szTargetPath; - - res = SHFileOperationW(&op); - } - - HeapFree(GetProcessHeap(), 0, pszSrcList); - HeapFree(GetProcessHeap(), 0, pszTargetList); - - if (res) - return E_FAIL; - else - return S_OK; - } - return E_FAIL; + STRRET strretFrom; + hr = pSFFrom->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &strretFrom); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); + ERR("Source file (just the first) = %s, target path = %s\n", debugstr_w(strretFrom.pOleStr), debugstr_w(sPathTarget)); + CoTaskMemFree(strretFrom.pOleStr); + if (!pszSrcList) + return E_OUTOFMEMORY; + + SHFILEOPSTRUCTW op = {0}; + op.pFrom = pszSrcList; + op.pTo = wszTargetPath; + op.hwnd = GetActiveWindow(); + op.wFunc = bCopy ? FO_COPY : FO_MOVE; + op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + + int res = SHFileOperationW(&op); + + HeapFree(GetProcessHeap(), 0, pszSrcList); + + if (res) + return E_FAIL; + else + return S_OK; } CFSDropTarget::CFSDropTarget(): @@ -554,8 +468,7 @@ return E_FAIL; } pszSrcList = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles); - TRACE("Source file (just the first) = %s\n", debugstr_w(pszSrcList)); - TRACE("Target path = %s\n", debugstr_w(wszTargetPath)); + ERR("Source file (just the first) = %s, target path = %s\n", debugstr_w(pszSrcList), debugstr_w(wszTargetPath)); SHFILEOPSTRUCTW op; ZeroMemory(&op, sizeof(op)); Modified: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h [iso-8859-1] Sat Aug 19 11:19:06 2017 @@ -22,8 +22,6 @@ #ifndef _CFSDROPTARGET_H_ #define _CFSDROPTARGET_H_ - -WCHAR *BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls, BOOL bRelative); class CFSDropTarget : public CComObjectRootEx<CComMultiThreadModelNoCS>,

1 0

[gadamopoulos] 75622: [SHELL32] -Simplify the drop target of CRecycleBin to let the data object generate the list of names that can be passed to SHFileOperationW.
by gadamopoulos＠svn.reactos.org 19 Aug '17

19 Aug '17

Author: gadamopoulos Date: Sat Aug 19 11:09:28 2017 New Revision: 75622 URL: http://svn.reactos.org/svn/reactos?rev=75622&view=rev Log: [SHELL32] -Simplify the drop target of CRecycleBin to let the data object generate the list of names that can be passed to SHFileOperationW. Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Sat Aug 19 11:09:28 2017 @@ -1079,98 +1079,18 @@ HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask) { - TRACE("performing delete"); HRESULT hr; - STGMEDIUM medium; FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL); hr = pda->GetData(&formatetc, &medium); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the data into pidl */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - CComPtr<IShellFolder> psfDesktop; - CComPtr<IShellFolder> psfFrom = NULL; - - /* Grab the desktop shell folder */ - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* Find source folder, this is where the clipboard data was copied from */ - if (_ILIsDesktop(pidl)) - { - psfFrom = psfDesktop; - } - else - { - hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); - if (FAILED(hr)) - { - ERR("no IShellFolder\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - } - - STRRET strTemp; - hr = psfFrom->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strTemp); - if (FAILED(hr)) - { - ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return hr; - } - - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strTemp, apidl[0], wszPath, _countof(wszPath)); - if (FAILED(hr)) - { - ERR("StrRetToBufW failed with %x\n", hr); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return hr; - } - - /* Only keep the base path */ - LPWSTR pwszFilename = PathFindFileNameW(wszPath); - *pwszFilename = L'\0'; - - /* Build paths list */ - LPWSTR pwszPaths = BuildPathsList(wszPath, lpcida->cidl, (LPCITEMIDLIST*) apidl, FALSE); - if (!pwszPaths) - { - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); + LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal); + if (!lpdf) + { + ERR("Error locking global\n"); return E_FAIL; } @@ -1178,19 +1098,16 @@ SHFILEOPSTRUCTW FileOp; ZeroMemory(&FileOp, sizeof(FileOp)); FileOp.wFunc = FO_DELETE; - FileOp.pFrom = pwszPaths; + FileOp.pFrom = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles);; if ((fMask & CMIC_MASK_SHIFT_DOWN) == 0) FileOp.fFlags = FOF_ALLOWUNDO; if (SHFileOperationW(&FileOp) != 0) { - ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); + ERR("SHFileOperation failed with 0x%x\n", GetLastError()); hr = E_FAIL; } - HeapFree(GetProcessHeap(), 0, pwszPaths); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); return hr;

1 0

[mjansen] 75621: [WINED3D] Dereference context slightly later, as seen in wine. This prevents some crashes while applications are starting up. (f.e. ANNO1602)
by mjansen＠svn.reactos.org 19 Aug '17

19 Aug '17

Author: mjansen Date: Sat Aug 19 09:51:17 2017 New Revision: 75621 URL: http://svn.reactos.org/svn/reactos?rev=75621&view=rev Log: [WINED3D] Dereference context slightly later, as seen in wine. This prevents some crashes while applications are starting up. (f.e. ANNO1602) Modified: trunk/reactos/dll/directx/wine/wined3d/context.c Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] Sat Aug 19 09:51:17 2017 @@ -2714,12 +2714,14 @@ void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; BYTE *memory; if (!data->buffer_object) return data->addr; + gl_info = context->gl_info; + context_bind_bo(context, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -2742,10 +2744,12 @@ void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; + + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding));

1 0

[cwittich] 75620: [WLANAPI] map rpc to win error codes
by cwittich＠svn.reactos.org 19 Aug '17

19 Aug '17

Author: cwittich Date: Sat Aug 19 06:04:08 2017 New Revision: 75620 URL: http://svn.reactos.org/svn/reactos?rev=75620&view=rev Log: [WLANAPI] map rpc to win error codes Modified: trunk/reactos/dll/win32/wlanapi/main.c Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Sat Aug 19 06:04:08 2017 @@ -32,6 +32,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD +WlanRpcStatusToWinError(RPC_STATUS Status) +{ + switch (Status) + { + case RPC_S_INVALID_BINDING: + case RPC_X_SS_IN_NULL_CONTEXT: + return ERROR_INVALID_HANDLE; + + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: + case RPC_X_BYTE_COUNT_TOO_SMALL: + return ERROR_INVALID_PARAMETER; + + case RPC_X_NULL_REF_POINTER: + return ERROR_INVALID_ADDRESS; + + default: + return (DWORD)Status; + } +} + handle_t __RPC_USER WLANSVC_HANDLE_bind(WLANSVC_HANDLE szMachineName) { @@ -117,7 +138,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -141,7 +162,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -170,7 +191,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -193,7 +214,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -217,7 +238,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -243,7 +264,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -342,7 +363,7 @@ } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwResult = RpcExceptionCode(); + dwResult = WlanRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept;

1 0

[gadamopoulos] 75619: [SHELL32] -CDefaultContextMenu: Correctly differentiate the copy and the cut commands.
by gadamopoulos＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: gadamopoulos Date: Fri Aug 18 17:39:34 2017 New Revision: 75619 URL: http://svn.reactos.org/svn/reactos?rev=75619&view=rev Log: [SHELL32] -CDefaultContextMenu: Correctly differentiate the copy and the cut commands. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Fri Aug 18 17:39:34 2017 @@ -1212,7 +1212,7 @@ break; case FCIDM_SHVIEW_COPY: case FCIDM_SHVIEW_CUT: - Result = DoCopyOrCut(&LocalInvokeInfo, LOWORD(LocalInvokeInfo.lpVerb) == FCIDM_SHVIEW_COPY); + Result = DoCopyOrCut(&LocalInvokeInfo, CmdId == FCIDM_SHVIEW_COPY); break; case FCIDM_SHVIEW_CREATELINK: Result = DoCreateLink(&LocalInvokeInfo);

1 0

[gadamopoulos] 75618: [SHELL32] -CDefViewBckgrndMenu: Fix pasting in the background of a folder.
by gadamopoulos＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: gadamopoulos Date: Fri Aug 18 17:32:20 2017 New Revision: 75618 URL: http://svn.reactos.org/svn/reactos?rev=75618&view=rev Log: [SHELL32] -CDefViewBckgrndMenu: Fix pasting in the background of a folder. Modified: trunk/reactos/dll/win32/shell32/CDefViewBckgrndMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefViewBckgrndMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefViewBckgrndMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefViewBckgrndMenu.cpp [iso-8859-1] Fri Aug 18 17:32:20 2017 @@ -219,6 +219,10 @@ /* The commands that are handled by the def view are forwarded to it */ switch (idCmd) { + case FCIDM_SHVIEW_INSERT: + case FCIDM_SHVIEW_INSERTLINK: + lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd); + return m_folderCM->InvokeCommand(lpcmi); case FCIDM_SHVIEW_BIGICON: case FCIDM_SHVIEW_SMALLICON: case FCIDM_SHVIEW_LISTVIEW:

1 0

[mjansen] 75617: [OLE32] Do not crash on an invalid / empty clipboard. CORE-12302
by mjansen＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: mjansen Date: Fri Aug 18 17:18:46 2017 New Revision: 75617 URL: http://svn.reactos.org/svn/reactos?rev=75617&view=rev Log: [OLE32] Do not crash on an invalid / empty clipboard. CORE-12302 Modified: trunk/reactos/dll/win32/ole32/clipboard.c Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Fri Aug 18 17:18:46 2017 @@ -2018,6 +2018,10 @@ { case WM_RENDERFORMAT: { +#ifdef __REACTOS__ + if (clipbrd->cached_enum) + { +#endif UINT cf = wparam; ole_priv_data_entry *entry; @@ -2026,7 +2030,9 @@ if(entry) render_format(clipbrd->src_data, &entry->fmtetc); - +#ifdef __REACTOS__ + } +#endif break; }

1 0

[gadamopoulos] 75616: [WIN32K] -NtUserEmptyClipboard: Change its behaviour to wait for WM_DESTROYCLIPBOARD to return so it behaves like windows and our ole32 doesn't trip on its assumptions that ev...
by gadamopoulos＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: gadamopoulos Date: Fri Aug 18 17:18:17 2017 New Revision: 75616 URL: http://svn.reactos.org/svn/reactos?rev=75616&view=rev Log: [WIN32K] -NtUserEmptyClipboard: Change its behaviour to wait for WM_DESTROYCLIPBOARD to return so it behaves like windows and our ole32 doesn't trip on its assumptions that everything works fine. A test will be written soon to prove that this is correct. CORE-12302 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Fri Aug 18 17:18:17 2017 @@ -680,7 +680,7 @@ { TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); // For 32-bit applications this message is sent as a notification - co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); + co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); } pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen;

1 0

[bfreisen] 75615: [MSPAINT] Use Gdiplus::Bitmap in place of ATL::CImage to load pictures -- this un-breaks loading a picture's resolution from file
by bfreisen＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: bfreisen Date: Fri Aug 18 17:01:01 2017 New Revision: 75615 URL: http://svn.reactos.org/svn/reactos?rev=75615&view=rev Log: [MSPAINT] Use Gdiplus::Bitmap in place of ATL::CImage to load pictures -- this un-breaks loading a picture's resolution from file Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint/dib.cpp Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Fri Aug 18 17:01:01 2017 @@ -34,6 +34,6 @@ add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) target_link_libraries(mspaint atlnew uuid) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) +add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mspaint/dib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] Fri Aug 18 17:01:01 2017 @@ -83,8 +83,8 @@ void LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { - CImage img; - img.Load(name); // TODO: error handling + using namespace Gdiplus; + Bitmap img(CStringW(name), FALSE); // always use WCHAR string if (!hBitmap) { @@ -92,7 +92,7 @@ return; } - *hBitmap = img.Detach(); + img.GetHBITMAP(Color(255, 255, 255), hBitmap); // update time and size HANDLE hFile = @@ -112,7 +112,9 @@ if (size) *size = GetFileSize(hFile, NULL); - // TODO: update hRes and vRes + // update hRes and vRes + *hRes = (int) (img.GetHorizontalResolution() * 1000 / 25.4); + *vRes = (int) (img.GetVerticalResolution() * 1000 / 25.4); CloseHandle(hFile); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs