winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
301 discussions
Start a n
N
ew thread
Piotr Caban : msvcp90: Don't fail if conversion was successful in wctob.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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]; }
1
0
0
0
Akihiro Sagawa : winmm: Don' t call the custom MMIOM_SEEK handler while opening.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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);
1
0
0
0
Akihiro Sagawa : winmm: Avoid sending MMIOM_SEEK message in debug trace.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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;
1
0
0
0
Akihiro Sagawa : winmm/tests: Add more tests for custom procedures.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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);
1
0
0
0
Hans Leidekker : msi: Update the cached product code when the property has changed.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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");
1
0
0
0
Hans Leidekker : msi: Return an error from MSI_GetComponentPath if the buffer is too small.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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);
1
0
0
0
Hans Leidekker : msi: Set the OutOfNoRbDiskSpace property.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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");
1
0
0
0
Hans Leidekker : msi/tests: Make tests pass when running from the root directory.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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…
1
0
0
0
Hans Leidekker : msiexec: Command line option '!' is used to hide the cancel button.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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 {
1
0
0
0
Jacek Caban : msctf.idl: Added ITfMouse* interfaces.
by Alexandre Julliard
02 Sep '14
02 Sep '14
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); +}
1
0
0
0
← Newer
1
...
26
27
28
29
30
31
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Results per page:
10
25
50
100
200