May 2012 - Wine-Commits - list.winehq.org

Francois Gouget : taskmgr: Fix the spelling of the AdjustControlPosition() function.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: ec6a0fdb612cbc419a930a8bb6f523aa78f45ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6a0fdb612cbc419a930a8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:51 2012 +0200 taskmgr: Fix the spelling of the AdjustControlPosition() function. --- programs/taskmgr/perfpage.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 2d3b485..5276de7 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -102,7 +102,7 @@ static void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDiff InvalidateRect(hCntrl, NULL, TRUE); } -static void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) +static void AdjustControlPosition(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0); } @@ -404,18 +404,18 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) AdjustCntrlPos(IDS_TOTALS_PROCESS_COUNT, hDlg, 0, nYDifference); AdjustCntrlPos(IDS_TOTALS_THREAD_COUNT, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); { static int lastX, lastY;

1 0

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

May 15, 2012

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 : user32: Fix the spelling of the hRecipient variable.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: b89a49d4816c251de4bc70186769a182e81ab5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89a49d4816c251de4bc70186… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:23 2012 +0200 user32: Fix the spelling of the hRecipient variable. --- dlls/user32/misc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5fc601a..ef7fff6 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -505,7 +505,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * notifications about a device. * * PARAMS - * hRecepient [I] Window or service status handle that + * hRecipient [I] Window or service status handle that * will receive notifications. * pNotificationFilter [I] DEV_BROADCAST_HDR followed by some * type-specific data. @@ -518,13 +518,13 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * NOTES * * The dwFlags parameter can be one of two values: - *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecepient is a window handle - *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecepient is a service status handle + *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecipient is a window handle + *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecipient is a service status handle */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) { FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", - hRecepient,pNotificationFilter,dwFlags ); + hRecipient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; }

1 0

Francois Gouget : usp10: Fix the spelling of the Consonant_is_post_base_form() function.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 7796895b74b2b60e03e5948b310e0eb7c475052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796895b74b2b60e03e5948b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:41 2012 +0200 usp10: Fix the spelling of the Consonant_is_post_base_form() function. --- dlls/usp10/indic.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index df2a977..62834d1 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -208,7 +208,7 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } -static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -225,7 +225,7 @@ static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac return FALSE; } -static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -242,7 +242,7 @@ static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCa return FALSE; } -static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -259,7 +259,7 @@ static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return FALSE; } -static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static BOOL Consonant_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) { if ((lexical(pwChar[s->start])==lex_Ra) && s->end > s->start && lexical(pwChar[s->start+1]) == lex_Halant) return (SHAPE_does_GSUB_feature_apply_to_chars(hdc, psa, psc, &pwChar[s->start], 1, 2, "rphf") > 0); @@ -273,7 +273,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP BOOL pref = FALSE; /* remove ralf from consideration */ - if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) + if (Consonant_is_ralf(hdc, psa, psc, input, s, lex)) { s->ralf = s->start; s->start+=2; @@ -290,7 +290,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) + while ((blwf = Consonant_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonant_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonant_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) { if (blwf && s->blwf == -1) s->blwf = s->base - 1;

1 0

Francois Gouget : wininet: Fix the spelling of an InternetQueryDataAvailable() parameter.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: d0579d02ccfe8a0bb0ee759d859f912a9f9e9cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0579d02ccfe8a0bb0ee759d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:01 2012 +0200 wininet: Fix the spelling of an InternetQueryDataAvailable() parameter. --- dlls/wininet/internet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ba4794c..be1663b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3833,13 +3833,13 @@ lend: * data is available. */ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, - LPDWORD lpdwNumberOfBytesAvailble, + LPDWORD lpdwNumberOfBytesAvailable, DWORD dwFlags, DWORD_PTR dwContext) { object_header_t *hdr; DWORD res; - TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext); hdr = get_handle_object( hFile ); if (!hdr) { @@ -3848,7 +3848,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, } if(hdr->vtbl->QueryDataAvailable) { - res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailable, dwFlags, dwContext); }else { WARN("wrong handle\n"); res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;

1 0

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

May 15, 2012

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

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

May 15, 2012

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 : ntoskrnl.exe: Fix the name of a POOL_TYPE value.
by Alexandre Julliard May 15, 2012

May 15, 2012

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

May 15, 2012

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

May 15, 2012

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