November 2010 - Wine-Commits

Andrew Eikum : shell32: Don't fail if the path doesn' t exist in Unix in IShellFolder::ParseDisplayName.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: f324f3c31ef4b0a6b5273aca534c173d68932462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f324f3c31ef4b0a6b5273aca5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 11 15:58:12 2010 -0600 shell32: Don't fail if the path doesn't exist in Unix in IShellFolder::ParseDisplayName. --- dlls/shell32/shfldr_unixfs.c | 25 +++++++++++++++++---- dlls/shell32/tests/shelllink.c | 10 ++------ dlls/shell32/tests/shlfolder.c | 47 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 11f3686..14bf900 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -368,8 +368,8 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { - char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath; - WCHAR wszDrive[] = { '?', ':', '\\', 0 }; + char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, has_failed = 0, mb_path[FILENAME_MAX]; + WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[PATH_MAX], *dospath_end; int cDriveSymlinkLen; TRACE("(pszDosPath=%s, pszCanonicalPath=%p)\n", debugstr_w(pszDosPath), pszCanonicalPath); @@ -388,11 +388,26 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) if (szPath[strlen(szPath)-1] != '/') strcat(szPath, "/"); /* Append the part relative to the drive symbolic link target. */ - pszUnixPath = wine_get_unix_file_name(pszDosPath); - if (!pszUnixPath) return FALSE; + lstrcpyW(dospath, pszDosPath); + dospath_end = dospath + lstrlenW(dospath); + while(!(pszUnixPath = wine_get_unix_file_name(dospath))){ + if(has_failed) + *dospath_end = '/'; + else + has_failed = 1; + while(*dospath_end != '\\' && *dospath_end != '/') + --dospath_end; + *dospath_end = '\0'; + } strcat(szPath, pszUnixPath + cDriveSymlinkLen); HeapFree(GetProcessHeap(), 0, pszUnixPath); - + + if(has_failed && WideCharToMultiByte(CP_UNIXCP, 0, dospath_end + 1, -1, + mb_path, FILENAME_MAX, NULL, NULL) > 0){ + strcat(szPath, "/"); + strcat(szPath, mb_path); + } + /* pCanonicalTail always points to the end of the canonical path constructed * thus far. pPathTail points to the still to be processed part of the input * path. pElement points to the path element currently investigated. diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 1b38b0d..55ba936 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -204,16 +204,14 @@ static void test_get_set(void) /* Test the interaction of SetPath and SetIDList */ tmp_pidl=NULL; r = IShellLinkA_GetIDList(sl, &tmp_pidl); - todo_wine ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); + ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); if (r == S_OK) { BOOL ret; strcpy(buffer,"garbage"); ret = SHGetPathFromIDListA(tmp_pidl, buffer); - todo_wine { ok(ret, "SHGetPathFromIDListA failed\n"); - } if (ret) ok(lstrcmpi(buffer,str)==0, "GetIDList returned '%s'\n", buffer); pILFree(tmp_pidl); @@ -326,11 +324,9 @@ static void test_get_set(void) i=0xdeadbeef; strcpy(buffer,"garbage"); r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); - todo_wine { ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); - } - ok(*buffer=='\0', "GetIconLocation returned '%s'\n", buffer); - ok(i==0, "GetIconLocation returned %d\n", i); + todo_wine ok(*buffer=='\0', "GetIconLocation returned '%s'\n", buffer); + todo_wine ok(i==0, "GetIconLocation returned %d\n", i); str="c:\\nonexistent\\file"; r = IShellLinkA_SetIconLocation(sl, str, 0xbabecafe); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 67a9630..6294c5d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4041,6 +4041,7 @@ static void test_ParseDisplayNamePBC(void) WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; WCHAR adirW[] = {'C',':','\\','f','s','b','d','d','i','r',0}; + WCHAR afileW[] = {'C',':','\\','f','s','b','d','d','i','r','\\','f','i','l','e','.','t','x','t',0}; const HRESULT exp_err = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); IShellFolder *psf; @@ -4067,6 +4068,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, adirW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afileW, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* fails on unknown dir with IBindCtx with no IFileSystemBindData */ hres = CreateBindCtx(0, &pbc); @@ -4075,6 +4079,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* unknown dir with IBindCtx with IFileSystemBindData */ hres = IBindCtx_RegisterObjectParam(pbc, wFileSystemBindData, (IUnknown*)&fsbd); @@ -4091,6 +4098,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afileW); + ILFree(pidl); + } + /* set FIND_DATA struct to NULLs */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_nul; @@ -4102,6 +4117,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afileW); + ILFree(pidl); + } + /* set FIND_DATA struct to junk */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_junk; @@ -4113,6 +4136,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afileW); + ILFree(pidl); + } + /* set FIND_DATA struct to invalid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_invalid; @@ -4124,6 +4155,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afileW); + ILFree(pidl); + } + /* set FIND_DATA struct to valid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_valid; @@ -4135,6 +4174,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afileW); + ILFree(pidl); + } + IBindCtx_Release(pbc); IShellFolder_Release(psf); }

1 0

Andrew Eikum : shell32: Don't search Path or PIDL for an icon in IShellLink ::GetIconLocation.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: d66317605d2744a409db65170490243e1fffbf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66317605d2744a409db65170… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 11 15:58:37 2010 -0600 shell32: Don't search Path or PIDL for an icon in IShellLink::GetIconLocation. Try as I might, I couldn't get a path out of GetIconLocation that wasn't put there via SetIconLocation. As far as I can tell, the code here was based on nothing. --- dlls/shell32/shelllink.c | 126 +-------------------------------------- dlls/shell32/tests/shelllink.c | 64 ++++++++++++++++++++- 2 files changed, 66 insertions(+), 124 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index a052a18..b4a977a 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1593,78 +1593,19 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA * iface, INT iShowCmd return NOERROR; } -static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, - LPSTR pszIconPath, int cchIconPath, int* piIcon) -{ - LPCITEMIDLIST pidlLast; - - HRESULT hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psf, &pidlLast); - - if (SUCCEEDED(hr)) { - IExtractIconA* pei; - - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); - - if (SUCCEEDED(hr)) { - hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); - - IExtractIconA_Release(pei); - } - - IShellFolder_Release(psf); - } - - return hr; -} - static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA * iface, LPSTR pszIconPath,INT cchIconPath,INT *piIcon) { IShellLinkImpl *This = (IShellLinkImpl *)iface; TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon); - pszIconPath[0] = 0; *piIcon = This->iIcoNdx; if (This->sIcoPath) - { WideCharToMultiByte(CP_ACP, 0, This->sIcoPath, -1, pszIconPath, cchIconPath, NULL, NULL); - return S_OK; - } - - if (This->pPidl || This->sPath) - { - IShellFolder* pdsk; - - HRESULT hr = SHGetDesktopFolder(&pdsk); - - if (SUCCEEDED(hr)) - { - /* first look for an icon using the PIDL (if present) */ - if (This->pPidl) - hr = SHELL_PidlGeticonLocationA(pdsk, This->pPidl, pszIconPath, cchIconPath, piIcon); - else - hr = E_FAIL; - - /* if we couldn't find an icon yet, look for it using the file system path */ - if (FAILED(hr) && This->sPath) - { - LPITEMIDLIST pidl; - - hr = IShellFolder_ParseDisplayName(pdsk, 0, NULL, This->sPath, NULL, &pidl, NULL); - - if (SUCCEEDED(hr)) { - hr = SHELL_PidlGeticonLocationA(pdsk, pidl, pszIconPath, cchIconPath, piIcon); - - SHFree(pidl); - } - } - - IShellFolder_Release(pdsk); - } + else + pszIconPath[0] = 0; - return hr; - } return S_OK; } @@ -1984,78 +1925,19 @@ static HRESULT WINAPI IShellLinkW_fnSetShowCmd(IShellLinkW * iface, INT iShowCmd return S_OK; } -static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, - LPWSTR pszIconPath, int cchIconPath, int* piIcon) -{ - LPCITEMIDLIST pidlLast; - - HRESULT hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psf, &pidlLast); - - if (SUCCEEDED(hr)) { - IExtractIconW* pei; - - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); - - if (SUCCEEDED(hr)) { - hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); - - IExtractIconW_Release(pei); - } - - IShellFolder_Release(psf); - } - - return hr; -} - static HRESULT WINAPI IShellLinkW_fnGetIconLocation(IShellLinkW * iface, LPWSTR pszIconPath,INT cchIconPath,INT *piIcon) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon); - pszIconPath[0] = 0; *piIcon = This->iIcoNdx; if (This->sIcoPath) - { lstrcpynW(pszIconPath, This->sIcoPath, cchIconPath); - return S_OK; - } - - if (This->pPidl || This->sPath) - { - IShellFolder* pdsk; - - HRESULT hr = SHGetDesktopFolder(&pdsk); - - if (SUCCEEDED(hr)) - { - /* first look for an icon using the PIDL (if present) */ - if (This->pPidl) - hr = SHELL_PidlGeticonLocationW(pdsk, This->pPidl, pszIconPath, cchIconPath, piIcon); - else - hr = E_FAIL; - - /* if we couldn't find an icon yet, look for it using the file system path */ - if (FAILED(hr) && This->sPath) - { - LPITEMIDLIST pidl; - - hr = IShellFolder_ParseDisplayName(pdsk, 0, NULL, This->sPath, NULL, &pidl, NULL); - - if (SUCCEEDED(hr)) - { - hr = SHELL_PidlGeticonLocationW(pdsk, pidl, pszIconPath, cchIconPath, piIcon); - - SHFree(pidl); - } - } + else + pszIconPath[0] = 0; - IShellFolder_Release(pdsk); - } - return hr; - } return S_OK; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 55ba936..2277e5e 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -325,8 +325,8 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); - todo_wine ok(*buffer=='\0', "GetIconLocation returned '%s'\n", buffer); - todo_wine ok(i==0, "GetIconLocation returned %d\n", i); + ok(*buffer=='\0', "GetIconLocation returned '%s'\n", buffer); + ok(i==0, "GetIconLocation returned %d\n", i); str="c:\\nonexistent\\file"; r = IShellLinkA_SetIconLocation(sl, str, 0xbabecafe); @@ -868,6 +868,65 @@ static void test_shdefextracticon(void) ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); } +static void test_GetIconLocation(void) +{ + IShellLinkA *sl; + const char *str; + char buffer[INFOTIPSIZE], mypath[MAX_PATH]; + int i; + HRESULT r; + LPITEMIDLIST pidl; + + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkA, (LPVOID*)&sl); + ok(r == S_OK, "no IID_IShellLinkA (0x%08x)\n", r); + if(r != S_OK) + return; + + i = 0xdeadbeef; + strcpy(buffer, "garbage"); + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(*buffer == '\0', "GetIconLocation returned '%s'\n", buffer); + ok(i == 0, "GetIconLocation returned %d\n", i); + + str = "c:\\some\\path"; + r = IShellLinkA_SetPath(sl, str); + ok(r == S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + + i = 0xdeadbeef; + strcpy(buffer, "garbage"); + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(*buffer == '\0', "GetIconLocation returned '%s'\n", buffer); + ok(i == 0, "GetIconLocation returned %d\n", i); + + GetWindowsDirectoryA(mypath, sizeof(mypath) - 12); + strcat(mypath, "\\regedit.exe"); + pidl = path_to_pidl(mypath); + r = IShellLinkA_SetIDList(sl, pidl); + ok(r == S_OK, "SetPath failed (0x%08x)\n", r); + + i = 0xdeadbeef; + strcpy(buffer, "garbage"); + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(*buffer == '\0', "GetIconLocation returned '%s'\n", buffer); + ok(i == 0, "GetIconLocation returned %d\n", i); + + str = "c:\\nonexistent\\file"; + r = IShellLinkA_SetIconLocation(sl, str, 0xbabecafe); + ok(r == S_OK, "SetIconLocation failed (0x%08x)\n", r); + + i = 0xdeadbeef; + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(lstrcmpi(buffer,str) == 0, "GetIconLocation returned '%s'\n", buffer); + ok(i == 0xbabecafe, "GetIconLocation returned %d'\n", i); + + IShellLinkA_Release(sl); +} + START_TEST(shelllink) { HRESULT r; @@ -891,6 +950,7 @@ START_TEST(shelllink) test_load_save(); test_datalink(); test_shdefextracticon(); + test_GetIconLocation(); CoUninitialize(); }

1 0

Austin Lund : comctl32/tests: Fixed rebar layout tests that depend on system font widths.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: a4a60568a443020e2916a19c6164e7c11b9363b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a60568a443020e2916a19c6… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Nov 12 08:26:28 2010 +1000 comctl32/tests: Fixed rebar layout tests that depend on system font widths. --- dlls/comctl32/tests/rebar.c | 83 ++++++++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4a60568a443020e2916a…

1 0

Nikolay Sivov : msxml3: Fix a ::get_xml() for libxml2 without xmlSaveToBuffer.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 9ec17a841d9a1116f658d24fadae1ba8e4a28beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec17a841d9a1116f658d24fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 11 23:08:33 2010 +0300 msxml3: Fix a ::get_xml() for libxml2 without xmlSaveToBuffer. --- dlls/msxml3/domdoc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e7c15e3..a7e7342 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1281,6 +1281,10 @@ static HRESULT WINAPI domdoc_put_dataType( return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), dataTypeName ); } +static int XMLCALL domdoc_get_xml_writecallback(void *ctx, const char *data, int len) +{ + return xmlBufferAdd((xmlBufferPtr)ctx, (xmlChar*)data, len) == 0 ? len : 0; +} static HRESULT WINAPI domdoc_get_xml( IXMLDOMDocument3 *iface, @@ -1305,7 +1309,8 @@ static HRESULT WINAPI domdoc_get_xml( options = xmldoc_has_decl(get_doc(This)) ? XML_SAVE_NO_DECL : 0; options |= XML_SAVE_FORMAT; - ctxt = xmlSaveToBuffer(buf, "UTF-8", options); + ctxt = xmlSaveToIO(domdoc_get_xml_writecallback, NULL, buf, "UTF-8", options); + if(!ctxt) { xmlBufferFree(buf);

1 0

Alexandre Julliard : ole32: Get rid of the ICOM_THIS_MULTI macro.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 54bf38575e85920f892e1fbea4c02832fd4ece33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bf38575e85920f892e1fbea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 20:16:59 2010 +0100 ole32: Get rid of the ICOM_THIS_MULTI macro. --- dlls/ole32/compobj_private.h | 23 --------------------- dlls/ole32/marshal.c | 45 +++++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 076d845..a00bdc9 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -120,27 +120,6 @@ struct ifproxy IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */ }; -/* imported object / proxy manager */ -struct proxy_manager -{ - const IMultiQIVtbl *lpVtbl; - const IMarshalVtbl *lpVtblMarshal; - const IClientSecurityVtbl *lpVtblCliSec; - struct apartment *parent; /* owning apartment (RO) */ - struct list entry; /* entry in apartment (CS parent->cs) */ - OXID oxid; /* object exported ID (RO) */ - OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ - OID oid; /* object ID (RO) */ - struct list interfaces; /* imported interfaces (CS cs) */ - LONG refs; /* proxy reference count (LOCK) */ - CRITICAL_SECTION cs; /* thread safety for this object and children */ - ULONG sorflags; /* STDOBJREF flags (RO) */ - IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ - HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ - MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ - void *dest_context_data; /* reserved context value (LOCK) */ -}; - struct apartment { struct list entry; @@ -297,8 +276,6 @@ static inline GUID COM_CurrentCausalityId(void) return info->causality_id; } -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - /* helpers for debugging */ # define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) # define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d14516f..ab1d332 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -52,6 +52,37 @@ extern const CLSID CLSID_DfMarshal; * when the proxy disconnects or is destroyed */ #define SORFP_NOLIFETIMEMGMT SORF_OXRES2 +/* imported object / proxy manager */ +struct proxy_manager +{ + const IMultiQIVtbl *lpVtbl; + const IMarshalVtbl *lpVtblMarshal; + const IClientSecurityVtbl *lpVtblCliSec; + struct apartment *parent; /* owning apartment (RO) */ + struct list entry; /* entry in apartment (CS parent->cs) */ + OXID oxid; /* object exported ID (RO) */ + OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + OID oid; /* object ID (RO) */ + struct list interfaces; /* imported interfaces (CS cs) */ + LONG refs; /* proxy reference count (LOCK) */ + CRITICAL_SECTION cs; /* thread safety for this object and children */ + ULONG sorflags; /* STDOBJREF flags (RO) */ + IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ + HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ + MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ + void *dest_context_data; /* reserved context value (LOCK) */ +}; + +static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) +{ + return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblMarshal)); +} + +static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) +{ + return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblCliSec)); +} + static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, @@ -352,19 +383,19 @@ static HRESULT WINAPI StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwR static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); + struct proxy_manager *This = impl_from_IMarshal( iface ); return IMultiQI_QueryInterface((IMultiQI *)&This->lpVtbl, riid, ppvObject); } static ULONG WINAPI Proxy_AddRef(IMarshal *iface) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); + struct proxy_manager *This = impl_from_IMarshal( iface ); return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); } static ULONG WINAPI Proxy_Release(IMarshal *iface) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); + struct proxy_manager *This = impl_from_IMarshal( iface ); return IMultiQI_Release((IMultiQI *)&This->lpVtbl); } @@ -372,7 +403,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); + struct proxy_manager *This = impl_from_IMarshal( iface ); HRESULT hr; struct ifproxy *ifproxy; @@ -497,19 +528,19 @@ static const IMarshalVtbl ProxyMarshal_Vtbl = static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + struct proxy_manager *This = impl_from_IClientSecurity( iface ); return IMultiQI_QueryInterface((IMultiQI *)&This->lpVtbl, riid, ppvObject); } static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + struct proxy_manager *This = impl_from_IClientSecurity( iface ); return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); } static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface) { - ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + struct proxy_manager *This = impl_from_IClientSecurity( iface ); return IMultiQI_Release((IMultiQI *)&This->lpVtbl); }

1 0

Alexandre Julliard : avifil32: Fix the multiple inheritance implementation of edit streams.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 469c55350c67e12ffa9228e4d5b9454178e998c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469c55350c67e12ffa9228e4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 20:07:13 2010 +0100 avifil32: Fix the multiple inheritance implementation of edit streams. --- dlls/avifil32/avifile_private.h | 1 - dlls/avifil32/editstream.c | 191 ++++++++++----------------------------- 2 files changed, 50 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=469c55350c67e12ffa922…

1 0

Alexandre Julliard : oleaut32: Get rid of the ICOM_THIS_MULTI macro.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 6682d86e156fb9b222c781ab92031890b2cb50d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6682d86e156fb9b222c781ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 20:10:33 2010 +0100 oleaut32: Get rid of the ICOM_THIS_MULTI macro. --- dlls/oleaut32/tmarshal.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index bfe17c8..9f0145d 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -54,8 +54,6 @@ static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(olerelay); -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - static HRESULT TMarshalDispatchChannel_Create( IRpcChannelBuffer *pDelegateChannel, REFIID tmarshal_riid, IRpcChannelBuffer **ppChannel); @@ -405,6 +403,11 @@ typedef struct _TMProxyImpl { IRpcProxyBuffer *dispatch_proxy; } TMProxyImpl; +static inline TMProxyImpl *impl_from_IRpcProxyBuffer( IRpcProxyBuffer *iface ) +{ + return (TMProxyImpl *)((char*)iface - FIELD_OFFSET(TMProxyImpl, lpvtbl2)); +} + static HRESULT WINAPI TMProxyImpl_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *ppv) { @@ -421,7 +424,7 @@ TMProxyImpl_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *ppv) static ULONG WINAPI TMProxyImpl_AddRef(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(TMProxyImpl,lpvtbl2,iface); + TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface ); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -432,7 +435,7 @@ TMProxyImpl_AddRef(LPRPCPROXYBUFFER iface) static ULONG WINAPI TMProxyImpl_Release(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(TMProxyImpl,lpvtbl2,iface); + TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface ); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -455,7 +458,7 @@ static HRESULT WINAPI TMProxyImpl_Connect( LPRPCPROXYBUFFER iface,IRpcChannelBuffer* pRpcChannelBuffer) { - ICOM_THIS_MULTI(TMProxyImpl, lpvtbl2, iface); + TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface ); TRACE("(%p)\n", pRpcChannelBuffer); @@ -483,7 +486,7 @@ TMProxyImpl_Connect( static void WINAPI TMProxyImpl_Disconnect(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(TMProxyImpl, lpvtbl2, iface); + TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface ); TRACE("()\n");

1 0

Alexandre Julliard : rpcrt4: Get rid of the ICOM_THIS_MULTI macro.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: dc9b648fcb587ddd9778f819f6641bbd5e04d226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9b648fcb587ddd9778f819f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 20:21:57 2010 +0100 rpcrt4: Get rid of the ICOM_THIS_MULTI macro. --- dlls/rpcrt4/cproxy.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b07dd7c..6bf0a43 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -58,7 +58,10 @@ typedef struct { static const IRpcProxyBufferVtbl StdProxy_Vtbl; -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) +static inline StdProxyImpl *impl_from_proxy_obj( void *iface ) +{ + return (StdProxyImpl *)((char*)iface - FIELD_OFFSET(StdProxyImpl, PVtbl)); +} #if defined(__i386__) @@ -229,7 +232,7 @@ HRESULT StdProxy_Construct(REFIID riid, static void StdProxy_Destruct(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; if (This->pChannel) IRpcProxyBuffer_Disconnect(iface); @@ -245,7 +248,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *obj) { - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); if (IsEqualGUID(&IID_IUnknown,riid) || @@ -266,7 +269,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; TRACE("(%p)->AddRef()\n",This); return InterlockedIncrement(&This->RefCount); @@ -275,7 +278,7 @@ static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) { ULONG refs; - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; TRACE("(%p)->Release()\n",This); refs = InterlockedDecrement(&This->RefCount); @@ -287,7 +290,7 @@ static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, LPRPCCHANNELBUFFER pChannel) { - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; TRACE("(%p)->Connect(%p)\n",This,pChannel); This->pChannel = pChannel; @@ -298,7 +301,7 @@ static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface) { - ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); + StdProxyImpl *This = (StdProxyImpl *)iface; TRACE("(%p)->Disconnect()\n",This); if (This->base_proxy) IRpcProxyBuffer_Disconnect( This->base_proxy ); @@ -319,7 +322,7 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl = static void StdProxy_GetChannel(LPVOID iface, LPRPCCHANNELBUFFER *ppChannel) { - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->GetChannel(%p) %s\n",This,ppChannel,This->name); *ppChannel = This->pChannel; @@ -328,7 +331,7 @@ static void StdProxy_GetChannel(LPVOID iface, static void StdProxy_GetIID(LPVOID iface, const IID **ppiid) { - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->GetIID(%p) %s\n",This,ppiid,This->name); *ppiid = This->piid; @@ -338,21 +341,21 @@ HRESULT WINAPI IUnknown_QueryInterface_Proxy(LPUNKNOWN iface, REFIID riid, LPVOID *ppvObj) { - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->QueryInterface(%s,%p) %s\n",This,debugstr_guid(riid),ppvObj,This->name); return IUnknown_QueryInterface(This->pUnkOuter,riid,ppvObj); } ULONG WINAPI IUnknown_AddRef_Proxy(LPUNKNOWN iface) { - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->AddRef() %s\n",This,This->name); return IUnknown_AddRef(This->pUnkOuter); } ULONG WINAPI IUnknown_Release_Proxy(LPUNKNOWN iface) { - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->Release() %s\n",This,This->name); return IUnknown_Release(This->pUnkOuter); }

1 0

Vitaliy Margolen : ntdll: Mask invalid flags for RtlQueueWorkItem.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: aafa74908b64bbcd18a814fd94640c39aa159605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafa74908b64bbcd18a814fd9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Nov 11 08:31:56 2010 -0700 ntdll: Mask invalid flags for RtlQueueWorkItem. --- dlls/ntdll/threadpool.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 44afb01..1a10240 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -447,7 +447,9 @@ NTSTATUS WINAPI RtlRegisterWait(PHANDLE NewWaitObject, HANDLE Object, return status; } - status = RtlQueueWorkItem( wait_thread_proc, wait_work_item, Flags & ~WT_EXECUTEONLYONCE ); + Flags = Flags & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINPERSISTENTTHREAD | + WT_EXECUTELONGFUNCTION | WT_TRANSFER_IMPERSONATION); + status = RtlQueueWorkItem( wait_thread_proc, wait_work_item, Flags ); if (status != STATUS_SUCCESS) { delete_wait_work_item( wait_work_item );

1 0

Alexandre Julliard : krnl386.exe: Propagate DOS startup errors up to winevdm.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 173957d294253112c55fd3202225859e0f6c65aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=173957d294253112c55fd3202… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 18:01:05 2010 +0100 krnl386.exe: Propagate DOS startup errors up to winevdm. --- dlls/krnl386.exe16/dosexe.c | 37 +++++++++++++------------------------ programs/winevdm/winevdm.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index 55735f3..ff55326 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -114,7 +114,7 @@ static WORD init_cs,init_ip,init_ss,init_sp; static HANDLE dosvm_thread, loop_thread; static DWORD dosvm_tid, loop_tid; -static void MZ_Launch( LPCSTR cmdtail, int length ); +static DWORD MZ_Launch( LPCSTR cmdtail, int length ); static BOOL MZ_InitTask(void); static void MZ_CreatePSP( LPVOID lpPSP, WORD env, WORD par ) @@ -433,8 +433,12 @@ void __wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline ) } } - if (MZ_DoLoadImage( hFile, filename, NULL, 0 )) - MZ_Launch( dos_cmdtail, dos_length ); + if (MZ_DoLoadImage( hFile, filename, NULL, 0 )) + { + DWORD err = MZ_Launch( dos_cmdtail, dos_length ); + /* if we get back here it failed */ + SetLastError( err ); + } } /*********************************************************************** @@ -633,24 +637,9 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) context.EFlags = V86_FLAG | VIF_MASK; DOSVM_SetTimer(0x10000); ret = DOSVM_Enter( &context ); - if (ret == -1) - { - /* fetch the app name from the environment */ - PDB16 *psp = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); - char *env = PTR_REAL_TO_LIN( psp->environment, 0 ); - while (*env) env += strlen(env) + 1; - env += 1 + sizeof(WORD); - - if (GetLastError() == ERROR_NOT_SUPPORTED) - MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n" - " Try running the application with DOSBox.\n", - debugstr_a(env) ); - else - FIXME( "vm86 mode failed error %u\n", GetLastError() ); - } + if (ret == -1) ret = GetLastError(); dosvm_pid = 0; - return ret != 0; + return ret; } static BOOL MZ_InitTask(void) @@ -669,7 +658,7 @@ static BOOL MZ_InitTask(void) return TRUE; } -static void MZ_Launch( LPCSTR cmdtail, int length ) +static DWORD MZ_Launch( LPCSTR cmdtail, int length ) { TDB *pTask = GlobalLock16( GetCurrentTask() ); BYTE *psp_start = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); @@ -696,9 +685,10 @@ static void MZ_Launch( LPCSTR cmdtail, int length ) dosvm_thread = 0; dosvm_tid = 0; CloseHandle(loop_thread); loop_thread = 0; loop_tid = 0; + if (rv) return rv; VGA_Clean(); - ExitProcess(rv); + ExitProcess(0); } /*********************************************************************** @@ -756,8 +746,7 @@ BOOL MZ_Current( void ) */ void __wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline ) { - FIXME("DOS executables not supported on this platform\n"); - SetLastError(ERROR_BAD_FORMAT); + SetLastError( ERROR_NOT_SUPPORTED ); } /*********************************************************************** diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 92ca508..65f4bf2 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -102,6 +102,30 @@ typedef struct { #include "poppack.h" /*********************************************************************** + * start_dos_exe + */ +static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) +{ + MEMORY_BASIC_INFORMATION mem_info; + const char *reason; + + if (VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) && mem_info.State != MEM_FREE) + { + __wine_load_dos_exe( filename, cmdline ); + if (GetLastError() == ERROR_NOT_SUPPORTED) + reason = "because vm86 mode is not supported on this platform"; + else + reason = wine_dbg_sprintf( "It failed with error code %u", GetLastError() ); + } + else reason = "because the DOS memory range is unavailable"; + + WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", filename ); + WINE_MESSAGE( " %s.\n", reason ); + WINE_MESSAGE( " Try running this application with DOSBox.\n" ); + ExitProcess(1); +} + +/*********************************************************************** * read_pif_file *pif386rec_tu * Read a pif file and return the header and possibly the 286 (real mode) @@ -244,8 +268,7 @@ static VOID pif_cmd( char *filename, char *cmdline) * - hot key's * - etc. */ - __wine_load_dos_exe( progpath, cmdline ); - return; + start_dos_exe( progpath, cmdline ); } /*********************************************************************** @@ -382,7 +405,6 @@ int main( int argc, char *argv[] ) STARTUPINFOA info; char *cmdline, *appname, **first_arg; char *p; - MEMORY_BASIC_INFORMATION mem_info; if (!argv[1]) usage(); @@ -439,15 +461,9 @@ int main( int argc, char *argv[] ) pif_cmd( appname, cmdline + 1); else { - if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) - { - WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); - ExitProcess(1); - } - /* try DOS format */ /* loader expects arguments to be regular C strings */ - __wine_load_dos_exe( appname, cmdline + 1 ); + start_dos_exe( appname, cmdline + 1 ); } /* if we get back here it failed */ instance = GetLastError();

1 0