October 2006 - Wine-Commits

Alexandre Julliard : msvfw32: Avoid a compiler warning.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 521612098c45a0ea9e6c2e324cd24c7436a2fc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=521612098c45a0ea9e6c2e324… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 12:08:13 2006 +0200 msvfw32: Avoid a compiler warning. --- dlls/msvfw32/msvideo_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1cfdf16..051915b 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -604,7 +604,7 @@ HIC VFWAPI ICGetDisplayFormat( if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) goto errout; /* no, sorry */ - ICDecompressGetFormat(tmphic,lpbiIn,lpbiOut); + ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); if (lpbiOut->biCompression != 0) { FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n",

1 0

Francois Gouget : Add '\n's to Wine traces.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 3f191fda9fcfdc5f9e3576db1a6f41888177005f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f191fda9fcfdc5f9e3576db1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 13 02:23:08 2006 +0200 Add '\n's to Wine traces. --- dlls/dmband/bandtrack.c | 2 +- dlls/dmcompos/chordmaptrack.c | 2 +- dlls/dmcompos/signposttrack.c | 2 +- dlls/dmime/lyricstrack.c | 2 +- dlls/dmime/markertrack.c | 2 +- dlls/dmime/paramcontroltrack.c | 2 +- dlls/dmime/segtriggertrack.c | 2 +- dlls/dmime/seqtrack.c | 2 +- dlls/dmime/sysextrack.c | 2 +- dlls/dmime/tempotrack.c | 2 +- dlls/dmime/timesigtrack.c | 2 +- dlls/dmime/wavetrack.c | 2 +- dlls/dmscript/scripttrack.c | 2 +- dlls/dmstyle/auditiontrack.c | 2 +- dlls/dmstyle/chordtrack.c | 2 +- dlls/dmstyle/commandtrack.c | 2 +- dlls/dmstyle/motiftrack.c | 2 +- dlls/dmstyle/mutetrack.c | 2 +- dlls/dmstyle/styletrack.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f191fda9fcfdc5f9e357…

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 58162f87fd283a1be0bd6740a8861d4b3dbaa573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58162f87fd283a1be0bd6740a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 13 02:19:42 2006 +0200 Assorted spelling fixes. --- dlls/d3d8/pixelshader.c | 2 +- dlls/d3d8/vertexshader.c | 2 +- dlls/d3d9/pixelshader.c | 2 +- dlls/d3d9/vertexshader.c | 2 +- dlls/imagehlp/integrity.c | 2 +- dlls/msi/action.c | 2 +- dlls/shlwapi/reg.c | 4 ++-- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/url.c | 2 +- dlls/usp10/usp10.c | 10 +++++----- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/texture.c | 2 +- dlls/winex11.drv/dib.c | 2 +- tools/widl/write_msft.c | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58162f87fd283a1be0bd6…

1 0

Francois Gouget : rpcrt4: Add RPC_CSTR, RPC_WSTR and update the prototypes accordingly.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 4794dc0e383b3afd44e389b1be66dc88bbff8ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4794dc0e383b3afd44e389b1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 13 02:19:15 2006 +0200 rpcrt4: Add RPC_CSTR, RPC_WSTR and update the prototypes accordingly. --- dlls/rpcrt4/rpc_binding.c | 54 ++++++++++++++------------- dlls/rpcrt4/rpc_epmap.c | 2 + dlls/rpcrt4/rpc_server.c | 16 ++++---- dlls/rpcrt4/rpc_transport.c | 4 +- dlls/rpcrt4/rpcrt4_main.c | 16 ++++---- include/rpcdce.h | 86 ++++++++++++++++++++++--------------------- 6 files changed, 90 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4794dc0e383b3afd44e38…

1 0

Francois Gouget : secur32: Add missing '\n' in a Wine trace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 8e38ac5911681ef5ec95e4d60bf19a0e5eaa47dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e38ac5911681ef5ec95e4d60… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 13 02:23:51 2006 +0200 secur32: Add missing '\n' in a Wine trace. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 37b7253..aaf2403 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -472,7 +472,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In /* If the helper replied with "PW", using cached credentials failed */ if(!strncmp(buffer, "PW", 2)) { - TRACE("Using cached credentials failed. Using empty password."); + TRACE("Using cached credentials failed. Using empty password.\n"); lstrcpynA(buffer, "PW AA==", max_len-1); } else /* Just do a noop on the next run */

1 0

Francois Gouget : olepro32: Mark stubs as such.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 5ae1d85be10e6083b692cd313e5e8cd6f99b45c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae1d85be10e6083b692cd313… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 13 02:13:49 2006 +0200 olepro32: Mark stubs as such. --- dlls/olepro32/olepro32stubs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index 23bcb65..f3c98ec 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ HRESULT WINAPI DllUnregisterServer() { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -45,7 +45,7 @@ HRESULT WINAPI DllUnregisterServer() */ HRESULT WINAPI DllRegisterServer() { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -54,7 +54,7 @@ HRESULT WINAPI DllRegisterServer() */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -63,6 +63,6 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; }

1 0

Markus Amsler : msvcrt: fread: Fill buffer on small reads.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: fdd61a7a35f27ff2e3327bc5c718ea7c63a1e08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd61a7a35f27ff2e3327bc5c… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Oct 13 00:03:29 2006 +0200 msvcrt: fread: Fill buffer on small reads. --- dlls/msvcrt/file.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1e72cef..6314210 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2524,7 +2524,29 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p } while(rcnt>0) { - int i = _read(file->_file,ptr, rcnt); + int i; + /* Fill the buffer on small reads. + * TODO: Use a better buffering strategy. + */ + if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF)) { + if (file->_bufsiz == 0) { + msvcrt_alloc_buffer(file); + } + file->_cnt = _read(file->_file, file->_base, file->_bufsiz); + file->_ptr = file->_base; + i = (file->_cnt<rcnt) ? file->_cnt : rcnt; + /* If the buffer fill reaches eof but fread wouldn't, clear eof. */ + if (i > 0 && i < file->_cnt) { + MSVCRT_fdesc[file->_file].wxflag &= ~WX_ATEOF; + } + if (i > 0) { + memcpy(ptr, file->_ptr, i); + file->_cnt -= i; + file->_ptr += i; + } + } else { + i = _read(file->_file,ptr, rcnt); + } pread += i; rcnt -= i; /* expose feof condition in the flags

1 0

Markus Amsler : msvcrt: Add fread eof tests.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: ef5ed0a42a90ac5878c8e4ad1d35e4b48daec1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5ed0a42a90ac5878c8e4ad1… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Oct 13 00:02:42 2006 +0200 msvcrt: Add fread eof tests. --- dlls/msvcrt/tests/file.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 3a89b3d..00bd253 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -220,6 +220,17 @@ static void test_readmode( BOOL ascii_mo j = fp+10; i=fread(buffer,1,j,file); ok(i==j,"fread failed, expected %d got %d in %s\n", j, i, IOMODE); + /* test fread eof */ + ok(fseek(file,0,SEEK_END)==0,"seek failure in %s\n", IOMODE); + ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(fread(buffer,1,1,file)==0,"fread failure in %s\n", IOMODE); + ok(feof(file)!=0,"feof failure in %s\n", IOMODE); + ok(fseek(file,-3,SEEK_CUR)==0,"seek failure in %s\n", IOMODE); + todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(fread(buffer,2,1,file)==1,"fread failed in %s\n", IOMODE); + todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE); + ok(feof(file)!=0,"feof failure in %s\n", IOMODE); /* test some additional functions */ rewind(file);

1 0

Ivan Gyurdiev : wined3d: Add shader version/ end masks to the WINED3D namespace.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: ce2e980d1b998162751b10db471bedb10f933674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2e980d1b998162751b10db4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 23:36:41 2006 -0400 wined3d: Add shader version/end masks to the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 6 +- dlls/wined3d/baseshader.c | 24 ++++--- dlls/wined3d/directx.c | 26 ++++---- dlls/wined3d/glsl_shader.c | 14 ++-- dlls/wined3d/pixelshader.c | 110 +++++++++++++++++----------------- dlls/wined3d/vertexshader.c | 46 +++++++------- dlls/wined3d/wined3d_private_types.h | 9 +++ 7 files changed, 122 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce2e980d1b998162751b1…

1 0

Markus Amsler : msvcrt: Fix fread eof handling.
by Alexandre Julliard Oct. 13, 2006

Oct. 13, 2006

Module: wine Branch: master Commit: 9ae995f674b55bacadee9068ebad376e3574a0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae995f674b55bacadee9068e… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Oct 13 00:03:56 2006 +0200 msvcrt: Fix fread eof handling. --- dlls/msvcrt/file.c | 1 + dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6314210..98c800c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2538,6 +2538,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p /* If the buffer fill reaches eof but fread wouldn't, clear eof. */ if (i > 0 && i < file->_cnt) { MSVCRT_fdesc[file->_file].wxflag &= ~WX_ATEOF; + file->_flag &= ~MSVCRT__IOEOF; } if (i > 0) { memcpy(ptr, file->_ptr, i); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 00bd253..d269765 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -228,7 +228,7 @@ static void test_readmode( BOOL ascii_mo ok(fseek(file,-3,SEEK_CUR)==0,"seek failure in %s\n", IOMODE); todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==1,"fread failed in %s\n", IOMODE); - todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE); ok(feof(file)!=0,"feof failure in %s\n", IOMODE);

1 0