October 2008 - Wine-commits

Rob Shearman : wininet: Add tests for passing invalid parameters into InternetTimeFromSystemTimeA/ W.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 2584323ff9bf400e1828fee95c752ee402f539cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2584323ff9bf400e1828fee95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:58:25 2008 +0100 wininet: Add tests for passing invalid parameters into InternetTimeFromSystemTimeA/W. --- dlls/wininet/tests/internet.c | 62 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7edb6bc..91d72cc 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -381,6 +381,37 @@ static void InternetTimeFromSystemTimeA_test(void) ok( !memcmp( string, expect, sizeof(expect) ), "InternetTimeFromSystemTimeA failed (%u)\n", GetLastError() ); + /* test NULL time parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeA( NULL, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test NULL string parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, NULL, sizeof(string) ); + error = GetLastError(); + todo_wine + ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test invalid format parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT + 1, string, sizeof(string) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test too small buffer size */ SetLastError(0xdeadbeef); ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, 0 ); error = GetLastError(); @@ -405,6 +436,37 @@ static void InternetTimeFromSystemTimeW_test(void) ok( !memcmp( string, expect, sizeof(expect) ), "InternetTimeFromSystemTimeW failed (%u)\n", GetLastError() ); + /* test NULL time parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeW( NULL, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test NULL string parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, NULL, sizeof(string) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test invalid format parameter */ + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT + 1, string, sizeof(string) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INVALID_PARAMETER, + "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", + error ); + + /* test too small buffer size */ SetLastError(0xdeadbeef); ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string)/sizeof(string[0]) ); error = GetLastError();

1 0

Rob Shearman : wininet: Return error codes explicitly from URLCache functions instead of returning a BOOL and storing the error code in the last error value .
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: d929cdef979a344926bc9f5c04eaf944a14e1b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d929cdef979a344926bc9f5c0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:57:50 2008 +0100 wininet: Return error codes explicitly from URLCache functions instead of returning a BOOL and storing the error code in the last error value. This makes the code more efficient and allows errors from functions to be ignored without side-effects. --- dlls/wininet/urlcache.c | 350 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 246 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d929cdef979a344926bc9…

1 0

Rob Shearman : wininet: Fix GetUrlCacheEntryInfoA/ W when a NULL lpCacheEntryInfo parameter is passed in.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: ab849ee2971aa4778b01e624d0660fdcdb491970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab849ee2971aa4778b01e624d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:57:57 2008 +0100 wininet: Fix GetUrlCacheEntryInfoA/W when a NULL lpCacheEntryInfo parameter is passed in. --- dlls/wininet/tests/urlcache.c | 5 +++++ dlls/wininet/urlcache.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 1e0e5b6..d264b91 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -112,6 +112,11 @@ static void test_GetUrlCacheEntryInfoExA(void) check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); + cbCacheEntryInfo = 100000; + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ff59f27..792c7bc 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1536,6 +1536,9 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (lpdwCacheEntryInfoBufferSize) { + if (!lpCacheEntryInfo) + *lpdwCacheEntryInfoBufferSize = 0; + error = URLCache_CopyEntry( pContainer, pHeader, @@ -1614,6 +1617,9 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, if (lpdwCacheEntryInfoBufferSize) { + if (!lpCacheEntryInfo) + *lpdwCacheEntryInfoBufferSize = 0; + error = URLCache_CopyEntry( pContainer, pHeader,

1 0

Henri Verbeet : wined3d: Enable lights on the correct swapchain.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: c5fbf98ed2035571a911749ba5c1497d790b39f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fbf98ed2035571a911749ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 08:55:41 2008 +0200 wined3d: Enable lights on the correct swapchain. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 409c7a1..2e13613 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2996,7 +2996,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D IWineD3DDeviceImpl_MarkStateDirty(This, STATE_ACTIVELIGHT(lightInfo->glIndex)); } - This->stateBlock->activeLights[lightInfo->glIndex] = NULL; + This->updateStateBlock->activeLights[lightInfo->glIndex] = NULL; lightInfo->glIndex = -1; } else { TRACE("Light already disabled, nothing to do\n"); @@ -3011,8 +3011,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D int i; /* Find a free gl light */ for(i = 0; i < This->maxConcurrentLights; i++) { - if(This->stateBlock->activeLights[i] == NULL) { - This->stateBlock->activeLights[i] = lightInfo; + if(This->updateStateBlock->activeLights[i] == NULL) { + This->updateStateBlock->activeLights[i] = lightInfo; lightInfo->glIndex = i; break; }

1 0

Rob Shearman : Add configure check for dirent.h and readdir.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 87175c61f5ccd5119a68d1eaedfc0321e61c9543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87175c61f5ccd5119a68d1eae… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:55:21 2008 +0100 Add configure check for dirent.h and readdir. --- configure | 4 ++++ configure.ac | 2 ++ dlls/crypt32/rootstore.c | 7 +++++++ include/config.h.in | 6 ++++++ 4 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2875786..c9c04e3 100755 --- a/configure +++ b/configure @@ -7217,6 +7217,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7231,6 +7232,7 @@ for ac_header in \ capi20.h \ curses.h \ direct.h \ + dirent.h \ dlfcn.h \ elf.h \ float.h \ @@ -17206,6 +17208,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -17249,6 +17252,7 @@ for ac_func in \ prctl \ pread \ pwrite \ + readdir \ readlink \ rfork \ sched_yield \ diff --git a/configure.ac b/configure.ac index 52f5752..a7783f2 100644 --- a/configure.ac +++ b/configure.ac @@ -237,6 +237,7 @@ AC_CHECK_HEADERS(\ capi20.h \ curses.h \ direct.h \ + dirent.h \ dlfcn.h \ elf.h \ float.h \ @@ -1401,6 +1402,7 @@ AC_CHECK_FUNCS(\ prctl \ pread \ pwrite \ + readdir \ readlink \ rfork \ sched_yield \ diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index b1bbe9f..22bfd19 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -22,7 +22,9 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_DIRENT_H #include <dirent.h> +#endif #include <fcntl.h> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -313,6 +315,7 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, */ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) { +#ifdef HAVE_READDIR BOOL ret = FALSE; DIR *dir; @@ -341,6 +344,10 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) } } return ret; +#else + FIXME("not implemented without readdir available\n"); + return FALSE; +#endif } /* Opens path, which may be a file or a directory, and imports any certificates diff --git a/include/config.h.in b/include/config.h.in index 49ed198..3566a94 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -65,6 +65,9 @@ /* Define to 1 if you have the <direct.h> header file. */ #undef HAVE_DIRECT_H +/* Define to 1 if you have the <dirent.h> header file. */ +#undef HAVE_DIRENT_H + /* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H @@ -570,6 +573,9 @@ /* Define to 1 if you have the `pwrite' function. */ #undef HAVE_PWRITE +/* Define to 1 if you have the `readdir' function. */ +#undef HAVE_READDIR + /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK

1 0

Rob Shearman : d3d8/9: Use WINED3D_OK instead of D3D_OK in vertexshader.c.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 0f236745a98bf2e8bfb4284c538fa29809cdabf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f236745a98bf2e8bfb4284c5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:55:51 2008 +0100 d3d8/9: Use WINED3D_OK instead of D3D_OK in vertexshader.c. --- dlls/d3d8/vertexshader.c | 4 ++-- dlls/d3d9/vertexshader.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 3af93b4..16a809e 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -67,11 +67,11 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i static HRESULT WINAPI IDirect3DVertexShader8Impl_GetDevice(IDirect3DVertexShader8 *iface, IDirect3DDevice8** ppDevice) { IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)iface; IWineD3DDevice *myDevice = NULL; - HRESULT hr = D3D_OK; + HRESULT hr; TRACE("(%p) : Relay\n", This); hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice); - if (D3D_OK == hr && myDevice != NULL) { + if (WINED3D_OK == hr && myDevice != NULL) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } else { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index d40d0a5..abe283d 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -69,12 +69,12 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADER9 iface, IDirect3DDevice9** ppDevice) { IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; IWineD3DDevice *myDevice = NULL; - HRESULT hr = D3D_OK; + HRESULT hr; TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d9_cs); hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice); - if (D3D_OK == hr && myDevice != NULL) { + if (WINED3D_OK == hr && myDevice != NULL) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } else {

1 0

Dylan Smith : richedit: Removed invalid assertion.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 930f8f5af615dc427f6acbdadc082a741aebdd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930f8f5af615dc427f6acbdad… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 3 00:49:39 2008 -0400 richedit: Removed invalid assertion. The assertion was not valid, because it neglected to take into account the situation where a line break is forced with a MERF_ENDROW run (caused by \line control word or pressing Shift-Enter). This means that spaces can cause a line wrap after a forced line break as well as after a paragraph break, so we cannot assert that it is the first row in the paragraph. --- dlls/riched20/wrap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 6f6e32c..d6a2492 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -416,9 +416,11 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) { if (run->nFlags & MERF_STARTWHITE) { - /* we had only spaces so far, so we must be on the first line of the - * paragraph, since no other lines of the paragraph start with spaces. */ - assert(!wc->nRow); + /* We had only spaces so far, so we must be on the first line of the + * paragraph (or the first line after MERF_ENDROW forced the line + * break within the paragraph), since no other lines of the paragraph + * start with spaces. */ + /* The lines will only contain spaces, and the rest of the run will * overflow onto the next line. */ wc->bOverflown = TRUE;

1 0

Dylan Smith : richedit: Unsigned cast char to avoid EOF equality.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: e6c3a2beeececd4b9320f5b3a46d2874c1d24310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c3a2beeececd4b9320f5b3a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 3 01:44:53 2008 -0400 richedit: Unsigned cast char to avoid EOF equality. --- dlls/riched20/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 3d5593a..ced4f7f 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -109,7 +109,7 @@ int _RTFGetChar(RTF_Info *info) if (stream->dwSize == 0) return EOF; } - ch = stream->buffer[stream->dwUsed++]; + ch = (unsigned char)stream->buffer[stream->dwUsed++]; if (!ch) return EOF; return ch;

1 0

Dylan Smith : richedit: Avoided testing for undocumented behaviour causing test to fail.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: af47ac09d5c3ec6560e93770669fa5ff4b2627ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=af47ac09d5c3ec6560e937706… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 2 17:33:33 2008 -0400 richedit: Avoided testing for undocumented behaviour causing test to fail. The test for EM_GETLINE was testing to make sure the null terminating character was written at the end of the text as long as the buffer was long enough, and also tested to make sure that no other bytes were written after this null terminating character. This is consistent with Windows 2000 and up, but not for previous versions of Windows. --- dlls/riched20/tests/editor.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1c03eca..87e67da 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -306,7 +306,7 @@ static void test_EM_GETLINE(void) { int nCopied; int expected_nCopied = min(gl[i].buffer_len, strlen(gl[i].text)); - int expected_bytes_written = min(gl[i].buffer_len, strlen(gl[i].text) + 1); + int expected_bytes_written = min(gl[i].buffer_len, strlen(gl[i].text)); memset(dest, 0xBB, nBuf); *(WORD *) dest = gl[i].buffer_len; @@ -332,16 +332,27 @@ static void test_EM_GETLINE(void) for (j = 0; j < 32; j++) sprintf(resultbuf+strlen(resultbuf), "%02x", dest[j] & 0xFF); expectedbuf[0] = '\0'; - for (j = 0; j < expected_bytes_written; j++) + for (j = 0; j < expected_bytes_written; j++) /* Written bytes */ sprintf(expectedbuf+strlen(expectedbuf), "%02x", gl[i].text[j] & 0xFF); - for (; j < 32; j++) + for (; j < gl[i].buffer_len; j++) /* Ignored bytes */ + sprintf(expectedbuf+strlen(expectedbuf), "??"); + for (; j < 32; j++) /* Bytes after declared buffer size */ sprintf(expectedbuf+strlen(expectedbuf), "%02x", origdest[j] & 0xFF); + /* Test the part of the buffer that is expected to be written according + * to the MSDN documentation fo EM_GETLINE, which does not state that + * a NULL terminating character will be added unless no text is copied. + * + * Windows 95, 98 & NT do not append a NULL terminating character, but + * Windows 2000 and up do append a NULL terminating character if there + * is space in the buffer. The test will ignore this difference. */ ok(!strncmp(dest, gl[i].text, expected_bytes_written), "%d: expected_bytes_written=%d\n" "expected=0x%s\n" "but got= 0x%s\n", i, expected_bytes_written, expectedbuf, resultbuf); - ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), + /* Test the part of the buffer after the declared length to make sure + * there are no buffer overruns. */ + ok(!strncmp(dest + gl[i].buffer_len, origdest + gl[i].buffer_len, + nBuf - gl[i].buffer_len), "%d: expected_bytes_written=%d\n" "expected=0x%s\n" "but got= 0x%s\n", i, expected_bytes_written, expectedbuf, resultbuf); }

1 0

Dylan Smith : richedit: Swapped the expected and destination buffers in a test.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 0589b618482a2ce70a82b73c652f1a86f04c812e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0589b618482a2ce70a82b73c6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 2 17:33:24 2008 -0400 richedit: Swapped the expected and destination buffers in a test. --- dlls/riched20/tests/editor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8274721..1c03eca 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -328,14 +328,14 @@ static void test_EM_GETLINE(void) char expectedbuf[1024]; char resultbuf[1024]; int j; - expectedbuf[0] = '\0'; - for (j = 0; j < 32; j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", dest[j] & 0xFF); resultbuf[0] = '\0'; + for (j = 0; j < 32; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", dest[j] & 0xFF); + expectedbuf[0] = '\0'; for (j = 0; j < expected_bytes_written; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", gl[i].text[j] & 0xFF); + sprintf(expectedbuf+strlen(expectedbuf), "%02x", gl[i].text[j] & 0xFF); for (; j < 32; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", origdest[j] & 0xFF); + sprintf(expectedbuf+strlen(expectedbuf), "%02x", origdest[j] & 0xFF); ok(!strncmp(dest, gl[i].text, expected_bytes_written), "%d: expected_bytes_written=%d\n" "expected=0x%s\n" "but got= 0x%s\n",

1 0