September 2007 - Wine-Devel

WM_CHAR of Ctrl-C, Ctrl-V appear to have no effect in WinXP-SP2 riched20 control
by a_villacis＠palosanto.com Sept. 23, 2007

Sept. 23, 2007

I am trying to fix a few tests for riched20 that attempt to recover the text from the control with WM_GETTEXT and assume the text will be recovered unchanged. As demostrated in a patch I sent a few minutes ago, this assumption is not true when the text to recover contains unbalanced \r, which are converted to \r\n. However I have a strange problem. On my setup (WinXP-SP2 with cygwin), sending Ctrl-C and Ctrl-V with WM_CHAR appears to have no effect on the riched20 control used for the tests. Therefore the text buffer is not modified and the end text remains unchanged. I want to check whether this tests fails in the same way for anybody else, and if not, to receive suggestions on what might be wrong with my setup.

1 0

Re: wine.inf: add some four keys in Active Setup\Installed Components [resend]
by Robert Shearman Sept. 23, 2007

Sept. 23, 2007

Mikolaj Zalewski wrote: > +; Some apps wants at least four keys in Installed Components to run correctly > +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{a2f95861-06e5-4e58-ab61-94cbdde2ff55},Version,2,"1,0,0,0" > +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{c30a0529-fcef-4b19-8e68-9527b54474ac},Version,2,"1,0,0,0" > +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{d0b883e4-af5a-45c9-bd44-deb9867c1d94},Version,2,"1,0,0,0" > +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{e84bb5b4-7fe1-469c-9f24-5a2af3402108},Version,2,"1,0,0,0" You might want to find four real components always present on Windows to add to this key. -- Rob Shearman

2 1

WineD3D patch submission
by Mitchell Wheeler Sept. 22, 2007

Sept. 22, 2007

Hi all, A week or so ago I tried to get a game working in WINE (Titan Quest), however it seems it really needs a proper DIB engine before it'll be playable. Anyways, in my attempt to get it working I fixed up some issues w/ "IWineD3DDeviceImpl_UpdateSurface.c" in dlls/wined3d, not entirely sure how you guys do things around here so I thought i'd just post my changes to the function in this mailing list and you can do with it what you want. (Note: it actually has a few different methods of doing one thing, enclosed in macro blocks to toggle between them. Technically the first one should work (i think :\) once you guys properly implement surface locking/unlocking, and it's 'simplest', but the last one is the only one that actually works properly (using standard OpenGL calls). You'll probably have to clean up the code to meet your coding standards / etc, maybe remove the custom byte size calculation of compressed images, and some other things - but the functionality is there... i also fixed the existing code that didn't actually do what it was supposed to, heh. Regards, Mitchell Wheeler static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurface *pSourceSurface, CONST RECT* pSourceRect, IWineD3DSurface *pDestinationSurface, CONST POINT* pDestPoint) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; /** TODO: remove casts to IWineD3DSurfaceImpl * NOTE: move code to surface to accomplish this ****************************************/ IWineD3DSurfaceImpl *pSrcSurface = (IWineD3DSurfaceImpl *)pSourceSurface; IWineD3DSurfaceImpl *pDestSurface = (IWineD3DSurfaceImpl*)pDestinationSurface; int srcWidth, srcHeight; unsigned int srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight; WINED3DFORMAT destFormat, srcFormat; int srcLeft, srcTop, destLeft, destTop; WINED3DPOOL srcPool, destPool; int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ glDescriptor *glDescription = NULL, *glSrcDescription = NULL; GLenum dummy; int bpp; UINT destByteSize = 0, srcByteSize = 0; int destPixelByteSize = 0, srcPixelByteSize = 0; CONVERT_TYPES convert = NO_CONVERSION; WINED3DSURFACE_DESC winedesc; TRACE("(%p) : Source (%p) Rect (%p) Destination (%p) Point(%p)\n", This, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); memset(&winedesc, 0, sizeof(winedesc)); winedesc.Width = &srcSurfaceWidth; winedesc.Height = &srcSurfaceHeight; winedesc.Pool = &srcPool; winedesc.Format = &srcFormat; winedesc.Size = &srcByteSize; IWineD3DSurface_GetDesc(pSourceSurface, &winedesc); winedesc.Width = &destSurfaceWidth; winedesc.Height = &destSurfaceHeight; winedesc.Pool = &destPool; winedesc.Format = &destFormat; winedesc.Size = &destByteSize; IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); if(srcPool != WINED3DPOOL_SYSTEMMEM || destPool != WINED3DPOOL_DEFAULT){ WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", pSourceSurface, pDestinationSurface); return WINED3DERR_INVALIDCALL; } /* This call loads the opengl surface directly, instead of copying the surface to the * destination's sysmem copy. If surface conversion is needed, use BltFast instead to * copy in sysmem and use regular surface loading. */ d3dfmt_get_conv((IWineD3DSurfaceImpl *) pDestinationSurface, FALSE, TRUE, &dummy, &dummy, &dummy, &convert, &bpp, FALSE); if(convert != NO_CONVERSION) { return IWineD3DSurface_BltFast(pDestinationSurface, pDestPoint ? pDestPoint->x : 0, pDestPoint ? pDestPoint->y : 0, pSourceSurface, (RECT *) pSourceRect, 0); } if (destFormat == WINED3DFMT_UNKNOWN) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", This); IWineD3DSurface_SetFormat(pDestinationSurface, srcFormat); /* Get the update surface description */ IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); } ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); if (GL_SUPPORT(ARB_MULTITEXTURE)) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); } /* Make sure the surface is loaded and up to date */ IWineD3DSurface_PreLoad(pDestinationSurface); IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); IWineD3DSurface_GetGlDesc(pDestinationSurface, &glSrcDescription); /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; srcHeight = pSourceRect ? pSourceRect->bottom - pSourceRect->top : srcSurfaceHeight; srcLeft = pSourceRect ? pSourceRect->left : 0; srcTop = pSourceRect ? pSourceRect->top : 0; destLeft = pDestPoint ? pDestPoint->x : 0; destTop = pDestPoint ? pDestPoint->y : 0; // Calculate the rowOffset / offset values, for copying #define ISDXTFORMAT(format) \ (format == WINED3DFMT_DXT1 || format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 || format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) // Calculating this for our selves because I don't have faith in how surface->bytesPerPixel is calculated... destPixelByteSize = destByteSize / (int)(destSurfaceWidth * destSurfaceHeight); srcPixelByteSize = srcByteSize / (int)(srcSurfaceWidth * srcSurfaceHeight); if(pSourceRect != NULL) { // Irregular surface formats if (destFormat != srcFormat) { FIXME("Can not convert between surface pixel formats..."); // Would require some relatively big code restructuring for rare occurances (that shouldn't even be supported?) return WINED3DERR_INVALIDCALL; } // Uniform surface formats else { if(srcWidth != srcSurfaceWidth || srcLeft > 0) { rowoffset = srcSurfaceWidth * srcPixelByteSize; offset += (srcLeft * srcPixelByteSize); } if(srcTop > 0) offset += srcTop * srcSurfaceWidth * srcPixelByteSize; } } /* Sanity check */ if (IWineD3DSurface_GetData(pSourceSurface) == NULL) { /* need to lock the surface to get the data */ FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); } /* TODO: Cube and volume support */ if(rowoffset != 0) { // Compressed texture if (ISDXTFORMAT(destFormat)) { if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { #if 0 RECT rect; rect.left = destLeft; rect.top = destTop; rect.right = destLeft + srcWidth; rect.bottom = destTop + srcHeight; // Lock source/destination regions WINED3DLOCKED_RECT destRect, srcRect; printf("Locking surfaces...\n"); if( FAILED(IWineD3DSurface_LockRect(pDestinationSurface, &destRect, &rect, 0)) || FAILED(IWineD3DSurface_LockRect(pSourceSurface, &srcRect, pSourceRect, WINED3DLOCK_READONLY))) { // How should we handle this case? Just returning an invalid call for now... return WINED3DERR_INVALIDCALL; } printf("Surfaces locked, copying contents now... "); if(destFormat == WINED3DFMT_DXT1) { printf("DXT1\n"); //memcpy(destRect.pBits, srcRect.pBits, srcRect.Pitch * (srcHeight / 2)); //memcpy(destRect.pBits, srcRect.pBits, srcRect.Pitch * (srcHeight / 2)); memcpy(destRect.pBits, srcRect.pBits, ceil(srcWidth/4) * ceil(srcHeight/4) * 8); } else { printf("DXT2-5\n"); //memcpy(destRect.pBits, srcRect.pBits, srcRect.Pitch * (srcHeight / 4)); memcpy(destRect.pBits, srcRect.pBits, ceil(srcWidth/4) * ceil(srcHeight/4) * 16); } // Unlock source/destination regions IWineD3DSurface_UnlockRect(pSourceSurface); IWineD3DSurface_UnlockRect(pDestinationSurface); printf("Unlocking surfaces...\n"); #elif 0 // Get pointers to the source/destination buffers unsigned char *dest_data = (unsigned char*)IWineD3DSurface_GetData(pDestinationSurface); const unsigned char *src_data = (unsigned char*)IWineD3DSurface_GetData(pSourceSurface); // Copy subsection of source buffer, in to destination buffer. unsigned char *dest_ptr = dest_data + offset; const unsigned char *src_ptr = src_data + offset; size_t i; for(i = 0; i < srcHeight; ++i) { memcpy(dest_ptr, src_ptr, srcWidth * srcPixelByteSize); dest_ptr += rowoffset; src_ptr += rowoffset; } // Upload destination buffer to server GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, glDescription->glFormatInternal, srcWidth, srcHeight, 0, destByteSize, dest_data)); checkGLcall("glCompressedTexImage2DARB"); #elif 1 int blocksize = 16; if(destFormat == WINED3DFMT_DXT1) blocksize = 8; #define max(a, b) (a > b? a : b) srcHeight = max(srcHeight, 4); srcWidth = max(srcWidth, 4); #undef max int data_size = (srcWidth / 4) * (srcHeight / 4) * blocksize; int row_size = data_size / srcHeight; int pixel_size = row_size / srcWidth; int stride = srcSurfaceWidth * pixel_size; unsigned char *temp_buffer = HeapAlloc(GetProcessHeap(), 0, data_size); unsigned char *temp_ptr = temp_buffer; // Debug info //printf(" > BytesTotal: %i | BytesPerPixel: %i | RowSize: %i\n", data_size, pixel_size, row_size); //printf(" > Source: %i -> %i, %i -> %i | Dest: %i, %i\n", srcLeft, srcWidth, srcTop, srcHeight, destLeft, destTop); //printf(" > Offset: %i\n", (int)((row_size * srcTop) + srcLeft * pixel_size)); // Get pointers to the source buffer const unsigned char *src_data = (unsigned char*)IWineD3DSurface_GetData(pSourceSurface); src_data += (stride * srcTop) + srcLeft * pixel_size; size_t i; for(i = 0; i < srcHeight; ++i) { memcpy(temp_ptr, src_data, row_size); temp_ptr += row_size; src_data += stride; } GL_EXTCALL(glCompressedTexSubImage2DARB( glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, glDescription->glFormatInternal, data_size, temp_buffer )); //checkGLcall("glCompressedTexSubImage2DARB"); HeapFree(GetProcessHeap(), 0, temp_buffer); #endif } else { FIXME("TODO: Need to update a DXT compressed texture without hardware support\n"); } } // Uncompressed texture else { /* not a whole row so we have to do it a line at a time */ int j; /* hopefully using pointer addtion will be quicker than using a point + j * rowoffset */ const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; for(j = destTop; j < (srcHeight + destTop); ++j) { glTexSubImage2D(glDescription->target ,glDescription->level ,destLeft ,j ,srcWidth ,1 ,glDescription->glFormat ,glDescription->glType ,data /* could be quicker using */ ); data += rowoffset; } } } else { // Compressed texture if (ISDXTFORMAT(destFormat)) { if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { int blocksize = 16; if(destFormat == WINED3DFMT_DXT1) blocksize = 8; #define max(a, b) (a > b? a : b) int data_size = (max(srcWidth, 4) / 4) * (max(srcHeight, 4) / 4) * blocksize; #undef max //printf(" -> S = %i | CompressedTexImage2D(?, %i, %i, %i, %i, 0, %i, ?)\n", destByteSize, glDescription->level, glDescription->glFormatInternal, srcWidth, srcHeight, data_size); GL_EXTCALL(glCompressedTexSubImage2DARB(glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, glDescription->glFormatInternal, data_size, IWineD3DSurface_GetData(pSourceSurface))); checkGLcall("glCompressedTexImage2DARB"); } else { FIXME("TODO: Need to update a DXT compressed texture without hardware support\n"); } } // Uncompressed Texture else { glTexSubImage2D( glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, glDescription->glFormat, glDescription->glType, IWineD3DSurface_GetData(pSourceSurface) ); checkGLcall("glTexSubImage2D"); } } LEAVE_GL(); ((IWineD3DSurfaceImpl *)pDestinationSurface)->Flags &= ~SFLAG_INSYSMEM; ((IWineD3DSurfaceImpl *)pDestinationSurface)->Flags |= SFLAG_INTEXTURE; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(0)); return WINED3D_OK; }

5 7

Re: Minimal Background Intelligent Transfer Service (bits) implementation
by Michael Stefaniuc Sept. 22, 2007

Sept. 22, 2007

Hello Roy, Roy wrote: > This patch provides a first skeleton version of bits.dll. thanks for the patch but could you please add also a DLL_WINE_PREATTACH case in DllMain()? That way Wine can prefer to load a native bits DLL (if one is available) until the Wine one gets usable. See for example the mscoree DLL for an example (dlls/mscoree/mscoree_main.c). thanks bye michael > From 95f4728e706861f201fb2b399e7ca5db128e71b3 Mon Sep 17 00:00:00 2001 > From: Roy Shea <roy(a)cs.ucla.edu> > Date: Tue, 18 Sep 2007 14:29:14 -0700 > Subject: Minimal Background Intelligent Transfer Service (bits) implementation > > --- > dlls/bits/Makefile.in | 16 ++++++++++++++++ > dlls/bits/bits.spec | 4 ++++ > dlls/bits/bits_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 63 insertions(+), 0 deletions(-) > create mode 100644 dlls/bits/Makefile.in > create mode 100644 dlls/bits/bits.spec > create mode 100644 dlls/bits/bits_main.c > > diff --git a/dlls/bits/Makefile.in b/dlls/bits/Makefile.in > new file mode 100644 > index 0000000..2c9e293 > --- /dev/null > +++ b/dlls/bits/Makefile.in > @@ -0,0 +1,16 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +MODULE = bits.dll > +IMPORTS = kernel32 > +EXTRALIBS = > + > +C_SRCS = \ > + bits_main.c > + > +#RC_SRCS = version.rc > + > +(a)MAKE_DLL_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/bits/bits.spec b/dlls/bits/bits.spec > new file mode 100644 > index 0000000..c5fc87a > --- /dev/null > +++ b/dlls/bits/bits.spec > @@ -0,0 +1,4 @@ > +@ stub DllCanUnloadNow > +@ stub DllGetClassObject > +@ stub DllRegisterServer > +@ stub DllUnregisterServer > diff --git a/dlls/bits/bits_main.c b/dlls/bits/bits_main.c > new file mode 100644 > index 0000000..37be887 > --- /dev/null > +++ b/dlls/bits/bits_main.c > @@ -0,0 +1,43 @@ > +/* > + * Implementation of bits.dll > + * Background Intelligent Transfer Service (bits) interface > + * > + * Copyright 2007 Google (Roy Shea) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "wine/debug.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL( bits ); > + > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > +{ > + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); > + > + switch (fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + DisableThreadLibraryCalls(hinstDLL); > + break; > + case DLL_PROCESS_DETACH: > + break; > + } > + > + return TRUE; > +} > > > ------------------------------------------------------------------------ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Hauptstätter Strasse 58, 70178 Stuttgart Handelsregister: Amtsgericht Stuttgart HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Werner Knoblich

3 2

Re: services.exe[3/3]: start a local RPC server [fixed]
by Robert Shearman Sept. 22, 2007

Sept. 22, 2007

Mikolaj Zalewski wrote: > diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in > index 8f6fe33..85e9680 100644 > --- a/dlls/advapi32/Makefile.in > +++ b/dlls/advapi32/Makefile.in > @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = advapi32.dll > IMPORTLIB = libadvapi32.$(IMPLIBEXT) > -IMPORTS = kernel32 ntdll > +IMPORTS = rpcrt4 kernel32 ntdll I think you should make rpcrt4 a DELAYIMPORT since it should only be needed for program that use services. Also, you have added one or two header files that don't have a copyright and LGPL statement at the top, which should probably be fixed before the final version (the exception is the one-line files to make the generated files appear in the right place). -- Rob Shearman

1 0

Re: advapi32: add some more rights constants for ConvertStringSecurityDescriptorToSecurityDescriptor
by Hans Leidekker Sept. 22, 2007

Sept. 22, 2007

On Saturday 22 September 2007 04:19:09 Mikolaj Zalewski wrote: > + > + ADS_RIGHT_DELTE = 0x00010000, You're missing an E there. -Hans

1 0

re: Will ROS and WINE still be steady be synchronized ?
by Dan Kegel Sept. 21, 2007

Sept. 21, 2007

Shachar Shemesh wrote: > As far as I understand this, if I disassemble Microsoft binaries (it is > legal in Israel), then the resulting knowledge is legal to use - > anywhere (in other words - the only one who can be sued is me, and the > jurisdiction is Israel, where the action is legal). I am not a lawyer, but I bet you're wrong there. The disassembled code is probably considered a copy, using it could be a copyright violation, and if any such code snuck into Wine, we'd have to go rip it out at great cost. - Dan

5 11

Re: services.exe[3/3]: start a local RPC server and make advapi32 connect/disconnect to it on service manager handle creation/destruction
by Robert Shearman Sept. 21, 2007

Sept. 21, 2007

Mikolaj Zalewski wrote: > + /* Compatible with Windows function 0x0f */ > + DWORD svcctl_OpenSCManagerW( > + SvcCtlRpcHandle rpc_handle, > + [in,unique,string] LPCWSTR MachineName, > + [in,unique,string] LPCWSTR DatabaseName, > The string attribute should be redundant as LPCWSTR should already be declared as a string type. I also noticed this redundancy in your fourth services patch. > + if ((err = RpcServerInqBindings(&pbindingVector)) != ERROR_SUCCESS) > + { > + WINE_ERR("RpcServerInqBindings failed with error %u\n", err); > + return err; > + } What's the purpose of this? You don't actually use the binding vector anywhere. -- Rob Shearman

1 0

Re: Patch: ntoskrnl.exe - Added PsCreateSystemThread
by Dmitry Timoshkov Sept. 20, 2007

Sept. 20, 2007

"Carroll Vance" <ovencleaner(a)gmail.com> wrote: > I have implemented PsCreateSystemThread in ntoskrnl.exe. This API i have > found used by programs like nProtect gameguard, and is a pretty commonly > used kernel api. This either ends up calling CreateThread or > CreateRemoteThread depending on if a process handle was provided. You can call CreateRemoteThread without any checks for the process handle. > This is my > first patch, I read over the dev docs and patch format, I hope I did not > miss anything. I have tested this with a driver I made and it seemed to work > fine. Your patch mixes tabs and spaces on the same line, that makes formatting messy. Also if you could add spaces around '!=' and '==' in if statements that would make the code slightly more readable. -- Dmitry.

1 0

Re: Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for joystick buttons
by John Klehm Sept. 20, 2007

Sept. 20, 2007

On 9/20/07, Antonio Cuni <anto.cuni(a)gmail.com> wrote: > At least one game (Pro Evolution Soccer 6) rely on the pguid field of > the DIOBJECTDATAFORMAT struct to respond to joystick button's events. > Setting pguid to GUID_Button solves the problem. > > 2007-09-20 Antonio Cuni <anto.cuni(a)gmail.com> > > * dlls/dinput/joystick_linux.c, > dlls/dinput/joystick_linuxinput.c > Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for > joystick buttons > > > + df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be > + > df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be GUID_Button > You need to use C style comments /* */ Regards =), --John Klehm

1 0

Re: Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for joystick buttons
by Vitaliy Margolen Sept. 20, 2007

Sept. 20, 2007

Antonio Cuni wrote: > At least one game (Pro Evolution Soccer 6) rely on the pguid field of > the DIOBJECTDATAFORMAT struct to respond to joystick button's events. > Setting pguid to GUID_Button solves the problem. > > 2007-09-20 Antonio Cuni <anto.cuni(a)gmail.com> > > * dlls/dinput/joystick_linux.c, > dlls/dinput/joystick_linuxinput.c > Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for > joystick buttons > Thank you for the patch. I have few comments about it: > -- /tmp/wine-0.9.45/dlls/dinput/joystick_linux.c 2007-09-14 19:30:55.000000000 +0200 > +++ ./joystick_linux.c 2007-09-20 17:02:15.000000000 +0200 You should diff from the top of the tree (above line should say dlls/dinput/joystick_linux.c). > + df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be GUID_Button C++ comments are not allowed in Wine. Please put comments above the code. > newDevice->buttons[i] = 0x80 | newDevice->numButtons; > + df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be GUID_Button > df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numButtons++) | DIDFT_PSHBUTTON; Please don't use tabs. Use spaces to keep formating. Vitaliy.

1 0

Re: Implemented PsCreateSystemThread in ntoskrnl.exe
by Juan Lang Sept. 20, 2007

Sept. 20, 2007

Hi Carroll, + if (ProcessHandle!=0) + localThreadHandle = CreateRemoteThread(ProcessHandle,0,0,StartRoutine,StartContext,0,&ThreadId); + else localThreadHandle = CreateThread(0,0,StartRoutine,StartContext,0,&ThreadId); + + if (localThreadHandle==0) return STATUS_SEVERITY_ERROR; You should use NtCreateThread rather than CreateThread. It also returns a proper status, so you don't have to guess like you do here. --Juan

2 2

[PATCH] fix small spelling mistakes
by Juan Lang Sept. 20, 2007

Sept. 20, 2007

Hi Peter, > correct spelling of iff -> if Just so you know, iff is a common abbreviation meaning "if and only if." I don't think that's any clearer in the cases you modified, so I think your patch is fine, I just thought you (and others) might be interested. --Juan

2 1

Will ROS and WINE still be steady be synchronized ?
by theUser BL Sept. 20, 2007

Sept. 20, 2007

Hi! I have also ask the question in a mail in the ROS-Mailinglist -- until now there comes now answer. http://www.reactos.org/archives/public/ros-dev/2007-August/009718.html Will ReactOS and WINE still be steady synchronized? ROS have for example an other Notepad.exe and an other Wordpad.exe The WineMINE have on ROS the colors of the original Windows WinMine. And the cards.dll have other cards. AT first it used the cards of http://nifty.stanford.edu/2004/EstellCardGame/ But after the comment of http://www.reactos.org/archives/public/ros-dev/2007-July/009625.html it used the cards at http://sourceforge.net/projects/macsolitairex WINE on the other side used since the beginning of its cards.dll the Microsoft copyrighted cards, which are also part of MS-Windows. So, for me it seems, that ROS and WINE goes two different ways since some time without syncronizing the source-codes, which can be used for both projects. Is that true? And if yes: Why? Greatings theuserbl _________________________________________________________________ Sie suchen E-Mails, Dokumente oder Fotos? Die neue MSN Suche Toolbar mit Windows-Desktopsuche liefert in sekundenschnelle Ergebnisse. Jetzt neu! http://desktop.msn.de/ Jetzt gratis downloaden!

4 4

Re: WineD3D: better video memory reporting
by Juan Lang Sept. 20, 2007

Sept. 20, 2007

Your patch appears empty: > Type: text/x-diff > Size: 0 bytes --Juan

2 1

Re: setupapi(8/22): Implement SetupDiCreateDeviceInfoW
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

"Juan Lang" <juan.lang(a)gmail.com> writes: > +static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) > +{ > + LPCWSTR ptr; > + DWORD devNameLen = lstrlenW(devName), devInst = 0; > + BOOL valid = TRUE; > + > + TRACE("%s\n", debugstr_w(devName)); > + for (ptr = devName; valid && *ptr && ptr - devName < devNameLen; ) > + { > + if (isdigitW(*ptr)) > + { > + devInst <<= 8; This won't do what you want. You'd need *= 10 if the id is really stored in decimal, though 0000 looks more like it should be in hex. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: winex11.drv/wintab32[3/5]: make wintab strings in winex11.drv Unicode, implement WTInfoW
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

"Mikolaj Zalewski" <mikolajz(a)google.com> writes: > @@ -305,8 +312,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) > hwndTabletDefault = hwnddefault; > > /* Do base initializaion */ > - strcpy(gSysContext.lcName, "Wine Tablet Context"); > - strcpy(gSysDevice.NAME,"Wine Tablet Device"); > + MultiByteToWideChar(CP_UTF8, 0, "Wine Tablet Context", -1, gSysContext.lcName, WT_MAX_NAME_LEN); > + MultiByteToWideChar(CP_UTF8, 0, "Wine Tablet Device", -1, gSysDevice.NAME, WT_MAX_NAME_LEN); You should define Unicode constants directly, there's no need to convert at run-time. > @@ -695,10 +716,12 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) > X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); > for (cur_loop=0; cur_loop < gNumCursors; cur_loop++) > { > + char cursorNameA[WT_MAX_NAME_LEN]; > int event_number=0; > > + WideCharToMultiByte(CP_UNIXCP, 0, gSysCursor[cur_loop].NAME, -1, cursorNameA, WT_MAX_NAME_LEN, NULL, NULL); > for (loop=0; loop < num_devices; loop ++) > - if (strcmp(devices[loop].name,gSysCursor[cur_loop].NAME)==0) > + if (strncmp(devices[loop].name, cursorNameA, WT_MAX_NAME_LEN)==0) This doesn't look right; if the name overflows the buffer we shouldn't simply match against a truncated string. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Alexandre Julliard : wordpad.exe: We can now store binary files in the repository.
by Markus Amsler Sept. 20, 2007

Sept. 20, 2007

So we can also add ttf fonts and get rid of the fontforge dependency? Markus

2 1

Re: kernel32: Don't crash accessing an invalid handle in GlobalSize [try3]
by Dmitry Timoshkov Sept. 20, 2007

Sept. 20, 2007

"James Hawkins" <truiken(a)gmail.com> wrote: > This version compares the pointer value to 64000 instead of using a > try/catch block, as suggested by Alexandre. > - if(pintern->Magic==MAGIC_GLOBAL_USED) > + if(pintern > (PGLOBAL32_INTERN)64000 && pintern->Magic==MAGIC_GLOBAL_USED) > { > if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ It should be either 65535 (0xffff), or a test for HIWORD(pintern) being 0. Also the cast should be to (char *) on both sides rather than (PGLOBAL32_INTERN). -- Dmitry.

2 1

Handling New IDLs with widl
by Roy Sept. 19, 2007

Sept. 19, 2007

Howdy, I'm looking for advice on how to integrate a new idl into wine. I'm implementing bits and using the widl compiler on the IDL I wrote. My current setup places the IDL in include/ with the build system generating a header file that it posits there. So far, so good. I now need to generate bits_i.c and link that into my dll located in dlls/bits. Adding: ---- IDL_I_SRCS = $(TOPSRCDIR)/include/bits.idl ---- to dlls/bits/Makefile.in solves this problem but drops the bits_i.c into include/. This is rather messy. Any advice on if I should (1) moving my IDL into dlls/bits/ and do everything locally or (2) dig into Make.rules.in and update the rule for *_i.c generation to allow the generated file to exist locally with the .idl sitting in include. The second idea is a little tricky since the current rule is careful to rename the generated .i file with the -U option: ---- .idl_i.c: $(WIDL) $(IDLFLAGS) -u -U $@ $< ---- which is a great idea, but uses the full path to the original idl when renaming the file. Probably good for the general case, but not for me. Thanks for the advice! -Roy

2 1

Re: wineboot: Pass non-zero timeouts to SendMessageTimeout, otherwise the call won't timeout.
by Alexandre Julliard Sept. 19, 2007

Sept. 19, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > Set the default for WM_QUERYENDSESSION to be 5s which should be enough > time for users to respond to any message boxes and WM_ENDSESSION to a > lower 1s. If you are going to timeout on the user interaction you need to popup a confirmation dialog of some kind to allow users to force killing the app; you can't kill it just because the user didn't click on a "do you want to save your file?" message box fast enough. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: widl [2/2]: Implement pointer descriptions for complex structures
by Robert Shearman Sept. 19, 2007

Sept. 19, 2007

Dan Hipschman wrote: > var_t *field, > } > else if (is_ptr(type)) > { > - print_file(file, 2, "0x8,\t/* FC_LONG */\n"); > + unsigned char fc = (cont->type == RPC_FC_BOGUS_STRUCT > + ? RPC_FC_POINTER > + : RPC_FC_LONG); > + print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); > *tfsoff += 1; > } > else if (!write_base_type(file, type, tfsoff)) > I sent a patch yesterday which does a similar thing to this chunk. I think we need to agree on which approach we're going to take so we can let Alexandre know which patch to commit. -- Rob Shearman

2 4

Re: winsock: Increase amount of iovec's to 32
by Alexandre Julliard Sept. 19, 2007

Sept. 19, 2007

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> writes: > I don't know why WS_MSG_MAXIOVLEN is used here, that seems to be a > message identifier rather then the actual size of MAXIOVLEN, so I added > a define for MAXIOVLEN and made it 32. MSG_MAXIOVLEN is not a message identifier, it's really supposed to be an iovec size. Do you have a test case showing that Windows uses 32 instead? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: include: add a macro to declare critical sections as we declare them in Wine - initialized and with a debug
by Alexandre Julliard Sept. 19, 2007

Sept. 19, 2007

"Mikolaj Zalewski" <mikolajz(a)google.com> writes: > Would such a patch be accepted? No, debug.h is about the libwine debugging API, critical sections have nothing to do with that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winex11.drv: When minimizing a top level window move it outside of the visible desktop area
by Alexandre Julliard Sept. 19, 2007

Sept. 19, 2007

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > Changelog: > winex11.drv: When minimizing a top level window move it outside of > the visible desktop area. This will break apps that expect to paint their icon window, and probably also break the positioning of the icon title. It also doesn't work even for standard icons in desktop mode. -- Alexandre Julliard julliard(a)winehq.org

1 0