December 2010 - Wine-commits

André Hentschel : winemaker: Add calling convention flags.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: d4c50adb72a88aa1dbc287265aff8e30114c7c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c50adb72a88aa1dbc287265… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 23:56:37 2010 +0100 winemaker: Add calling convention flags. --- tools/winemaker | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 484cf72..28fc9bd 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -624,6 +624,13 @@ sub source_scan_project_file($$$) } elsif (/^GX$/) { # Enable Exception Handling $prj_target_cflags.="-fexceptions "; + } elsif (/^Gd$/) { + # use cdecl calling convention (default) + } elsif (/^Gr$/) { + # use fastcall calling convention + } elsif (/^Gz$/) { + # use stdcall calling convention + $prj_target_cflags.="-mrtd "; } elsif (/^Z[d7iI]$/) { # Debug Info $prj_target_cflags.="-g ";

1 0

André Hentschel : include: Increase rpcndr header version.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 3eef4e110cdc2e2c802f92bee81123f469b5c0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eef4e110cdc2e2c802f92bee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 23:57:24 2010 +0100 include: Increase rpcndr header version. --- include/rpcndr.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 159f802..cd93d8e 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -17,8 +17,7 @@ */ #ifndef __RPCNDR_H_VERSION__ -/* FIXME: What version? Perhaps something is better than nothing, however incorrect */ -#define __RPCNDR_H_VERSION__ ( 399 ) +#define __RPCNDR_H_VERSION__ ( 500 ) #endif #ifndef __WINE_RPCNDR_H

1 0

Andrew Bogott : ole32: Revert "ole32: Only read known format ids when attempting to read summary information.".
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: df219f87587ab20487c6d820ed82d698530343b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df219f87587ab20487c6d820e… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Thu Nov 11 03:42:29 2010 -0600 ole32: Revert "ole32: Only read known format ids when attempting to read summary information.". This reverts commit c94b2687d223100300b61628a77fe942e4f42121. --- dlls/ole32/stg_prop.c | 7 ------- dlls/ole32/tests/stg_prop.c | 1 + 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index f887d10..b3362bc 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1314,13 +1314,6 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset); if (FAILED(hr)) goto end; - if (!IsEqualGUID(&fmtOffset.fmtid, &FMTID_DocSummaryInformation) && - !IsEqualGUID(&fmtOffset.fmtid, &FMTID_SummaryInformation)) - { - WARN("not reading unknown fmtid %s\n", debugstr_guid(&fmtOffset.fmtid)); - hr = S_FALSE; - goto end; - } if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) { WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index dff3361..4e5fde7 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -333,6 +333,7 @@ static void testProps(void) hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + todo_wine ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); spec.ulKind = PRSPEC_PROPID;

1 0

Andrew Bogott : ole32: Fix an off-by-one error that broke reading of many properties.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: c75a4fd50a03495d661fdb6751b52d1828a7aabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75a4fd50a03495d661fdb675… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Sat Nov 20 13:43:01 2010 -0600 ole32: Fix an off-by-one error that broke reading of many properties. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b3362bc..65b4b2e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1356,7 +1356,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) i * sizeof(PROPERTYIDOFFSET)); if (idOffset->dwOffset < sizeof(PROPERTYSECTIONHEADER) || - idOffset->dwOffset >= sectionHdr.cbSection - sizeof(DWORD)) + idOffset->dwOffset > sectionHdr.cbSection - sizeof(DWORD)) hr = STG_E_INVALIDPOINTER; else {

1 0

Andrew Bogott : ole32: Fix the test for arbitrary property ids.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 796aca38f073f0e274af4b8ba1ee7910596b37dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=796aca38f073f0e274af4b8ba… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Sat Nov 20 13:47:31 2010 -0600 ole32: Fix the test for arbitrary property ids. --- dlls/ole32/tests/stg_prop.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 4e5fde7..77f0d7c 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -315,13 +315,18 @@ static void testProps(void) spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_FIRST_USABLE; + var.vt = VT_I4; U(var).lVal = 1; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr); + hr = IPropertyStorage_Commit(propertyStorage, STGC_DEFAULT); + ok(hr == S_OK, "Commit failed: 0x%08x\n", hr); + IPropertyStorage_Release(propertyStorage); IPropertySetStorage_Release(propSetStorage); IStorage_Release(storage); + propertyStorage = NULL; /* now open it again */ hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, @@ -333,13 +338,16 @@ static void testProps(void) hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); - todo_wine ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_FIRST_USABLE; hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); - ok(hr == S_FALSE, "ReadMultiple failed: 0x%08x\n", hr); + ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr); + + ok(var.vt == VT_I4 && U(var).lVal == 1, + "Didn't get expected type or value for property (got type %d, value %d)\n", + var.vt, U(var).lVal); IPropertyStorage_Release(propertyStorage); IPropertySetStorage_Release(propSetStorage);

1 0

Jacek Caban : mshtml: Improved error handling in get_node calls.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 6a1f4eb724c8729c4d2f21c7cb3f4ea372d102b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1f4eb724c8729c4d2f21c7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 12:52:08 2010 +0100 mshtml: Improved error handling in get_node calls. --- dlls/mshtml/htmldoc.c | 31 ++++++++------ dlls/mshtml/htmldoc3.c | 24 +++++++---- dlls/mshtml/htmlelemcol.c | 31 ++++++++++++-- dlls/mshtml/htmlevent.c | 24 +++++++---- dlls/mshtml/htmlform.c | 7 ++- dlls/mshtml/htmlnode.c | 96 ++++++++++++++++++++++++++++++++---------- dlls/mshtml/htmloption.c | 9 +++- dlls/mshtml/htmlselect.c | 9 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 5 +- dlls/mshtml/nsembed.c | 7 +++- dlls/mshtml/txtrange.c | 5 ++- 12 files changed, 179 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a1f4eb724c8729c4d2f2…

1 0

Alexander Puzankov : winmm: Revert "Handle playing of files containing a '+ ' as part of the filename.".
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: cc5f2b2c766bbe4975d7ee4a7c3b269650cbf874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5f2b2c766bbe4975d7ee4a7… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Mon Nov 29 21:15:16 2010 +0300 winmm: Revert "Handle playing of files containing a '+' as part of the filename.". This reverts commit ed593fdf2f5e7851cb59aa5a2253f43e33d2f14f. --- dlls/winmm/mmio.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 3f0790d..0ebebf1 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -383,39 +383,40 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) LPSTR extEnd; LPSTR extStart; + CHAR ext[5]; + TRACE("(%s)\n", debugstr_a(szFileName)); if (!szFileName) return ret; - /* Find the last '.' */ - extStart = strrchr(szFileName,'.'); + /* Find the last '+' */ + extEnd = strrchr(szFileName,'+'); - if (!extStart) { - ERR("No . in szFileName: %s\n", debugstr_a(szFileName)); + if (!extEnd) { + /* No + so just an extension */ + return ret; } else { - CHAR ext[5]; + /* Find the first '.' before '+' */ + extStart = extEnd - 1; + while (*extStart != '.') { + if (extStart == szFileName) { + ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); + return ret; + } + extStart--; + } + } - /* Find the '+' afterwards */ - extEnd = strchr(extStart,'+'); - if (extEnd) { + if (extEnd - extStart - 1 > 4) + WARN("Extension length > 4\n"); + lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); - if (extEnd - extStart - 1 > 4) - WARN("Extension length > 4\n"); - lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); + TRACE("Got extension: %s\n", debugstr_a(ext)); - } else { - /* No + so just an extension */ - if (strlen(extStart) > 4) { - WARN("Extension length > 4\n"); - } - lstrcpynA(ext, extStart + 1, 5); - } - TRACE("Got extension: %s\n", debugstr_a(ext)); + /* FOURCC codes identifying file-extensions must be uppercase */ + ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - /* FOURCC codes identifying file-extensions must be uppercase */ - ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - } return ret; }

1 0

Alexander Puzankov : winmm: Use the default I/ O procedure only if a custom procedure for a given FOURCC is not found.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 304c455b2ba8953a421498e5d05730085297ef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304c455b2ba8953a421498e5d… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Mon Nov 29 21:47:26 2010 +0300 winmm: Use the default I/O procedure only if a custom procedure for a given FOURCC is not found. --- dlls/winmm/mmio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 0ebebf1..b090b3f 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -617,13 +617,13 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, if (refmminfo->fccIOProc == 0 && refmminfo->pIOProc == NULL) { wm->info.fccIOProc = MMIO_ParseExtA(szFileName); /* Handle any unhandled/error case. Assume DOS file */ - if (wm->info.fccIOProc == 0) + if (wm->info.fccIOProc == 0) { wm->info.fccIOProc = FOURCC_DOS; - if (!(wm->ioProc = MMIO_FindProcNode(wm->info.fccIOProc))) { - /* If not found, retry with FOURCC_DOS */ - wm->info.fccIOProc = FOURCC_DOS; - if (!(wm->ioProc = MMIO_FindProcNode(wm->info.fccIOProc))) - goto error2; + wm->ioProc = &defaultProcs[0]; + } + else if (!(wm->ioProc = MMIO_FindProcNode(wm->info.fccIOProc))) { + /* If not found, assume DOS file */ + wm->ioProc = &defaultProcs[0]; } wm->bTmpIOProc = FALSE; } @@ -1315,7 +1315,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, /* Handle any unhandled/error case from above. Assume DOS file */ if (!lpmmioinfo || (lpmmioinfo->fccIOProc == 0 && lpmmioinfo->pIOProc == NULL && ioProc == NULL)) - ioProc = MMIO_FindProcNode(FOURCC_DOS); + ioProc = &defaultProcs[0]; /* if just the four character code is present, look up IO proc */ else if (lpmmioinfo->pIOProc == NULL) ioProc = MMIO_FindProcNode(lpmmioinfo->fccIOProc);

1 0

Alexander Puzankov : winmm: The default I/ O procedure should return MMIOERR_FILENOTFOUND if the openable file is not found .
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: 507db530b2470abbd9d39fc09caf8551dd4a460a URL: http://source.winehq.org/git/wine.git/?a=commit;h=507db530b2470abbd9d39fc09… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Mon Nov 29 22:22:19 2010 +0300 winmm: The default I/O procedure should return MMIOERR_FILENOTFOUND if the openable file is not found. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b090b3f..2e414ba 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -79,7 +79,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) - ret = MMIOERR_CANNOTOPEN; + ret = MMIOERR_FILENOTFOUND; } break;

1 0

Alexander Puzankov : winmm/tests: Add tests for mmioOpen for the file name of the form EXAMPLE.EXT+ABC.
by Alexandre Julliard 01 Dec '10

01 Dec '10

Module: wine Branch: master Commit: ec00d6dcedf80b590353cbb95e12bbb19bf19271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec00d6dcedf80b590353cbb95… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Mon Nov 29 20:52:52 2010 +0300 winmm/tests: Add tests for mmioOpen for the file name of the form EXAMPLE.EXT+ABC. --- dlls/winmm/tests/mmio.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 69f351e..0326a1a 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -619,6 +619,56 @@ static void test_mmioSetBuffer(char *fname) mmioClose(hmmio, 0); } +#define FOURCC_XYZ mmioFOURCC('X', 'Y', 'Z', ' ') + +static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM lParam1, LPARAM lParam2) +{ + LPMMIOINFO lpInfo = (LPMMIOINFO) lpMMIOInfo; + + switch (uMessage) + { + case MMIOM_OPEN: + if (lpInfo->fccIOProc == FOURCC_DOS) + lpInfo->fccIOProc = mmioFOURCC('F', 'A', 'I', 'L'); + return MMSYSERR_NOERROR; + case MMIOM_CLOSE: + return MMSYSERR_NOERROR; + default: + return 0; + } +} + +static void test_mmioOpen_fourcc(void) +{ + char fname[] = "file+name.xyz+one.two"; + + LPMMIOPROC lpProc; + HMMIO hmmio; + MMIOINFO mmio; + + lpProc = mmioInstallIOProc(FOURCC_DOS, mmio_test_IOProc, MMIO_INSTALLPROC); + ok(lpProc == mmio_test_IOProc, "mmioInstallIOProc error\n"); + + lpProc = mmioInstallIOProc(FOURCC_XYZ, mmio_test_IOProc, MMIO_INSTALLPROC); + ok(lpProc == mmio_test_IOProc, "mmioInstallIOProc error\n"); + + memset(&mmio, 0, sizeof(mmio)); + hmmio = mmioOpen(fname, &mmio, MMIO_READ); + mmioGetInfo(hmmio, &mmio, 0); + ok(hmmio != NULL && mmio.fccIOProc == FOURCC_XYZ, "mmioOpen error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + mmioClose(hmmio, 0); + + mmioInstallIOProc(FOURCC_XYZ, NULL, MMIO_REMOVEPROC); + + memset(&mmio, 0, sizeof(mmio)); + hmmio = mmioOpen(fname, &mmio, MMIO_READ); + mmioGetInfo(hmmio, &mmio, 0); + ok(hmmio == NULL && mmio.wErrorRet == MMIOERR_FILENOTFOUND, "mmioOpen error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + mmioClose(hmmio, 0); + + mmioInstallIOProc(FOURCC_DOS, NULL, MMIO_REMOVEPROC); +} + START_TEST(mmio) { char fname[] = "msrle.avi"; @@ -629,4 +679,5 @@ START_TEST(mmio) test_mmioOpen(fname); test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); + test_mmioOpen_fourcc(); }

1 0