April 2007 - Wine-Commits - list.winehq.org

Laurent Vromman : gdi32: Correct WidenPath behaviour when working on an open path.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 932c6f5bdda350b2a24fb2b35e202ec36f2eca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932c6f5bdda350b2a24fb2b35… Author: Laurent Vromman <laurent(a)vromman.org> Date: Tue Apr 3 07:45:40 2007 +0200 gdi32: Correct WidenPath behaviour when working on an open path. --- dlls/gdi32/path.c | 8 ++++---- dlls/gdi32/tests/path.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c3b1f1c..22c153f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1778,13 +1778,13 @@ static BOOL PATH_WidenPath(DC *dc) pPath = &dc->path; - PATH_FlattenPath(pPath); - - if(pPath->state != PATH_Closed) { - ERR("Path Closed\n"); + if(pPath->state == PATH_Open) { + SetLastError(ERROR_CAN_NOT_COMPLETE); return FALSE; } + PATH_FlattenPath(pPath); + size = GetObjectW( dc->hPen, 0, NULL ); if (!size) return FALSE; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 074a151..e9a6d39 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -35,7 +35,8 @@ static void test_widenpath(void) HPEN greenPen, narrowPen; HPEN oldPen; POINT pnt[6]; - INT nSize; + INT nSize, ret; + DWORD error; /* Create a pen to be used in WidenPath */ greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0)); @@ -70,12 +71,12 @@ static void test_widenpath(void) AbortPath(hdc); - todo_wine { - /* Test WidenPath with an empty path */ - SetLastError(0xdeadbeef); - BeginPath(hdc); - ok(WidenPath(hdc) == FALSE, "WidenPath fails while widening an empty path. Error : %d\n", GetLastError()); - } + /* Test WidenPath with an open path */ + SetLastError(0xdeadbeef); + BeginPath(hdc); + ret = WidenPath(hdc); + error = GetLastError(); + ok(ret == FALSE && GetLastError() == ERROR_CAN_NOT_COMPLETE, "WidenPath fails while widening an open path. Return value is %d, should be %d. Error is %08x, should be %08x\n", ret, FALSE, GetLastError(), ERROR_CAN_NOT_COMPLETE); AbortPath(hdc);

1 0

Laurent Vromman : gdi32: Correction of WidenPath behaviour when pen width is 1.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 525fd823665dc896b7c8efe625c2a472e9154eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=525fd823665dc896b7c8efe62… Author: Laurent Vromman <laurent(a)vromman.org> Date: Mon Apr 2 23:33:09 2007 +0200 gdi32: Correction of WidenPath behaviour when pen width is 1. --- dlls/gdi32/path.c | 5 +++++ dlls/gdi32/tests/path.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index af756b3..c3b1f1c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1795,6 +1795,11 @@ static BOOL PATH_WidenPath(DC *dc) penWidth = elp->elpWidth; HeapFree( GetProcessHeap(), 0, elp ); + /* pen width must be strictly higher than 1 */ + if(penWidth == 1) { + return TRUE; + } + /* FIXME : If extPen, use the shape on corners */ penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 0346b28..074a151 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -31,7 +32,7 @@ static void test_widenpath(void) { HDC hdc = GetDC(0); - HPEN greenPen; + HPEN greenPen, narrowPen; HPEN oldPen; POINT pnt[6]; INT nSize; @@ -67,6 +68,8 @@ static void test_widenpath(void) ok(nSize != -1, "GetPath fails after calling WidenPath.\n"); ok(nSize > 6, "Path number of points is to low. Should be more than 6 but is %d\n", nSize); + AbortPath(hdc); + todo_wine { /* Test WidenPath with an empty path */ SetLastError(0xdeadbeef); @@ -74,6 +77,17 @@ static void test_widenpath(void) ok(WidenPath(hdc) == FALSE, "WidenPath fails while widening an empty path. Error : %d\n", GetLastError()); } + AbortPath(hdc); + + /* Test when the pen width is equal to 1. The path should not change */ + narrowPen = CreatePen(PS_SOLID, 1, RGB(0,0,0)); + oldPen = SelectObject(hdc, narrowPen); + BeginPath(hdc); + Polyline(hdc, pnt, 6); + EndPath(hdc); + nSize = GetPath(hdc, NULL, NULL, 0); + ok(nSize == 6, "WidenPath fails detecting 1px wide pen. Path length is %d, should be 6\n", nSize); + ReleaseDC(0, hdc); return; }

1 0

Jason Edmeades : oleaut32: Convert to VT_DECIMAL fails with overflow ( with test).
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 94b9b6146d8f288bbb006f8ba2884154cfc0b172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b9b6146d8f288bbb006f8ba… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Apr 2 20:51:55 2007 +0100 oleaut32: Convert to VT_DECIMAL fails with overflow (with test). --- dlls/oleaut32/tests/vartest.c | 7 +++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 44cc5c3..7de21bd 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1391,6 +1391,11 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; #define EXPECT_CY(val) EXPECT_OK { EXPECT_TYPE(VT_CY); \ ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = 0x%x%08x, got 0x%x%08x\n", \ (DWORD)((LONG64)val >> 23), (DWORD)(LONG64)val, (DWORD)(V_CY(&vOut).int64 >>32), (DWORD)V_CY(&vOut).int64); } +#define EXPECT_DECIMAL(valHi, valMid, valLo) EXPECT_OK { EXPECT_TYPE(VT_DECIMAL); \ + ok((V_DECIMAL(&vOut).Hi32 == valHi) && (V_DECIMAL(&vOut).Mid32 == valMid) && \ + (V_DECIMAL(&vOut).Lo32 == valLo), \ + "Expected decimal = %x/0x%x%08x, got %x/0x%x%08x\n", valHi, valMid, valLo, \ + V_DECIMAL(&vOut).Hi32, V_DECIMAL(&vOut).Mid32, V_DECIMAL(&vOut).Lo32); } static void test_VarNumFromParseNum(void) { @@ -1454,6 +1459,8 @@ static void test_VarNumFromParseNum(void) /* 0x7f */ SETRGB(0, 7); SETRGB(1, 0xf); CONVERT(2,0,0,2,4,0, INTEGER_VTBITS); EXPECT_I1(0x7f); + SETRGB(0, 7); SETRGB(1, 0xf); + CONVERT(2,0,0,2,4,0, VTBIT_DECIMAL); EXPECT_DECIMAL(0,0,0x7f); /* 0x7fff */ SETRGB(0, 7); SETRGB(1, 0xf); SETRGB(2, 0xf); SETRGB(3, 0xf); CONVERT(4,0,0,4,4,0, INTEGER_VTBITS); EXPECT_I2(0x7fff); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 37fdea2..d851a9b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2019,7 +2019,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, V_UI8(pVarDst) = ul64; return S_OK; } - else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) + else if ((dwVtBits & VTBIT_DECIMAL) == VTBIT_DECIMAL) { V_VT(pVarDst) = VT_DECIMAL; DEC_SIGNSCALE(&V_DECIMAL(pVarDst)) = SIGNSCALE(DECIMAL_POS,0);

1 0

Chris Robinson : quartz: Use a second-long DSound buffer for playback.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: c76d5561a8db51b581ff7062e068f4843f0c9332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76d5561a8db51b581ff7062e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Apr 1 05:50:44 2007 -0700 quartz: Use a second-long DSound buffer for playback. --- dlls/quartz/dsoundrender.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 23c522d..96f8133 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,6 +64,7 @@ typedef struct DSoundRenderImpl LPDIRECTSOUND dsound; LPDIRECTSOUNDBUFFER dsbuffer; + DWORD buf_size; DWORD write_pos; BOOL init; @@ -100,8 +101,6 @@ static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLE } -#define DSBUFFERSIZE 8192 - static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) { HRESULT hr; @@ -148,13 +147,15 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) goto getout; } + This->buf_size = format->nAvgBytesPerSec; + wav_fmt = *format; wav_fmt.cbSize = 0; memset(&buf_desc,0,sizeof(DSBUFFERDESC)); buf_desc.dwSize = sizeof(DSBUFFERDESC); buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; - buf_desc.dwBufferBytes = DSBUFFERSIZE; + buf_desc.dwBufferBytes = This->buf_size; buf_desc.lpwfxFormat = &wav_fmt; hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL); if (FAILED(hr)) { @@ -206,10 +207,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, if (This->write_pos <= play_pos) buf_free = play_pos-This->write_pos; else - buf_free = DSBUFFERSIZE - This->write_pos + play_pos; + buf_free = This->buf_size - This->write_pos + play_pos; /* Wait for enough of the buffer to empty before filling it */ - if(buf_free < DSBUFFERSIZE/4) + if(buf_free < This->buf_size/4) { Sleep(10); continue; @@ -233,7 +234,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, size -= dwsize1 + dwsize2; data += dwsize1 + dwsize2; - This->write_pos = (This->write_pos + dwsize1 + dwsize2) % DSBUFFERSIZE; + This->write_pos = (This->write_pos + dwsize1 + dwsize2) % This->buf_size; } while (size && This->state == State_Running); return hr;

1 0

Francois Gouget : shell32/tests: On NT4 FindExecutable() returns an extra backspace character in some tests.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 996ced19816c819ad21dbd859a6d0b86c4cc8e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=996ced19816c819ad21dbd859… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 2 19:38:15 2007 +0200 shell32/tests: On NT4 FindExecutable() returns an extra backspace character in some tests. --- dlls/shell32/tests/shlexec.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 849c275..f16cb72 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -774,14 +774,18 @@ static void test_find_executable(void) } if (rc > 32) { + int equal; + equal=strcmp(command, argv0) == 0 || + /* NT4 returns an extra 0x8 character! */ + (strlen(command) == strlen(argv0)+1 && strncmp(command, argv0, strlen(argv0)) == 0); if ((test->todo & 0x20)==0) { - ok(strcmp(command, argv0) == 0, "FindExecutable(%s) returned command='%s' instead of '%s'\n", + ok(equal, "FindExecutable(%s) returned command='%s' instead of '%s'\n", filename, command, argv0); } else todo_wine { - ok(strcmp(command, argv0) == 0, "FindExecutable(%s) returned command='%s' instead of '%s'\n", + ok(equal, "FindExecutable(%s) returned command='%s' instead of '%s'\n", filename, command, argv0); } }

1 0

Francois Gouget : shell32/tests: On Windows 98 FindExecutable() does not ' \0' terminate the returned command which caused many tests to fail.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 1736e7eb763b13cba94c1afc9c52f11b0257abd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1736e7eb763b13cba94c1afc9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 2 19:32:16 2007 +0200 shell32/tests: On Windows 98 FindExecutable() does not '\0' terminate the returned command which caused many tests to fail. --- dlls/shell32/tests/shlexec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 708c06c..849c275 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -759,6 +759,8 @@ static void test_find_executable(void) c++; } } + /* Win98 does not '\0'-terminate command! */ + memset(command, '\0', sizeof(command)); rc=(int)FindExecutableA(filename, NULL, command); if (rc > 32) rc=33;

1 0

Francois Gouget : shell32/tests: End the lines with CR+LF otherwise the profile APIs are unable to read them back on Win >= 2000.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 789fb4c994539c1e29084381225da9e7304eb944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789fb4c994539c1e290843812… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 2 19:20:29 2007 +0200 shell32/tests: End the lines with CR+LF otherwise the profile APIs are unable to read them back on Win >= 2000. --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index cb814d2..708c06c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -347,15 +347,15 @@ static void doChild(int argc, char** argv) return; /* Arguments */ - childPrintf(hFile, "[Arguments]\n"); + childPrintf(hFile, "[Arguments]\r\n"); if (winetest_debug > 2) trace("argcA=%d\n", argc); - childPrintf(hFile, "argcA=%d\n", argc); + childPrintf(hFile, "argcA=%d\r\n", argc); for (i = 0; i < argc; i++) { if (winetest_debug > 2) trace("argvA%d=%s\n", i, argv[i]); - childPrintf(hFile, "argvA%d=%s\n", i, encodeA(argv[i])); + childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } CloseHandle(hFile);

1 0

Francois Gouget : shell32/tests: Fix some expected FindExecutable() error codes.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 95ddcc3bae41a12df53d71d03547bf337291a0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ddcc3bae41a12df53d71d03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 2 19:24:40 2007 +0200 shell32/tests: Fix some expected FindExecutable() error codes. Add comments indicating which Windows version returns a given error code. --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4375a9a..cb814d2 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -697,12 +697,12 @@ static void test_find_executable(void) strcpy(command, "your word"); rc=(int)FindExecutableA(NULL, NULL, command); - ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc); + ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %d\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); strcpy(command, "your word"); rc=(int)FindExecutableA(tmpdir, NULL, command); - todo_wine ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc); + ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %d\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); sprintf(filename, "%s\\test file.sfe", tmpdir); @@ -723,7 +723,7 @@ static void test_find_executable(void) sprintf(filename, "%s\\test file.shl", tmpdir); rc=(int)FindExecutableA(filename, NULL, command); - ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + ok(rc == SE_ERR_FNF /* NT4 */ || rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); sprintf(filename, "%s\\test file.shlfoo", tmpdir); rc=(int)FindExecutableA(filename, NULL, command);

1 0

Francois Gouget : Assorted spelling and English fixes.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 0081b430e1f454ada5e8e6d9f4b97449b903d8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0081b430e1f454ada5e8e6d9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 2 19:17:56 2007 +0200 Assorted spelling and English fixes. --- dlls/comctl32/tests/tab.c | 2 +- dlls/kernel32/tests/profile.c | 2 +- dlls/localspl/tests/localmon.c | 2 +- dlls/ole32/stg_bigblockfile.c | 4 ++-- dlls/rpcrt4/rpcss_np_client.c | 4 ++-- dlls/wined3d/state.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 59cd969..6f7259f 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -719,7 +719,7 @@ static void test_getters_setters(INT nTabs) flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* Testing Flat Seperators */ + /* Testing Flat Separators */ extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_FLATSEPARATORS); expect(extendedStyle, prevExtendedStyle); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 628a40b..272ba9c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -236,7 +236,7 @@ static void test_profile_sections_names(void) DeleteFileA( testfile3 ); - /* Tests on non-existent file */ + /* Tests on nonexistent file */ memset(buf, 0xcc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 10, ".\\not_here.ini" ); ok( ret == 0, "expected return size 0, got %d\n", ret ); diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index a89f0da..af2611e 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -539,7 +539,7 @@ static void test_XcvDataPort_DeletePort(void) /* ToDo: cmd_AddPortW for tempfileW, then cmd_DeletePortW for the existing Port */ - /* try to delete a non-existing Port */ + /* try to delete a nonexistent Port */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index a208bb8..08fc546 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -745,7 +745,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_ReadAt( TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbRead); - /* verify a sane enviroment */ + /* verify a sane environment */ if (!This) return E_FAIL; if (offset_in_page + bytes_left > PAGE_SIZE) @@ -833,7 +833,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt( TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbWritten); - /* verify a sane enviroment */ + /* verify a sane environment */ if (!This) return E_FAIL; if (This->flProtect != PAGE_READWRITE) diff --git a/dlls/rpcrt4/rpcss_np_client.c b/dlls/rpcrt4/rpcss_np_client.c index dc57fd2..016f77f 100644 --- a/dlls/rpcrt4/rpcss_np_client.c +++ b/dlls/rpcrt4/rpcss_np_client.c @@ -77,8 +77,8 @@ HANDLE RPCRT4_RpcssNPConnect(void) if (!ReleaseMutex(master_mutex)) ERR("Failed to release master mutex. Expect deadlock.\n"); - /* wait for the named pipe. We are only - willing to wait only 5 seconds. It should be available /very/ soon. */ + /* wait for the named pipe. We are only willing to wait for 5 seconds. + It should be available /very/ soon. */ if (! WaitNamedPipeA(NAME_RPCSS_NAMED_PIPE, MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT)) { ERR("Named pipe unavailable after waiting. Something is probably wrong.\n"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 07af88d..9f6a215 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2865,7 +2865,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - /* The number of the mapped stages increses monotonic, so we're fine to use the last used one */ + /* The number of the mapped stages increases monotonically, so it's fine to use the last used one */ for (textureNo = mapped_stage + 1; textureNo < GL_LIMITS(textures); ++textureNo) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); glDisableClientState(GL_TEXTURE_COORD_ARRAY);

1 0

Francois Gouget : ole32/tests: Spelling fix.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: a8695bae8874d34fee292dd1609ebf2657893a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8695bae8874d34fee292dd16… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 2 19:17:47 2007 +0200 ole32/tests: Spelling fix. --- dlls/ole32/tests/moniker.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 0ff8ea1..48a5262 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1596,7 +1596,7 @@ static void test_bind_context(void) IUnknown *param_obj; ULONG refs; static const WCHAR wszParamName[] = {'G','e','m','m','a',0}; - static const WCHAR wszNonExistant[] = {'N','o','n','E','x','i','s','t','a','n','t',0}; + static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; hr = CreateBindCtx(0, NULL); ok(hr == E_INVALIDARG, "CreateBindCtx with NULL ppbc should have returned E_INVALIDARG instead of 0x%08x\n", hr); @@ -1647,12 +1647,12 @@ static void test_bind_context(void) ok_ole_success(hr, "IBindCtx_GetObjectParam"); IUnknown_Release(param_obj); - hr = IBindCtx_GetObjectParam(pBindCtx, (WCHAR *)wszNonExistant, &param_obj); - ok(hr == E_FAIL, "IBindCtx_GetObjectParam with non-existing key should have failed with E_FAIL instead of 0x%08x\n", hr); - ok(param_obj == NULL, "IBindCtx_GetObjectParam with non-existing key should have set output parameter to NULL instead of %p\n", param_obj); + hr = IBindCtx_GetObjectParam(pBindCtx, (WCHAR *)wszNonExistent, &param_obj); + ok(hr == E_FAIL, "IBindCtx_GetObjectParam with nonexistent key should have failed with E_FAIL instead of 0x%08x\n", hr); + ok(param_obj == NULL, "IBindCtx_GetObjectParam with nonexistent key should have set output parameter to NULL instead of %p\n", param_obj); - hr = IBindCtx_RevokeObjectParam(pBindCtx, (WCHAR *)wszNonExistant); - ok(hr == E_FAIL, "IBindCtx_RevokeObjectParam with non-existing key should have failed with E_FAIL instead of 0x%08x\n", hr); + hr = IBindCtx_RevokeObjectParam(pBindCtx, (WCHAR *)wszNonExistent); + ok(hr == E_FAIL, "IBindCtx_RevokeObjectParam with nonexistent key should have failed with E_FAIL instead of 0x%08x\n", hr); hr = IBindCtx_EnumObjectParam(pBindCtx, &pEnumString); ok(hr == E_NOTIMPL, "IBindCtx_EnumObjectParam should have returned E_NOTIMPL instead of 0x%08x\n", hr);

1 0