wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Francois Gouget : wineqtdecoder: Fix the spelling of the available variables.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: e8e067eb4031397e342a1408959c9c2a355f66fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e067eb4031397e342a14089… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:11 2012 +0200 wineqtdecoder: Fix the spelling of the available variables. --- dlls/wineqtdecoder/qtdatahandler.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index 4d3b0a3..cfcb676 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -188,12 +188,12 @@ static pascal ComponentResult myDataHGetAvailableFileSize ( DataHandler dh, Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); - *fileSize = avaliable; + IAsyncReader_Length(data->dataRef.pReader,&total,&available); + *fileSize = available; return noErr; } @@ -202,11 +202,11 @@ static pascal ComponentResult myDataHGetFileSize ( DataHandler dh, long *fileSiz Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); *fileSize = total; return noErr; } @@ -411,12 +411,12 @@ static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSi Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); total64 = total; *fileSize = SInt64ToWide(total64); return noErr; @@ -427,13 +427,13 @@ static pascal ComponentResult myDataHGetAvailableFileSize64(DataHandler dh, wide Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); - total64 = avaliable; + IAsyncReader_Length(data->dataRef.pReader,&total,&available); + total64 = available; *fileSize = SInt64ToWide(total64); return noErr; }

1 0

Francois Gouget : winedump: Fix the spelling of a NETWORK_VOLUME_INFO field .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 61267a2bdc0516337146aff22f84c4d2b4cd4ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61267a2bdc0516337146aff22… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:45 2012 +0200 winedump: Fix the spelling of a NETWORK_VOLUME_INFO field. --- tools/winedump/lnk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index e0a2282..1a89173 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -138,7 +138,7 @@ typedef struct _LOCAL_VOLUME_INFO typedef struct _NETWORK_VOLUME_INFO { DWORD dwSize; - DWORD dwUnkown1; + DWORD dwUnknown1; DWORD dwShareNameOfs; DWORD dwReserved; DWORD dwUnknown2;

1 0

Francois Gouget : wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: dab51e062308260bfefab9f4cd0b899c39ab8c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab51e062308260bfefab9f4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:29 2012 +0200 wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant. --- dlls/wsock32/protocol.c | 2 +- include/nspapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 85cb54b..9482887 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -83,7 +83,7 @@ static DWORD map_service(DWORD wsaflags) if (wsaflags & XP1_DISCONNECT_DATA) flags |= XP_DISCONNECT_DATA; if (wsaflags & XP1_SUPPORT_BROADCAST) flags |= XP_SUPPORTS_BROADCAST; if (wsaflags & XP1_SUPPORT_MULTIPOINT) flags |= XP_SUPPORTS_MULTICAST; - if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWITH_ALLOCATION; + if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWIDTH_ALLOCATION; if (wsaflags & XP1_PARTIAL_MESSAGE) flags |= XP_FRAGMENTATION; return flags; } diff --git a/include/nspapi.h b/include/nspapi.h index a62f4d9..dc0e0f5 100644 --- a/include/nspapi.h +++ b/include/nspapi.h @@ -38,7 +38,7 @@ extern "C" { #define XP_DISCONNECT_DATA 0x00000100 #define XP_SUPPORTS_BROADCAST 0x00000200 #define XP_SUPPORTS_MULTICAST 0x00000400 -#define XP_BANDWITH_ALLOCATION 0x00000800 +#define XP_BANDWIDTH_ALLOCATION 0x00000800 #define XP_FRAGMENTATION 0x00001000 #define XP_ENCRYPTS 0x00002000

1 0

Francois Gouget : ntoskrnl.exe: Fix the name of a POOL_TYPE value.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: d979d9cd64c8bcc95f9c860a6e3a912b4fb37e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d979d9cd64c8bcc95f9c860a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:45:07 2012 +0200 ntoskrnl.exe: Fix the name of a POOL_TYPE value. --- include/ddk/wdm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3865f7f..85d3da5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -171,7 +171,7 @@ typedef enum _POOL_TYPE { NonPagedPool, PagedPool, NonPagedPoolMustSucceed, - UnkownType, + DontUseThisType, NonPagedPoolCacheAligned, PagedPoolCacheAligned, NonPagedPoolCacheAlignedMustS,

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 1c9bf32e19ae86c02fc10c8fecd557c8f10986c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9bf32e19ae86c02fc10c8fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:43:11 2012 +0200 user32/tests: Add a trailing '\n' to ok() calls. --- dlls/user32/tests/winstation.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 23a4311..248b82e 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -395,7 +395,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationA(desk, UOI_NAME, NULL, 0, &size); - ok(!ret, "GetUserObjectInformationA returned %x", ret); + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ @@ -404,7 +404,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationA(desk, UOI_NAME, buffer, sizeof(buffer), &size); - ok(ret, "GetUserObjectInformationA returned %x", ret); + ok(ret, "GetUserObjectInformationA returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); ok(strcmp(buffer, "foobarTest") == 0, "Buffer is set to '%s'\n", buffer); @@ -415,7 +415,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationW(desk, UOI_NAME, NULL, 0, &size); - ok(!ret, "GetUserObjectInformationW returned %x", ret); + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ @@ -424,7 +424,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationW(desk, UOI_NAME, bufferW, sizeof(bufferW), &size); - ok(ret, "GetUserObjectInformationW returned %x", ret); + ok(ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); @@ -437,7 +437,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationA(desk, UOI_TYPE, NULL, 0, &size); - ok(!ret, "GetUserObjectInformationA returned %x", ret); + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ @@ -446,7 +446,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationA(desk, UOI_TYPE, buffer, sizeof(buffer), &size); - ok(ret, "GetUserObjectInformationA returned %x", ret); + ok(ret, "GetUserObjectInformationA returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); ok(strcmp(buffer, "Desktop") == 0, "Buffer is set to '%s'\n", buffer); @@ -457,7 +457,7 @@ static void test_getuserobjectinformation(void) SetLastError(0xdeadbeef); ret = GetUserObjectInformationW(desk, UOI_TYPE, NULL, 0, &size); - ok(!ret, "GetUserObjectInformationW returned %x", ret); + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ @@ -466,7 +466,7 @@ static void test_getuserobjectinformation(void) size = 0xdeadbeef; ret = GetUserObjectInformationW(desk, UOI_TYPE, bufferW, sizeof(bufferW), &size); - ok(ret, "GetUserObjectInformationW returned %x", ret); + ok(ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); ok(lstrcmpW(bufferW, DesktopW) == 0, "Buffer is not set to 'Desktop'\n");

1 0

Michael Stefaniuc : user32/tests: Check the correct variable for the correct value.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: c6033397f3380deeb7368126ced4e92d5a9c1625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6033397f3380deeb7368126c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 15 10:15:44 2012 +0200 user32/tests: Check the correct variable for the correct value. --- dlls/user32/tests/dde.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e273de2..195de70 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1924,7 +1924,7 @@ static void test_DdeCreateDataHandle(void) ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); ret = DdeUninitialize(dde_inst2); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); /* NULL pSrc */ @@ -2037,7 +2037,7 @@ static void test_DdeCreateDataHandle(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ret = DdeUninitialize(dde_inst); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); } static void test_DdeCreateStringHandle(void)

1 0

Michael Stefaniuc : version/tests: Check the correct variable.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: d8bc01848784fc6e25733321121a5899147de3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bc01848784fc6e257333211… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 15 10:12:39 2012 +0200 version/tests: Check the correct variable. --- dlls/version/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e689017..e3e5c90 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -412,7 +412,7 @@ static void test_32bit_win(void) retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); + ok ( uiLengthW == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthW ); ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW);

1 0

Hans Leidekker : msi: Add support for the ActionInfo progress message subtype.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 4b32c093764ba9dd895b0959d14d7a67340ae404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b32c093764ba9dd895b0959d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 15 09:40:22 2012 +0200 msi: Add support for the ActionInfo progress message subtype. --- dlls/msi/action.c | 1 + dlls/msi/dialog.c | 4 +++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 10 +++++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c1d3b49..efdc79c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7340,6 +7340,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip TRACE("Performing action (%s)\n", debugstr_w(action)); + package->action_progress_increment = 0; handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f4881fd..66d8786 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -664,7 +664,9 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, SendMessageW( ctrl->hwnd, PBM_SETPOS, 0, 0 ); } break; - case 1: /* FIXME: not sure what this is supposed to do */ + case 1: /* action data increment */ + if (val2) dialog->package->action_progress_increment = val1; + else dialog->package->action_progress_increment = 0; break; case 2: /* move */ if (ctrl->progress_backwards) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 80f5414..bc9e596 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -369,6 +369,7 @@ typedef struct tagMSIPACKAGE struct list cabinet_streams; LPWSTR ActionFormat; LPWSTR LastAction; + UINT action_progress_increment; HANDLE log_file; IAssemblyCache *cache_net[CLR_VERSION_MAX]; IAssemblyCache *cache_sxs; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2077396..b1668d3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1905,8 +1905,16 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msi_free(deformated); ControlEvent_FireSubscribedEvent(package, szActionData, uirow); - msiobj_release(&uirow->hdr); + + if (package->action_progress_increment) + { + uirow = MSI_CreateRecord(2); + MSI_RecordSetInteger(uirow, 1, 2); + MSI_RecordSetInteger(uirow, 2, package->action_progress_increment); + ControlEvent_FireSubscribedEvent(package, szSetProgress, uirow); + msiobj_release(&uirow->hdr); + } break; case INSTALLMESSAGE_ACTIONSTART:

1 0

Hans Leidekker : msi: Add support for the ProgressAddition progress message subtype.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 6c7d0993f055fb4b2181d265e12c54b8a8c54568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7d0993f055fb4b2181d265e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 15 09:40:06 2012 +0200 msi: Add support for the ProgressAddition progress message subtype. --- dlls/msi/dialog.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a90d379..f4881fd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -644,11 +644,11 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2); + units = val1 / 512; switch (func) { case 0: /* init */ SendMessageW( ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100) ); - units = val1 / 512; if (val2) { ctrl->progress_max = units ? units : 100; @@ -667,7 +667,6 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, case 1: /* FIXME: not sure what this is supposed to do */ break; case 2: /* move */ - units = val1 / 512; if (ctrl->progress_backwards) { if (units >= ctrl->progress_current) ctrl->progress_current -= units; @@ -680,6 +679,9 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, } SendMessageW( ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0 ); break; + case 3: /* add */ + ctrl->progress_max += units; + break; default: FIXME("Unknown progress message %u\n", func); break;

1 0

Hans Leidekker : msi: Don't hide failure of script custom actions.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 022915f75b4fdda9fc3f875c74269d137429a19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=022915f75b4fdda9fc3f875c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 15 09:39:41 2012 +0200 msi: Don't hide failure of script custom actions. --- dlls/msi/custom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 9e50035..c1aa627 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -957,7 +957,7 @@ static DWORD ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; info = find_action_by_guid( guid ); if (!info) @@ -979,13 +979,13 @@ static DWORD ACTION_CallScript( const GUID *guid ) ERR("failed to create handle for %p\n", info->package ); release_custom_action_data( info ); - return S_OK; + return r; } static DWORD WINAPI ScriptThread( LPVOID arg ) { LPGUID guid = arg; - DWORD rc = 0; + DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() );

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
74
Older →

Jump to page:

2025

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 May 2012