wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Andrew Eikum : wineoss.drv: Use a temporary OSS device to check format support.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: fdda702acd1a9ace6925845ec50edcf5e1023c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdda702acd1a9ace6925845ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:32:03 2011 -0500 wineoss.drv: Use a temporary OSS device to check format support. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8d1a997..5de0a15 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -667,7 +667,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, +static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; @@ -682,7 +682,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ioctl(This->fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; } @@ -696,7 +696,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, return E_OUTOFMEMORY; tmp = fmt->nSamplesPerSec; - if(ioctl(This->fd, SNDCTL_DSP_SPEED, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -708,7 +708,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, } tmp = fmt->nChannels; - if(ioctl(This->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -862,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL, FALSE); + hr = setup_oss_device(This->fd, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1082,6 +1082,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + int fd = -1; HRESULT ret; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); @@ -1098,11 +1099,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - EnterCriticalSection(&This->lock); + if(This->dataflow == eRender) + fd = open(This->ai.devnode, O_WRONLY, 0); + else if(This->dataflow == eCapture) + fd = open(This->ai.devnode, O_RDONLY, 0); + + if(fd < 0){ + ERR("Unable to open device %s: %d (%s)\n", This->ai.devnode, errno, + strerror(errno)); + return AUDCLNT_E_DEVICE_INVALIDATED; + } - ret = setup_oss_device(This, pwfx, outpwfx, TRUE); + ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); - LeaveCriticalSection(&This->lock); + close(fd); return ret; }

1 0

Andrew Eikum : mmdevapi: Don't fail if dwChannelMask is not set correctly.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: f7364dfb4b203b74700eead1836e208a49872244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7364dfb4b203b74700eead18… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:31:40 2011 -0500 mmdevapi: Don't fail if dwChannelMask is not set correctly. --- dlls/mmdevapi/tests/render.c | 41 +++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 1 + dlls/winecoreaudio.drv/mmdevdrv.c | 6 +++++ dlls/wineoss.drv/mmdevdrv.c | 9 ++++--- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ce5247d..494c00d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -220,6 +220,47 @@ static void test_audioclient(void) NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; + WAVEFORMATEX *fmt2 = NULL; + + ok(fmtex->dwChannelMask != 0, "Got empty dwChannelMask\n"); + + fmtex->dwChannelMask = 0xffff; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + fmtex->dwChannelMask = 0; + + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); + ok(hr == S_OK, "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); + + CoTaskMemFree(fmt2); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + CoTaskMemFree(pwfx); + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + }else + skip("Skipping dwChannelMask tests\n"); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index af367ba..e1f1a49 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1383,6 +1383,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) hr = S_FALSE; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index be4ae84..26c154f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1118,6 +1118,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; AudioQueueRef aqueue; HRESULT hr; @@ -1135,6 +1136,11 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && + fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + OSSpinLockLock(&This->lock); hr = ca_setup_aqueue(This->adevid, This->dataflow, pwfx, NULL, &aqueue); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c34d809..8d1a997 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -668,7 +668,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) } static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out) + WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; double tenth; @@ -723,7 +723,8 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) ret = S_FALSE; } @@ -861,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL); + hr = setup_oss_device(This, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1099,7 +1100,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, EnterCriticalSection(&This->lock); - ret = setup_oss_device(This, pwfx, outpwfx); + ret = setup_oss_device(This, pwfx, outpwfx, TRUE); LeaveCriticalSection(&This->lock);

1 0

Francois Gouget : browseui/tests: Skip some tests if IEnumACString is not supported.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 80d8275f814ac44f974e96dc805c896f795becb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d8275f814ac44f974e96dc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 28 17:37:24 2011 +0200 browseui/tests: Skip some tests if IEnumACString is not supported. --- dlls/browseui/tests/autocomplete.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index bd2117e..120a5b0 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -238,6 +238,7 @@ static void test_ACLMulti(void) WCHAR exp[] = {'A','B','C',0}; IEnumString *obj; IEnumACString *unk; + HRESULT hr; TestACL *acl1, *acl2; IACList *acl; IObjMgr *mgr; @@ -252,9 +253,15 @@ static void test_ACLMulti(void) "Unexpected interface IACList2 in ACLMulti\n"); stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); - todo_wine ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk)); - if (unk != NULL) - unk->lpVtbl->Release(unk); + hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); + if (hr == E_NOINTERFACE) + todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); + else + { + ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); + if (unk != NULL) + unk->lpVtbl->Release(unk); + } ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); ok(i == 0, "Unexpected fetched value %d\n", i);

1 0

Frédéric Delanoy : cmd/tests: Don' t convert lines with DOS endings in convert_input_data.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: f00aafae856c430a1663c8f27dca2f2ee3b4ca84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00aafae856c430a1663c8f27… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 12:53:49 2011 +0200 cmd/tests: Don't convert lines with DOS endings in convert_input_data. --- programs/cmd/tests/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 58d75c3..8347c03 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -47,7 +47,8 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s for (i = 0; i < size; i++) { switch (data[i]) { case '\n': - *ptr++ = '\r'; + if (data[i-1] != '\r') + *ptr++ = '\r'; *ptr++ = '\n'; break; case '@':

1 0

Frédéric Delanoy : cmd: Get rid of unused parameter in WCMD_ReadFile.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 29b57ca82d69ef1195c1fd1655d9b42b410b52d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b57ca82d69ef1195c1fd165… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:22 2011 +0200 cmd: Get rid of unused parameter in WCMD_ReadFile. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 29 +++++++++++------------------ programs/cmd/wcmd.h | 3 +-- programs/cmd/wcmdmain.c | 11 ++++------- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09bb9c4..447eccd 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -197,7 +197,7 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) /* TODO: More intelligent buffering for reading lines from files */ do { - status = WCMD_ReadFile (h, s, 1, &bytes, NULL); + status = WCMD_ReadFile(h, s, 1, &bytes); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL; if (*s == '\n') bytes = 0; else if (*s != '\r') { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b7900fc..ca0d4fe 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -115,8 +115,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, WCMD_output_asis (Abuffer); } WCMD_output_asis (endBkt); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, - sizeof(answer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); answer[0] = toupperW(answer[0]); } @@ -306,7 +305,7 @@ void WCMD_choice (const WCHAR * command) { while (TRUE) { /* FIXME: Add support for option /T */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count); if (!opt_s) answer[0] = toupperW(answer[0]); @@ -1697,8 +1696,7 @@ void WCMD_pause (void) { WCHAR string[32]; WCMD_output (anykey); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } /**************************************************************************** @@ -2146,8 +2144,7 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), - buffer, sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2265,8 +2262,7 @@ void WCMD_setshow_env (WCHAR *s) { if (strlenW(p) != 0) WCMD_output(p); /* Read the reply */ - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -2376,8 +2372,7 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2474,7 +2469,7 @@ void WCMD_type (WCHAR *command) { static const WCHAR fmt[] = {'\n','%','s','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2528,7 +2523,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage); - while (WCMD_ReadFile (hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2559,8 +2554,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt2, moreStr, 100); WCMD_leave_paged_mode(); WCMD_output_asis(moreStrPage); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); WCMD_enter_paged_mode(moreStrPage); } @@ -2582,7 +2576,7 @@ void WCMD_more (WCHAR *command) { fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow; needsPause = TRUE; - while (WCMD_ReadFile (h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; curPos += count; @@ -2683,8 +2677,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) curdir[0], label, HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5133d20..98e1246 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,8 +108,7 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused); +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom, const BOOL is_console_handle); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a6aee38..3f2cfcf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -237,11 +237,9 @@ void WCMD_leave_paged_mode(void) * WCMD_Readfile * * Read characters in from a console/file, returning result in Unicode - * with signature identical to ReadFile */ -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused) { - +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead) +{ BOOL res; /* Try to read from console as Unicode */ @@ -258,7 +256,7 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, return FALSE; /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, buffer, maxChars, &numRead, unused); + res = ReadFile(hIn, buffer, maxChars, &numRead, NULL); /* Convert from OEM */ *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, @@ -293,8 +291,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { if (++line_count >= max_height - 1) { line_count = 0; WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } } } while (((message = ptr) != NULL) && (*ptr));

1 0

Frédéric Delanoy : cmd: Avoid checking whether we 're in console mode for every read.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: d6f4f7308ae3de22280c0c3b0b5847180c75e204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f4f7308ae3de22280c0c3b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:21 2011 +0200 cmd: Avoid checking whether we're in console mode for every read. --- programs/cmd/batch.c | 12 +++++------- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 5 +++-- programs/cmd/wcmdmain.c | 21 +++++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5007db3..09bb9c4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN while (context -> skip_rest == FALSE) { CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - if (WCMD_ReadAndParseLine(NULL, &toExecute, h) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, h, FALSE)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); @@ -181,22 +181,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) { DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; - if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + if (is_console_handle) { + status = ReadConsoleW(h, s, noChars, &charsRead, NULL); + if (!status) return NULL; s[charsRead-2] = '\0'; /* Strip \r\n */ return p; } - /* Continue only if we have no console (i.e. a file) handle */ - if (GetLastError() != ERROR_INVALID_HANDLE) - return NULL; - /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9fe50d9..b7900fc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1134,7 +1134,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR buffer[MAXSTRING] = {'\0'}; WCHAR *where, *parm; - while (WCMD_fgets (buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input, FALSE)) { /* Skip blank lines*/ parm = WCMD_parameter (buffer, 0, &where, NULL); @@ -1394,7 +1394,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (*paramStart == ':') paramStart++; SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h, FALSE)) { str = string; while (isspaceW (*str)) str++; if (*str == ':') { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d370764..5133d20 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,7 +97,7 @@ void WCMD_verify (const WCHAR *command); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *command); -WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); +WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream, const BOOL is_console_handle); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); @@ -111,7 +111,8 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int le BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead, const LPOVERLAPPED unused); -WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom); +WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle); CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket, const WCHAR *var, const WCHAR *val); void WCMD_free_commands(CMD_LIST *cmds); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8e222a3..a6aee38 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1786,8 +1786,9 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex) * - Anything else gets put into the command string (including * redirects) */ -WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE readFrom) { - +WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle) +{ WCHAR *curPos; int inQuotes = 0; WCHAR curString[MAXSTRING]; @@ -1831,7 +1832,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } else if (readFrom == INVALID_HANDLE_VALUE) { WINE_FIXME("No command nor handle supplied\n"); } else { - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) return NULL; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + return NULL; } curPos = extraSpace; @@ -2191,7 +2193,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Read more, skipping any blank lines */ while (*extraSpace == 0x00) { if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) break; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + break; } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); @@ -2282,6 +2285,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR string[1024]; WCHAR envvar[4]; int opt_q; + BOOL is_console; + DWORD dummy; int opt_t = 0; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; @@ -2497,7 +2502,7 @@ int wmain (int argc, WCHAR *argvW[]) */ /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2593,7 +2598,7 @@ int wmain (int argc, WCHAR *argvW[]) if (opt_k) { /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2606,13 +2611,13 @@ int wmain (int argc, WCHAR *argvW[]) SetEnvironmentVariableW(promptW, defaultpromptW); WCMD_version (); + is_console = !!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &dummy); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ if (echo_mode) WCMD_show_prompt(); - if (WCMD_ReadAndParseLine(NULL, &toExecute, - GetStdHandle(STD_INPUT_HANDLE)) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE), is_console)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute);

1 0

Frédéric Delanoy : cmd: Avoid reading char by char from console.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: a7e1c22a485fb7b87e2c344b472f7e6778d5eafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e1c22a485fb7b87e2c344b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:20 2011 +0200 cmd: Avoid reading char by char from console. --- programs/cmd/batch.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index c5e73c6..5007db3 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -181,13 +181,23 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) { - - DWORD bytes; +WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +{ + DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; + if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + s[charsRead-2] = '\0'; /* Strip \r\n */ + return p; + } + + /* Continue only if we have no console (i.e. a file) handle */ + if (GetLastError() != ERROR_INVALID_HANDLE) + return NULL; + + /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL;

1 0

Huw Davies : gdi32: Use a separate variable to indicate the default has been retrieved.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: b4430319f16753270397e11310ac327736d438a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4430319f16753270397e1131… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 28 13:46:48 2011 +0100 gdi32: Use a separate variable to indicate the default has been retrieved. --- dlls/gdi32/freetype.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d71b0c5..81c704b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4602,16 +4602,21 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - int default_char = -1; + WORD default_char; + BOOL got_default = FALSE; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + { + default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + got_default = TRUE; + } for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (default_char == -1) + if (!got_default) { if (FT_IS_SFNT(font->ft_face)) { @@ -4624,6 +4629,7 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, WineEngGetTextMetrics(font, &textm); default_char = textm.tmDefaultChar; } + got_default = TRUE; } pgi[i] = default_char; }

1 0

Alexandre Julliard : makedep: Ensure that error messages contain "error".
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 54f71a0d8e9da5d5e565d8fd7e98e5d66c9cd3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f71a0d8e9da5d5e565d8fd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 12:55:16 2011 +0200 makedep: Ensure that error messages contain "error". Suggested by Dan Kegel. --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 799c6e0..2d3e5b4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -108,7 +108,7 @@ static void *xmalloc( size_t size ) { void *res; if (!(res = malloc (size ? size : 1))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -121,7 +121,7 @@ static void *xrealloc (void *ptr, size_t size) void *res; assert( size ); if (!(res = realloc( ptr, size ))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -131,7 +131,7 @@ static void *xrealloc (void *ptr, size_t size) static char *xstrdup( const char *str ) { char *res = strdup( str ); - if (!res) fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + if (!res) fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -286,36 +286,36 @@ static INCL_FILE *add_include( INCL_FILE *pFile, const char *name, int line, int for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break; if (pos >= MAX_INCLUDES) - fatal_error( "%s: %s: too many included files, please fix MAX_INCLUDES\n", + fatal_error( "%s: %s: error: too many included files, please fix MAX_INCLUDES\n", ProgramName, pFile->name ); /* enforce some rules for the Wine tree */ if (!memcmp( name, "../", 3 )) - fatal_error( "%s:%d: #include directive with relative path not allowed\n", + fatal_error( "%s:%d: error: #include directive with relative path not allowed\n", pFile->filename, line ); if (!strcmp( name, "config.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: config.h must not be included by a header file\n", + fatal_error( "%s:%d: error: config.h must not be included by a header file\n", pFile->filename, line ); if (pos) - fatal_error( "%s:%d: config.h must be included before anything else\n", + fatal_error( "%s:%d: error: config.h must be included before anything else\n", pFile->filename, line ); } else if (!strcmp( name, "wine/port.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: wine/port.h must not be included by a header file\n", + fatal_error( "%s:%d: error: wine/port.h must not be included by a header file\n", pFile->filename, line ); - if (!pos) fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + if (!pos) fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); if (pos > 1) - fatal_error( "%s:%d: wine/port.h must be included before everything except config.h\n", + fatal_error( "%s:%d: error: wine/port.h must be included before everything except config.h\n", pFile->filename, line ); if (strcmp( pFile->files[0]->name, "config.h" )) - fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); } @@ -356,6 +356,7 @@ static FILE *open_src_file( INCL_FILE *pFile ) } if (!file) { + fprintf( stderr, "%s: error: ", ProgramName ); perror( pFile->name ); exit(1); } @@ -527,13 +528,15 @@ static FILE *open_include_file( INCL_FILE *pFile ) free( filename ); } + fprintf( stderr, "%s:%d: error: ", pFile->included_by->filename, pFile->included_line ); perror( pFile->name ); - while (pFile->included_by) + pFile = pFile->included_by; + while (pFile && pFile->included_by) { const char *parent = pFile->included_by->sourcename; if (!parent) parent = pFile->included_by->name; - fprintf( stderr, " %s was first included from %s:%d\n", - pFile->name, parent, pFile->included_line ); + fprintf( stderr, "%s:%d: note: %s was first included here\n", + parent, pFile->included_line, pFile->name ); pFile = pFile->included_by; } exit(1); @@ -575,7 +578,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (*p != '"') continue; include = ++p; while (*p && (*p != '"')) p++; - if (!*p) fatal_error( "%s:%d: Malformed import directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed import directive\n", + pFile->filename, input_line ); *p = 0; if (for_h_file && strendswith( include, ".idl" )) strcpy( p - 4, ".h" ); add_include( pFile, include, input_line, 0 ); @@ -608,7 +612,7 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) include = p; while (*p && (*p != quote)) p++; if (!*p || (quote == '"' && p[-1] != '\\')) - fatal_error( "%s:%d: Malformed #include directive inside cpp_quote\n", + fatal_error( "%s:%d: error: Malformed #include directive inside cpp_quote\n", pFile->filename, input_line ); if (quote == '"') p--; /* remove backslash */ *p = 0; @@ -627,7 +631,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", + pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); } @@ -656,7 +661,7 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); @@ -697,7 +702,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) while (*p && !isspace(*p) && *p != '*') p++; } if (!*p) - fatal_error( "%s:%d: Malformed makedep comment\n", pFile->filename, input_line ); + fatal_error( "%s:%d: error: Malformed makedep comment\n", pFile->filename, input_line ); *p = 0; } else /* check for #include */ @@ -712,7 +717,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; } @@ -954,7 +959,8 @@ static FILE *create_temp_file( char **tmp_name ) if (errno != EEXIST) break; id += 7777; } - if (!ret) fatal_error( "failed to create output file for '%s'\n", OutputFileName ); + if (!ret) fatal_error( "%s: error: failed to create output file for '%s'\n", + ProgramName, OutputFileName ); *tmp_name = name; return ret; } @@ -979,7 +985,7 @@ static void output_dependencies(void) while (fgets( buffer, sizeof(buffer), file ) && !found) { if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) - fatal_error( "error writing to %s\n", tmp_name ); + fatal_error( "%s: error: failed to write to %s\n", ProgramName, tmp_name ); found = !strncmp( buffer, Separator, strlen(Separator) ); } fclose( file ); @@ -1017,7 +1023,8 @@ static void output_dependencies(void) if (ret == -1) { unlink( tmp_name ); - fatal_error( "failed to rename output file to '%s'\n", OutputFileName ); + fatal_error( "%s: error: failed to rename output file to '%s'\n", + ProgramName, OutputFileName ); } free( tmp_name ); } @@ -1070,7 +1077,8 @@ int main( int argc, char *argv[] ) INCL_PATH *path, *next; int i, j; - ProgramName = argv[0]; + if ((ProgramName = strrchr( argv[0], '/' ))) ProgramName++; + else ProgramName = argv[0]; i = 1; while (i < argc)

1 0

Frédéric Delanoy : msvcrt/tests: Remove dead assignments (Clang).
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 3274475299252a414b7abfefc7653ab55682a9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3274475299252a414b7abfefc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 26 15:52:36 2011 +0200 msvcrt/tests: Remove dead assignments (Clang). --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 09a88c8..e7b7353 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -130,15 +130,15 @@ static void test_fileops( void ) ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars for bufmode=%x\n", bufmodes[bufmode]); rewind(file); - for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + for (i = 0; i < sizeof(outbuffer); i++) { - ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); } ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); c = outbuffer[sizeof(outbuffer) - 1]; ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); @@ -146,7 +146,7 @@ static void test_fileops( void ) ok(c == outbuffer[sizeof(outbuffer) - 1], "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); rewind(file);

1 0

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 September 2011