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

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

15 May '12

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

Andrew Eikum : dsound: Compute mix buffer's size more accurately.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 20356f7458334e777f98ce20e873c8070f78b160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20356f7458334e777f98ce20e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:20:02 2012 -0500 dsound: Compute mix buffer's size more accurately. --- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/mixer.c | 44 ++++++++--------------------------------- dlls/dsound/primary.c | 8 +----- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 375abac..26e59ff 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -94,7 +94,8 @@ struct DirectSoundDevice CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; - LPBYTE tmp_buffer, mix_buffer; + LPBYTE tmp_buffer; + float *mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; DSVOLUMEPAN volpan; @@ -294,7 +295,6 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; /* mixer.c */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) DECLSPEC_HIDDEN; void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a940a85..9d4b35b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -96,19 +96,6 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); } -/** Convert a primary buffer position to a pointer position for device->mix_buffer - * device: DirectSoundDevice for which to calculate - * pos: Primary buffer position to converts - * Returns: Offset for mix_buffer - */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) -{ - DWORD ret = pos * 32 / device->pwfx->wBitsPerSample; - if (device->pwfx->wBitsPerSample == 32) - ret *= 2; - return ret; -} - /** * Recalculate the size for temporary buffer, and new writelead * Should be called when one of the following things occur: @@ -480,7 +467,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO { INT len = fraglen; BYTE *ibuf, *volbuf; - DWORD oldpos, mixbufpos; + DWORD oldpos; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); @@ -502,16 +489,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO if (volbuf) ibuf = volbuf; - mixbufpos = DSOUND_bufpos_to_mixpos(dsb->device, writepos); - /* Now mix the temporary buffer into the devices main buffer */ - if ((writepos + len) <= dsb->device->buflen) - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, len); - else - { - DWORD todo = dsb->device->buflen - writepos; - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, todo); - dsb->device->mixfunction(ibuf + todo, dsb->device->mix_buffer, len - todo); - } + dsb->device->mixfunction(ibuf, dsb->device->mix_buffer, len); /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && @@ -754,7 +732,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL recover = FALSE, all_stopped = FALSE; - DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; + DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2; LPVOID buf1, buf2; int nfiller; @@ -771,9 +749,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) playpos,writepos,device->playpos,device->mixpos,device->buflen); assert(device->playpos < device->buflen); - mixplaypos = DSOUND_bufpos_to_mixpos(device, device->playpos); - mixplaypos2 = DSOUND_bufpos_to_mixpos(device, playpos); - /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); @@ -794,15 +769,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* reset mix position to write position */ device->mixpos = writepos; - ZeroMemory(device->mix_buffer, device->mix_buffer_len); ZeroMemory(device->buffer, device->buflen); } else if (playpos < device->playpos) { buf1 = device->buffer + device->playpos; buf2 = device->buffer; size1 = device->buflen - device->playpos; size2 = playpos; - FillMemory(device->mix_buffer + mixplaypos, device->mix_buffer_len - mixplaypos, 0); - FillMemory(device->mix_buffer, mixplaypos2, 0); FillMemory(buf1, size1, nfiller); if (playpos && (!buf2 || !size2)) FIXME("%d: (%d, %d)=>(%d, %d) There should be an additional buffer here!!\n", __LINE__, device->playpos, device->mixpos, playpos, writepos); @@ -812,7 +784,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) buf2 = NULL; size1 = playpos - device->playpos; size2 = 0; - FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); } device->playpos = playpos; @@ -823,17 +794,20 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) TRACE("prebuff_left = %d, prebuff_max = %dx%d=%d, writelead=%d\n", prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); + ZeroMemory(device->mix_buffer, device->mix_buffer_len); + /* do the mixing */ DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); if (maxq + writepos > device->buflen) { DWORD todo = device->buflen - writepos; - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, todo); - device->normfunction(device->mix_buffer, device->buffer, maxq - todo); + DWORD offs_float = (todo / device->pwfx->nBlockAlign) * device->pwfx->nChannels; + device->normfunction(device->mix_buffer, device->buffer + writepos, todo); + device->normfunction(device->mix_buffer + offs_float, device->buffer, maxq - todo); } else - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, maxq); + device->normfunction(device->mix_buffer, device->buffer + writepos, maxq); /* update the mix position, taking wrap-around into account */ device->mixpos = writepos + maxq; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ff79a70..6633124 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -159,8 +159,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->helfrags = device->buflen / device->fraglen; - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len); + device->mix_buffer_len = ((device->prebuf * device->fraglen) / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); + device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); if (!device->mix_buffer) return DSERR_OUTOFMEMORY; @@ -512,10 +512,6 @@ opened: WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); } - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device->mix_buffer, device->mix_buffer_len); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat,

1 0

Andrew Eikum : dsound: Resample to float, not device format.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 98c653bc8bc842e23b3fa9098d2cbf5e0e8c348a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c653bc8bc842e23b3fa9098… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 15 08:29:34 2012 -0500 dsound: Resample to float, not device format. --- dlls/dsound/dsound_convert.c | 92 +++------------------------------ dlls/dsound/dsound_private.h | 9 +-- dlls/dsound/mixer.c | 118 ++++++++++++++++-------------------------- dlls/dsound/primary.c | 15 ++---- 4 files changed, 59 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98c653bc8bc842e23b3fa…

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

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: 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

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

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

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

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