wine-commits September 2014

2 participants
301 discussions

Piotr Caban : msvcp90: Don't fail if conversion was successful in wctob.

by Alexandre Julliard

Module: wine Branch: master Commit: 8b26ae824b01eae8fe2743ae53faec7192c59e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b26ae824b01eae8fe2743ae5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 1 17:50:34 2014 +0200 msvcp90: Don't fail if conversion was successful in wctob. --- dlls/msvcp90/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ef06172..b15f1b8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10280,7 +10280,7 @@ int __cdecl wctob(wint_t wc) { char ret[MB_LEN_MAX]; - if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != -1) return EOF; + if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != 1) return EOF; return ret[0]; }

9 years, 8 months

Akihiro Sagawa : winmm: Don' t call the custom MMIOM_SEEK handler while opening.

by Alexandre Julliard

Module: wine Branch: master Commit: e2779a4c9aec515e0e478cb1d4c9fbe5a87d2367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2779a4c9aec515e0e478cb1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:13 2014 +0900 winmm: Don't call the custom MMIOM_SEEK handler while opening. --- dlls/winmm/mmio.c | 18 ++++++++++++++---- dlls/winmm/tests/mmio.c | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 026bedb..f2a04cf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,7 +667,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* update offsets and grab file size, when possible */ - if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { + if (wm->info.fccIOProc == FOURCC_DOS && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { pos = wm->info.lBufOffset = wm->info.lDiskOffset; send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE); wm->dwFileSize = wm->info.lDiskOffset; @@ -885,7 +885,17 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) offset = wm->info.lBufOffset + (wm->info.pchNext - wm->info.pchBuffer) + lOffset; break; case SEEK_END: - offset = ((wm->info.fccIOProc == FOURCC_MEM)? wm->info.cchBuffer : wm->dwFileSize) - lOffset; + switch (wm->info.fccIOProc) { + case FOURCC_MEM: + offset = wm->info.cchBuffer - lOffset; + break; + case FOURCC_DOS: + offset = wm->dwFileSize - lOffset; + break; + default: + offset = send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, SEEK_END, FALSE); + break; + } break; default: return -1; @@ -896,7 +906,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || (offset > wm->info.lBufOffset + wm->info.cchBuffer) || - (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || + (offset > wm->dwFileSize && wm->info.fccIOProc == FOURCC_DOS) || !wm->bBufferLoaded)) { /* condition to change buffer */ @@ -1023,7 +1033,7 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) return MMIOERR_CANNOTWRITE; - if (lpmmioinfo) { + if (lpmmioinfo && lpmmioinfo->fccIOProc == FOURCC_DOS) { wm->dwFileSize = max(wm->dwFileSize, lpmmioinfo->lBufOffset + (lpmmioinfo->pchNext - lpmmioinfo->pchBuffer)); } diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 57dc166..cf02c0d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -636,9 +636,9 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); - todo_wine ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", + ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", mmio.adwInfo[1]); - todo_wine ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", + ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", mmio.lDiskOffset); mmioClose(hmmio, 0);

9 years, 8 months

Akihiro Sagawa : winmm: Avoid sending MMIOM_SEEK message in debug trace.

by Alexandre Julliard

Module: wine Branch: master Commit: d5345e64f1d71745143344d06f64f6474188cc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5345e64f1d71745143344d06… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:11 2014 +0900 winmm: Avoid sending MMIOM_SEEK message in debug trace. --- dlls/winmm/mmio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c61c99c..026bedb 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -516,9 +516,8 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) { LONG size = wm->info.cchBuffer; - TRACE("bo=%x do=%x of=%lx\n", - wm->info.lBufOffset, wm->info.lDiskOffset, - send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)); + TRACE("bo=%x do=%x\n", + wm->info.lBufOffset, wm->info.lDiskOffset); wm->info.lBufOffset = wm->info.lDiskOffset; wm->info.pchNext = wm->info.pchBuffer;

9 years, 8 months

Akihiro Sagawa : winmm/tests: Add more tests for custom procedures.

by Alexandre Julliard

Module: wine Branch: master Commit: 4df26eefe66fa7c88739d576a153c77443215496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26eefe66fa7c88739d576a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:09 2014 +0900 winmm/tests: Add more tests for custom procedures. --- dlls/winmm/tests/mmio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5e440b8..57dc166 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -608,6 +608,10 @@ static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM return MMSYSERR_NOERROR; case MMIOM_CLOSE: return MMSYSERR_NOERROR; + case MMIOM_SEEK: + lpInfo->adwInfo[1]++; + lpInfo->lDiskOffset = 0xdeadbeef; + return 0; default: return 0; } @@ -632,6 +636,10 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + todo_wine ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", + mmio.adwInfo[1]); + todo_wine ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", + mmio.lDiskOffset); mmioClose(hmmio, 0); mmioInstallIOProcA(FOURCC_XYZ, NULL, MMIO_REMOVEPROC);

9 years, 8 months

Hans Leidekker : msi: Update the cached product code when the property has changed.

by Alexandre Julliard

Module: wine Branch: master Commit: 614cb7eac75a3eabc261821725f7f145fdf603a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614cb7eac75a3eabc26182172… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:04:53 2014 +0200 msi: Update the cached product code when the property has changed. --- dlls/msi/action.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7ebdcc8..1fe6226 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7754,7 +7754,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall, *remove, *patch; + WCHAR *reinstall, *remove, *patch, *productcode; BOOL ui_exists; UINT rc; @@ -7823,6 +7823,15 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_adjust_privilege_properties( package ); msi_set_context( package ); + productcode = msi_dup_property( package->db, szProductCode ); + if (strcmpiW( productcode, package->ProductCode )) + { + TRACE( "product code changed %s -> %s\n", debugstr_w(package->ProductCode), debugstr_w(productcode) ); + msi_free( package->ProductCode ); + package->ProductCode = productcode; + } + else msi_free( productcode ); + if (msi_get_property_int( package->db, szDisableRollback, 0 )) { TRACE("disabling rollback\n");

9 years, 8 months

Hans Leidekker : msi: Return an error from MSI_GetComponentPath if the buffer is too small.

by Alexandre Julliard

Module: wine Branch: master Commit: 5709249986bb40c4c39a1baf4b420713446f2708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5709249986bb40c4c39a1baf4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:04:19 2014 +0200 msi: Return an error from MSI_GetComponentPath if the buffer is too small. --- dlls/msi/msi.c | 14 ++++++++++---- dlls/msi/tests/msi.c | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5b344ca..70a8134 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2865,7 +2865,9 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, if (state == INSTALLSTATE_LOCAL && !*path) state = INSTALLSTATE_NOTUSED; - msi_strcpy_to_awstring(path, -1, lpPathBuf, pcchBuf); + if (msi_strcpy_to_awstring(path, -1, lpPathBuf, pcchBuf) == ERROR_MORE_DATA) + state = INSTALLSTATE_MOREDATA; + msi_free(path); return state; } @@ -3379,6 +3381,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, HKEY hkey; DWORD sz; UINT rc; + INSTALLSTATE state; rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); if (rc != ERROR_SUCCESS) @@ -3393,13 +3396,16 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, MsiDecomposeDescriptorW(info, product, feature, component, &sz); if (!szProduct) - rc = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); + state = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); else - rc = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); + state = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); msi_free( info ); - if (rc != INSTALLSTATE_LOCAL) + if (state == INSTALLSTATE_MOREDATA) + return ERROR_MORE_DATA; + + if (state != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; return ERROR_SUCCESS; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3897c24..c517fcf 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -3008,6 +3008,13 @@ static void test_MsiGetComponentPath(void) create_file("C:\\imapath", "C:\\imapath", 11); /* file exists */ + path[0] = 'a'; + size = 0; + state = MsiGetComponentPathA(prodcode, component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + path[0] = 0; size = MAX_PATH; state = MsiGetComponentPathA(prodcode, component, path, &size); @@ -3015,6 +3022,13 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); + size = 0; + path[0] = 'a'; + state = MsiLocateComponentA(component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + path[0] = 0; size = MAX_PATH; state = MsiLocateComponentA(component, path, &size);

9 years, 8 months

Hans Leidekker : msi: Set the OutOfNoRbDiskSpace property.

by Alexandre Julliard

Module: wine Branch: master Commit: 04f9058a2897b03544ad59545d0b9c9e1ee43ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f9058a2897b03544ad59545… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:03:56 2014 +0200 msi: Set the OutOfNoRbDiskSpace property. --- dlls/msi/action.c | 3 +++ dlls/msi/tests/package.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 41f367b..7ebdcc8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2355,6 +2355,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szOutOfNoRbDiskSpace[] = + {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; MSIQUERY *view; WCHAR *level, *primary_key, *primary_folder; @@ -2431,6 +2433,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) /* FIXME: check volume disk space */ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); + msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); return MSI_SetFeatureStates(package); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9705827..1a5935d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1145,6 +1145,12 @@ static void test_settargetpath(void) r = MsiDoActionA( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + buffer[0] = 0; + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "OutOfNoRbDiskSpace", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + trace( "OutOfNoRbDiskSpace = \"%s\"\n", buffer ); + r = MsiSetTargetPathA( 0, NULL, NULL ); ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n");

9 years, 8 months

Hans Leidekker : msi/tests: Make tests pass when running from the root directory.

by Alexandre Julliard

Module: wine Branch: master Commit: 90f023a6355103c2f85fdd91615b22862fba9df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f023a6355103c2f85fdd916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:03:20 2014 +0200 msi/tests: Make tests pass when running from the root directory. --- dlls/msi/tests/package.c | 205 ++++++++++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90f023a6355103c2f85fd…

9 years, 8 months

Hans Leidekker : msiexec: Command line option '!' is used to hide the cancel button.

by Alexandre Julliard

Module: wine Branch: master Commit: f5d916db0641a5d3cb0007b21251c423d6f64d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d916db0641a5d3cb0007b21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:02:57 2014 +0200 msiexec: Command line option '!' is used to hide the cancel button. --- programs/msiexec/msiexec.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e76b526..1c42e90 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -912,13 +912,18 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if(msi_strequal(argvW[i]+2, "b+!")) { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; + } + else if(msi_strequal(argvW[i]+2, "b-!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; } else if(msi_strequal(argvW[i]+2, "b!")) { - InstallUILevel = INSTALLUILEVEL_BASIC; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; } else {

9 years, 8 months

Jacek Caban : msctf.idl: Added ITfMouse* interfaces.

by Alexandre Julliard

Module: wine Branch: master Commit: 383e223cdafb9c654381bb1f1934cb061fc54add URL: http://source.winehq.org/git/wine.git/?a=commit;h=383e223cdafb9c654381bb1f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 15:11:39 2014 +0200 msctf.idl: Added ITfMouse* interfaces. --- include/msctf.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index 68e2dc1..bce38ab 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1556,3 +1556,48 @@ interface ITfInputProcessorProfileActivationSink : IUnknown [in] HKL hkl, [in] DWORD dwFlags); } + +[ + object, + local, + uuid(a1adaaa2-3a24-449d-ac96-5183e7f5c217), + pointer_default(unique) +] +interface ITfMouseSink : IUnknown +{ + HRESULT OnMouseEvent( + [in] ULONG uEdge, + [in] ULONG uQuadrant, + [in] DWORD dwBtnStatus, + [out] BOOL *pfEaten); +} + +[ + object, + uuid(09d146cd-a544-4132-925b-7afa8ef322d0), + pointer_default(unique) +] +interface ITfMouseTracker : IUnknown +{ + HRESULT AdviseMouseSink( + [in] ITfRange *range, + [in] ITfMouseSink *pSink, + [out] DWORD *pdwCookie); + + HRESULT UnadviseMouseSink([in] DWORD dwCookie); +} + +[ + object, + uuid(3bdd78e2-c16e-47fd-b883-ce6facc1a208), + pointer_default(unique) +] +interface ITfMouseTrackerACP : IUnknown +{ + HRESULT AdviseMouseSink( + [in] ITfRangeACP *range, + [in] ITfMouseSink *pSink, + [out] DWORD *pdwCookie); + + HRESULT UnadviseMouseSink([in] DWORD dwCookie); +}

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014