October 2007 - Wine-Commits

Ulrich Czekalla : d3d9: Fix crash in texture test.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 700c602eb67586c7404334ac4faa2dd21595d7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=700c602eb67586c7404334ac4… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Sat Oct 6 10:38:36 2007 -0400 d3d9: Fix crash in texture test. --- dlls/d3d9/tests/texture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 36e9143..d0d00ee 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -146,6 +146,7 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) if(FAILED(hr)) { skip("No mipmap generation support\n"); + return; } hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP,

1 0

Francois Gouget : user32/tests: Remove an unneeded cast.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 81c4b91cb2faca383c1152728bd3970132592640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c4b91cb2faca383c1152728… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 6 16:44:20 2007 +0200 user32/tests: Remove an unneeded cast. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index c3997b0..0c7adba 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -648,7 +648,7 @@ static void test_ddeml_client(void) lstrcpyA(str, "[Command(Var)]"); hdata = DdeCreateDataHandle(client_pid, (LPBYTE)str, lstrlenA(str) + 1, - 0, (HSZ)NULL, CF_TEXT, 0); + 0, NULL, CF_TEXT, 0); ok(hdata != NULL, "Expected non-NULL hdata\n"); /* XTYP_EXECUTE, correct params */

1 0

Francois Gouget : comdlg32/tests: Tell PageSetupDlg() not to bring up a dialog if there is no default printer.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 4ea5dbfa1c2568c3fa892f16875894c35dae56cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea5dbfa1c2568c3fa892f168… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 6 16:43:58 2007 +0200 comdlg32/tests: Tell PageSetupDlg() not to bring up a dialog if there is no default printer. --- dlls/comdlg32/tests/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 6827cb0..e458a2f 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -74,7 +74,7 @@ static void test_PageSetupDlgA(void) ZeroMemory(pDlg, sizeof(PAGESETUPDLGA)); pDlg->lStructSize = sizeof(PAGESETUPDLGA); - pDlg->Flags = PSD_RETURNDEFAULT; + pDlg->Flags = PSD_RETURNDEFAULT | PSD_NOWARNING; SetLastError(0xdeadbeef); res = PageSetupDlgA(pDlg); ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN),

1 0

Rob Shearman : server: Only call fchmod in file_set_fd if the mode actually changed.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: f5070b051147c33ccde44b2dfcb94c6338e0ce0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5070b051147c33ccde44b2df… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Oct 6 14:31:34 2007 +0200 server: Only call fchmod in file_set_fd if the mode actually changed. --- server/file.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/file.c b/server/file.c index 69d052c..7c384a3 100644 --- a/server/file.c +++ b/server/file.c @@ -503,13 +503,16 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd /* no ACL means full access rights to anyone */ new_mode |= S_IRWXU | S_IRWXO; - if (fchmod( unix_fd, new_mode & ~denied_mode ) == -1) + if (file->mode != (new_mode & ~denied_mode)) { - file_set_error(); - return 0; - } + if (fchmod( unix_fd, new_mode & ~denied_mode ) == -1) + { + file_set_error(); + return 0; + } - file->mode = new_mode & ~denied_mode; + file->mode = new_mode & ~denied_mode; + } } return 1; }

1 0

Rob Shearman : server: Remove an unnecessary check from file_set_fd.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: f43d8b65c1e768ee5696ba8b7fda2c07059d2394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43d8b65c1e768ee5696ba8b7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Oct 6 14:31:25 2007 +0200 server: Remove an unnecessary check from file_set_fd. --- server/file.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server/file.c b/server/file.c index 3023f77..69d052c 100644 --- a/server/file.c +++ b/server/file.c @@ -406,10 +406,6 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd assert( obj->ops == &file_ops ); - /* only DACL translation is currently supported */ - if (!(set_info & DACL_SECURITY_INFORMATION)) - return 1; - unix_fd = get_file_unix_fd( file ); if (unix_fd == -1) return 1; @@ -432,6 +428,8 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd else owner = token_get_user( current->process->token ); + /* group and sacl not supported */ + /* keep the bits that we don't map to access rights in the ACL */ new_mode = file->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);

1 0

Mikolaj Zalewski : oleview: Don't crash if the parent type couldn' t be retrieved.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 3982f12404a5dc0f3a626ccba9ed20c1d1b3c355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3982f12404a5dc0f3a626ccba… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Oct 4 16:17:48 2007 -0700 oleview: Don't crash if the parent type couldn't be retrieved. --- programs/oleview/typelib.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 1acdd84..355826b 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -895,14 +895,18 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz AddToTLDataStrW(pTLData, wszSpace); ITypeInfo_GetRefTypeOfImplType(pTypeInfo, 0, &hRefType); - ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); - ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, + if (SUCCEEDED(ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo))) + { + ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, NULL, NULL, NULL); - AddToTLDataStrW(pTLData, bstrName); - AddToTLDataStrW(pTLData, wszSpace); + AddToTLDataStrW(pTLData, bstrName); + AddToTLDataStrW(pTLData, wszSpace); - SysFreeString(bstrName); - ITypeInfo_Release(pRefTypeInfo); + SysFreeString(bstrName); + ITypeInfo_Release(pRefTypeInfo); + } + else + AddToTLDataStrW(pTLData, wszFailed); } AddToTLDataStrW(pTLData, wszOpenBrackets3); AddToTLDataStrW(pTLData, wszNewLine);

1 0

Louis Lenders : wsock32: Export 3 more functions.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: d706cfe21c6eea4f9e9008fa51836083c5f0e02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d706cfe21c6eea4f9e9008fa5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Oct 6 12:14:20 2007 +0100 wsock32: Export 3 more functions. --- dlls/wsock32/wsock32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 8e78796..620abb1 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -73,6 +73,6 @@ 1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) 1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) #1130 stub NPLoadNameSpaces -#1140 stub TransmitFile -#1141 stub AcceptEx -#1142 stub GetAcceptExSockaddrs +1140 stub TransmitFile +1141 stub AcceptEx +1142 stub GetAcceptExSockaddrs

1 0

Roderick Colenbrander : wined3d: Make sure we receive a hw accelerated pixel format with OpenGL support.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: b6951822c10e1c1bb8ad72c39c80f6601ca078de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6951822c10e1c1bb8ad72c39… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Oct 5 20:02:50 2007 +0200 wined3d: Make sure we receive a hw accelerated pixel format with OpenGL support. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 23569fa..c2c1552 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -221,6 +221,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar PUSH2(WGL_DRAW_TO_WINDOW_ARB, GL_TRUE); /* We want to draw to a window */ PUSH2(WGL_DOUBLE_BUFFER_ARB, GL_TRUE); PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ + PUSH2(WGL_SUPPORT_OPENGL_ARB, GL_TRUE); + PUSH2(WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB); /* Make sure we receive an accelerated format. On windows (at least on ATI) this is not always the case */ if(!getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ERR("Unable to get color bits for format %#x!\n", target->resource.format);

1 0

Dan Kegel : msvcrt: Fix ^Z handling in text mode.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 56eb6f67305ae390c709adddd114fd9040334135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56eb6f67305ae390c709adddd… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Oct 5 04:27:08 2007 -0700 msvcrt: Fix ^Z handling in text mode. --- dlls/msvcrt/file.c | 10 ++++++++-- dlls/msvcrt/tests/file.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b878781..8bacffa 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -59,6 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* values for wxflag in file descriptor */ #define WX_OPEN 0x01 #define WX_ATEOF 0x02 +#define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */ #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 #define WX_TEXT 0x80 @@ -827,7 +828,7 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence) ofs.QuadPart = offset; if (SetFilePointerEx(hand, ofs, &ret, whence)) { - MSVCRT_fdesc[fd].wxflag &= ~WX_ATEOF; + MSVCRT_fdesc[fd].wxflag &= ~(WX_ATEOF|WX_READEOF); /* FIXME: What if we seek _to_ EOF - is EOF set? */ return ret.QuadPart; @@ -1666,6 +1667,11 @@ static int read_i(int fd, void *buf, unsigned int count) char *bufstart = buf; HANDLE hand = msvcrt_fdtoh(fd); + if (MSVCRT_fdesc[fd].wxflag & WX_READEOF) { + MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; + TRACE("already at EOF, returning 0\n"); + return 0; + } /* Don't trace small reads, it gets *very* annoying */ if (count > 4) TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); @@ -1692,7 +1698,7 @@ static int read_i(int fd, void *buf, unsigned int count) } if (num_read != count) { - MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; + MSVCRT_fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); TRACE(":EOF %s\n",debugstr_an(buf,num_read)); } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 4a311e4..e0f1b99 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -287,6 +287,23 @@ static void test_asciimode(void) ok((fread(buf, 1, sizeof(buf), fp) == 2) && (0 == strcmp(buf, "\r\n")), "CR CR LF not read as CR LF\n"); fclose(fp); unlink("ascii.tst"); + + /* Simple test of foo ^Z [more than one block] bar handling */ + fp = fopen("ascii.tst", "wb"); + fputs("foo\032", fp); /* foo, logical EOF, ... */ + fseek(fp, 65536L, SEEK_SET); /* ... more than MSVCRT_BUFSIZ, ... */ + fputs("bar", fp); /* ... bar */ + fclose(fp); + fp = fopen("ascii.tst", "rt"); + ok(fgets(buf, sizeof(buf), fp) != NULL, "fgets foo\n"); + ok(0 == strcmp(buf, "foo"), "foo ^Z not read as foo by fgets\n"); + ok(fgets(buf, sizeof(buf), fp) == NULL, "fgets after logical EOF\n"); + rewind(fp); + ok((fread(buf, 1, sizeof(buf), fp) == 3) && (0 == strcmp(buf, "foo")), "foo ^Z not read as foo by fread\n"); + ok((fread(buf, 1, sizeof(buf), fp) == 0), "fread after logical EOF\n"); + fclose(fp); + + unlink("ascii.tst"); } static WCHAR* AtoW( const char* p )

1 0

Roderick Colenbrander : wined3d: Remove an unused ChoosePixelFormat line.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 3978535ced28c0056d75a659c6f0835ddafac1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3978535ced28c0056d75a659c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Oct 5 20:03:33 2007 +0200 wined3d: Remove an unused ChoosePixelFormat line. --- dlls/wined3d/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c2c1552..245770e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -248,7 +248,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } PUSH1(0); /* end the list */ - iPixelFormat = ChoosePixelFormat(hdc, &pfd); /* In case of failure hope that standard ChooosePixelFormat will find something suitable */ if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats)))

1 0