February 2008 - Wine-Devel - list.winehq.org

Re: user32dll: cursoricon.c. Fix 16b BMP handling with BT_BITFIELD.
by Dmitry Timoshkov Feb. 20, 2008

Feb. 20, 2008

"Alexander Demakin" <avd(a)etersoft.ru> wrote: > This patch fixes image header handling with BT_BITFIELD flag. 12 bytes of mask > were included into image bits, it caused some color troubles and image > horizontal shift. Size of bitmap info structure includes now this bytes. You are mixing tabs and spaces again, and please use 4 spaces for indentation. > static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) > { > int colors; > - > + int result; > if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) Any reason you have removed a space after a variable declaration? > Changelog: > user32.dll Fix 16b BMP handling with BT_BITFIELD. Please have a look how others name the patches. A usual convenience is to write dll name without extension, ': ' and short description. -- Dmitry.

1 0

Re: gdi32dll: bitblt.c. Fix copying from uninitialized memory
by Dmitry Timoshkov Feb. 20, 2008

Feb. 20, 2008

"Alexander Demakin" <avd(a)etersoft.ru> wrote: > This patch adds check of return value of GetDIBits in BitBlt.c. If a error > occurs, GetDIBits returns 0 and bits variable points to uninitialized data. > It always occurs when calling BitBlt for printer context due to > implementation of PSDRV_SelectBitmap(). > Changelog: > gdi32.dll Fix copying from uninitialized memory. You are mixing tabs and spaces in the patch, otherwise tha patch looks good to me. -- Dmitry.

1 0

Re: dlls/msi/streams.c type fixes
by James Hawkins Feb. 20, 2008

Feb. 20, 2008

On Feb 17, 2008 6:23 AM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > This patch contains one or two items from my November patch the core > of which was independently recreated by Marcus and accepted and one > or two additional changes. It addresses the following warnings: > > streams.c: In function 'streams_set_table_size': > streams.c:59: warning: comparison between signed and unsigned > streams.c: In function 'STREAMS_delete': > streams.c:379: warning: comparison between signed and unsigned > streams.c: In function 'STREAMS_find_matching_rows': > streams.c:404: warning: comparison between signed and unsigned > > Gerald > > ChangeLog: > Adjust the signedness of three variables and add a comment for > add_streams_to_table(). > > Index: streams.c > =================================================================== > RCS file: /home/wine/wine/dlls/msi/streams.c,v > retrieving revision 1.11 > diff -u -3 -p -r1.11 streams.c > --- streams.c 16 Feb 2008 15:59:26 -0000 1.11 > +++ streams.c 17 Feb 2008 12:17:50 -0000 > @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); > > typedef struct tabSTREAM > { > - int str_index; > + UINT str_index; > LPWSTR name; > IStream *stream; > } STREAM; > @@ -54,7 +54,7 @@ typedef struct tagMSISTREAMSVIEW > UINT row_size; > } MSISTREAMSVIEW; > > -static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size) > +static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) > { > if (size >= sv->max_streams) > { > @@ -372,7 +372,7 @@ static UINT STREAMS_modify(struct tagMSI > static UINT STREAMS_delete(struct tagMSIVIEW *view) > { > MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; > - int i; > + UINT i; > > TRACE("(%p)\n", view); > > @@ -440,6 +440,7 @@ static const MSIVIEWOPS streams_ops = > }; > > static INT add_streams_to_table(MSISTREAMSVIEW *sv) > + /* Return -1 in case of error. */ > { > IEnumSTATSTG *stgenum = NULL; > STATSTG stat; > Don't add random comments like this. -- James Hawkins

2 1

Re: shell32: Support getting the shell folder path for users other than the current user and the default user (take 2)
by Alexandre Julliard Feb. 20, 2008

Feb. 20, 2008

"Ge van Geldorp" <ge(a)thinstall.com> writes: > else > { > + LPWSTR sidStr = NULL; > LPCWSTR userPrefix = NULL; > HKEY hRootKey; This is not used anywhere. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [advapi32] QueryServiceConfig2 (3rd try) [resend]
by Alexandre Julliard Feb. 20, 2008

Feb. 20, 2008

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > + switch(dwLevel) { > + case SERVICE_CONFIG_DESCRIPTION: { > + static const WCHAR szDescription[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; > + LPSERVICE_DESCRIPTIONW config = (LPSERVICE_DESCRIPTIONW) buffer; > + *needed = sizeof (SERVICE_DESCRIPTIONW); > + sz = size - *needed; > + r = RegQueryValueExW( hKey, szDescription, 0, &type, (LPBYTE) (config ? config + 1: NULL), &sz ); > + if((r == ERROR_SUCCESS) && ( type != REG_SZ)) { > + FIXME("SERVICE_CONFIG_DESCRIPTION: don't know how to handle type %d\n", type); > + return FALSE; > + } > + *needed += sz; > + if(config) { > + if(r == ERROR_SUCCESS) > + config->lpDescription = (LPWSTR) (config + 1); > + else > + config->lpDescription = NULL; You are still not handling overflows correctly. What happens if size is less than sizeof(SERVICE_DESCRIPTIONW)? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] user32:scroll: Added some tests for scrollbar [try2]
by Alexandre Julliard Feb. 20, 2008

Feb. 20, 2008

Anatoly Lyutin <vostok(a)etersoft.ru> writes: > Changelog: > Added some tests for scrollbar The tests fail: ../../../tools/runtest -q -P wine -M user32.dll -T ../../.. -p user32_test.exe.so scroll.c && touch scroll.ok scroll.c:56: Test failed: The scrollbar window should be disabled. scroll.c:122: Test failed: The ShowScrollBar() should failed. make: *** [scroll.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Adding devices to registry with the help of hal
by Christian Gmeiner Feb. 20, 2008

Feb. 20, 2008

Hi all, I want you to present my current proof-of-conecpt. It shows how we can use hal.c of explorer to create registry keys for devices. Keep in mind that it only creates one registry key for each usb device at the moment. Before I investigate more time in this, I want to get some feedback about my method. If you are happy with it, I will finish this suftt :) Greets, Christian

1 0

re: Do we need a forum?
by Dan Kegel Feb. 19, 2008

Feb. 19, 2008

Steven Edwards wrote: > My thoughts, as well as > Tom's was that by creating a "blessed" location, all third parties as > well as vendors that develop Wine related products could say "if you > want to discuss using a vendor provided Wine product in a > non-supported manner all are advised to go here and share information" Yes, of course, it would be nice if there were One True Place to go, but the closest we're ever going to get is essentially the status quo, where the wine-users mailing list is the place of record for user support, the appdb is the place of record for looking for tips for a particular app, and all the other areas are secondary. We can improve slightly on this by linking to other popular wine forums as they pop up, emphasizing all the while that they are secondary. - Dan

5 8

Fwd: Adding devices in setupapi
by Maarten Lankhorst Feb. 19, 2008

Feb. 19, 2008

Hi Juan, 2008/2/19, Juan Lang <juan.lang(a)gmail.com>: > > I stubbed CM_get_parent by returning itself, however that makes it go > > in an infinite loop. > > Hm. > > > My guess is that I need to have some hub and usb ehci device as well. > > I don't know why it would want to call CreateFile on the device though > > but my expertise on that part is very limited, perhaps it allows > > communication to the ipod by accessing the device in a raw way? > > Perhaps, or perhaps it's just making sure you don't have a fake device :-/ > --Juan The only way to be sure would be to create my own test program that would do the same, and see what happens. How hard is it to create a stub forwarder dll for setupapi and cfgmgr32? Cheers, Maarten.

1 0

Saulius sent you a friend request on Yaari...
by Saulius Feb. 19, 2008

Feb. 19, 2008

1 0

Adding devices in setupapi
by Maarten Lankhorst Feb. 19, 2008

Feb. 19, 2008

Hi all, I'm trying to add the ipod detection from crossover wine to winehq. However it seems to be not compatibel due to changes to setupapi in the last 3 years. Basically what I want to do is add an usb mass storage device with the correct device path and register it with setupapi. Composing the string is easy but I'm not 100% sure what the locations are. The code seems a bit vague in that aspect. The snippet iTunes uses for detection is shown below: SetupDiGetClassDevsExW {53f56307-b6bf-11d0-94f2-00a0c91efb8b} (null) (nil) 0x00000012 (nil) (null) (nil) SetupDiEnumDeviceInterfaces 0x136638, (nil), {53f56307-b6bf-11d0-94f2-00a0c91efb8b}, 0, 0x7aa2140c How do I get my device listed in SetupDiEnumDeviceInterfaces there so iTunes can pick it up? Cheers, Maarten.

3 2

Making use of setupapi
by Maarten Lankhorst Feb. 19, 2008

Feb. 19, 2008

Hi folks, Any one around who understands setupapi? For iTunes I would need to add appropriate registry keys so that my usb device is detected. My idea is to use libusb to find the things like guid, revision etc and then adding the keys. However I am not 100% what the layout of the keys is. Cheers, Maarten.

3 3

Re: ddraw: Assign to structs instead of using memcpy
by Stefan Dösinger Feb. 19, 2008

Feb. 19, 2008

Am Samstag, 16. Februar 2008 23:33:37 schrieb Andrew Talbot: > Here, I am assuming that the "dwSize" elements in all these cases should be > set to the size of the struct each is in, respectively. Please advise if > this assumption is wrong. It's not necessarily true. Sometimes there are multiple versions of the same structure. You can check ddraw.h and d3dtypes.h. If there is only one version your assumption should be true. If there isn't, then your assumption may still be true. In that case there are some tests how the Setter methods deal with newer or older structures(in some cases we may need more tests) > Thanks, > > -- Andy. > --- > Changelog: > ddraw: Assign to structs instead of using memcpy. > > diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c > index b60b6f3..03ccea8 100644 > --- a/dlls/ddraw/device.c > +++ b/dlls/ddraw/device.c > @@ -704,7 +704,7 @@ > IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, > object->d3ddev = This; > > /* Initializes memory */ > - memcpy(&object->desc, Desc, Desc->dwSize); > + object->desc = *Desc; > > /* No buffer given */ > if ((object->desc.dwFlags & D3DDEB_LPDATA) == 0) > diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c > index d6b9a7c..8e17174 100644 > --- a/dlls/ddraw/material.c > +++ b/dlls/ddraw/material.c > @@ -250,7 +250,7 @@ IDirect3DMaterialImpl_SetMaterial(IDirect3DMaterial3 > *iface, /* Stores the material */ > EnterCriticalSection(&ddraw_cs); > memset(&This->mat, 0, sizeof(This->mat)); > - memcpy(&This->mat, lpMat, lpMat->dwSize); > + This->mat = *lpMat; > LeaveCriticalSection(&ddraw_cs); > > return DD_OK; > @@ -285,7 +285,7 @@ IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 > *iface, EnterCriticalSection(&ddraw_cs); > dwSize = lpMat->dwSize; > memset(lpMat, 0, dwSize); > - memcpy(lpMat, &This->mat, dwSize); > + *lpMat = This->mat; > LeaveCriticalSection(&ddraw_cs); > > return DD_OK; > diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c > index deb4146..8dfc015 100644 > --- a/dlls/ddraw/viewport.c > +++ b/dlls/ddraw/viewport.c > @@ -261,7 +261,7 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 > *iface, } > dwSize = lpData->dwSize; > memset(lpData, 0, dwSize); > - memcpy(lpData, &(This->viewports.vp1), dwSize); > + *lpData = This->viewports.vp1; > > if (TRACE_ON(d3d7)) { > TRACE(" returning D3DVIEWPORT :\n"); > @@ -301,7 +301,7 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 > *iface, EnterCriticalSection(&ddraw_cs); > This->use_vp2 = 0; > memset(&(This->viewports.vp1), 0, sizeof(This->viewports.vp1)); > - memcpy(&(This->viewports.vp1), lpData, lpData->dwSize); > + This->viewports.vp1 = *lpData; > > /* Tests on two games show that these values are never used properly > so override them with proper ones :-) > @@ -856,7 +856,7 @@ IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 > *iface, } > dwSize = lpData->dwSize; > memset(lpData, 0, dwSize); > - memcpy(lpData, &(This->viewports.vp2), dwSize); > + *lpData = This->viewports.vp2; > > if (TRACE_ON(d3d7)) { > TRACE(" returning D3DVIEWPORT2 :\n"); > @@ -895,7 +895,7 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 > *iface, EnterCriticalSection(&ddraw_cs); > This->use_vp2 = 1; > memset(&(This->viewports.vp2), 0, sizeof(This->viewports.vp2)); > - memcpy(&(This->viewports.vp2), lpData, lpData->dwSize); > + This->viewports.vp2 = *lpData; > > if (This->active_device) { > > IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, > IDirect3DDevice3), &current_viewport);

2 3

Re: WineD3D: let flush_to_framebuffer_drawpixels use a valid rect
by Stefan Dösinger Feb. 19, 2008

Feb. 19, 2008

Am Dienstag, 19. Februar 2008 21:26:24 schrieben Sie: > Hi, > > Originally flush_to_framebuffer_drawpixels was called from UnlockRect, so > in that case LockedRect was always set. These days it can also be called > (through LoadLocation) from other places. This patch makes it use the > LockedRect when the surface is locked else the whole surface is uploaded. > This fixes rendering issues in Red Alert and other apps. Wouldn't it be better to make sure that the caller passes the correct rectangle to flush_to_framebuffer_* ? > - if(dxVersion >= 8) { > + if(0 && dxVersion >= 8) { Is this intentional?

1 0

Re: slc: Initial stub DLL (try 2)
by Robert Shearman Feb. 19, 2008

Feb. 19, 2008

Alistair Leslie-Hughes wrote: > slc: Initial stub dll I'm not sure we want to go down the path of implementing the functions in this DLL. Furthermore, this file isn't present on an XP SP2 installation. Can you give some information as to why this is needed and how the application depends on this DLL? -- Rob Shearman

3 3

Re: Make.rules.in: Pass the --nounistd flag to flex since unistd.h is a header that might not be present on all systems.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Robert Shearman <rob(a)codeweavers.com> writes: > If we do need it, we can include it in the .l file after config.h and > with an appropriate include guard. You should instead put a %option in the files that need it. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: Pass parms through to PdhLookupPerfIndexByNameW for checking
by Dmitry Timoshkov Feb. 19, 2008

Feb. 19, 2008

"Jeff Latimer" <lats(a)yless4u.com.au> wrote: > + if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE; > > - if (machine) > - { > - FIXME("remote machine not supported\n"); > - return PDH_CSTATUS_NO_MACHINE; > - } > if (!(nameW = pdh_strdup_aw( name ))) > return PDH_MEMORY_ALLOCATION_FAILURE; > > ret = PdhLookupPerfIndexByNameW( NULL, nameW, index ); You forgot to actually pass machineW to PdhLookupPerfIndexByNameW. -- Dmitry.

1 0

re: Do we need a forum?
by Dan Kegel Feb. 19, 2008

Feb. 19, 2008

Anybody who thinks we need another forum needs his head examined. There is no shortage of Wine forums. We just need to use the ones that already exist. Adding a new one will just fragment the community further. In particular, there are two forums right now that people already use to discuss wine problems: a generic one at http://www.linuxforums.org/forum/wine/ and an Ubuntu-specific one at http://ubuntuforums.org/forumdisplay.php?f=313 Let's just link to them. I'll submit a patch to do that in a minute. And I like Griswold's idea (on IRC) of improving the current appdb in small ways, e.g. changing the reply behavior to not open up a new page. For goodness' sake, don't create yet another new forum! - Dan

3 2

Re: slc: Add Initial DLL
by John Klehm Feb. 19, 2008

Feb. 19, 2008

On Feb 18, 2008 10:48 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > Changelog: > slc: Added Initial DLL > > Best Regards > Alistair Leslie-Hughes > > > > No Patch?

1 0

Re: iTunes
by Maarten Lankhorst Feb. 18, 2008

Feb. 18, 2008

Hi Christopher, Christopher Harvey wrote: > What needs to get done for iTunes to work? v7.6 basically works if you set windows version to windows vista, and find out why the installer fails to create the 'Bonjour service' registry stuff properly. I submitted 8 or so stub dll's to wine-patches that make iTunes v7.6 actually start after installation. It checks for the dll's and silently fails if they don't exist. I haven't done any further testing yet though, but it looks like it is probably a small installer bug that prevents itunes v7.6 from installing without first manually creating those registry keys. Cheers, Maarten.

6 17

Re: Usable Wine interface
by Remco Feb. 18, 2008

Feb. 18, 2008

----- Original Message ---- > From: Vitaliy Margolen <wine-devel(a)kievinfo.com> > To: wine-devel(a)winehq.org > Sent: Monday, February 18, 2008 4:16:17 AM > Subject: Re: Usable Wine interface > > Remco wrote: > > I'd like to add a feature-request (should this go somewhereelse?) > Yes, bugzilla -> enhancement. > > Vitaliy. Ok, thanks for the info. I added an entry: http://bugs.winehq.org/show_bug.cgi?id=11629 Remco ____________________________________________________________________________________ Looking for last minute shopping deals? Find them fast with Yahoo! Search. http://tools.search.yahoo.com/newsearch/category.php?category=shopping

5 5

Re: dlls/user32/edit.c -- remove superflous check (RESEND)
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > dwBufLen already indictes that this variable is of type DWORD and > thus always positive. I also looked at the implementation of > ImmGetCompositionStringW() and we do not seem to return a negative > value (such as -1). Maybe the implementation doesn't, but the function returns a LONG, and can (and probably should) return negative values on error. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] Environment variable to specify X11 window for desktop
by Robert Shearman Feb. 18, 2008

Feb. 18, 2008

Timothy Lee wrote: > The attached patch allows the WINE desktop to be embedded within an > existing X11 window, and is similar to the windowed mode in WINE. > > I've tested this feature using MS PowerPoint Viewer 2007, so that a > fullscreen slideshow can be fitted inside any X11 window. I'm struggling to imagine a case where the behaviour you've implemented is useful. -- Rob Shearman

6 13

Re: [PATCH 2/3] gdi32: Move EnumFontFamiliesEx16() and helper functions to gdi16.c.
by Michael Stefaniuc Feb. 18, 2008

Feb. 18, 2008

Michael Stefaniuc wrote: > --- > This duplicates for now the FONT_LogFont16ToW() function but Alexandre It duplicates FONT_LogFontWTo16() and not FONT_LogFont16ToW() (that one was already duplicated). > told me on irc that he removed the other user of it in an yet unpublished > patch. Thus FONT_LogFont16ToW() can be removed from font.c in a later FONT_LogFontWTo16() can be removed later on. > patch. > bye michael

1 0

Re: [1/16] msxml3: Support functions for typelib
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) > +{ > + HRESULT hres; > + > + if(!typelib) { > + ITypeLib *tl; > + > + hres = LoadRegTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, &tl); > + if(FAILED(hres)) { > + ERR("LoadRegTypeLib failed: %08x\n", hres); > + return hres; > + } > + > + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) > + ITypeLib_Release(tl); > + } > + > + if(!typeinfos[tid]) { > + ITypeInfo *typeinfo; > + > + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); > + if(FAILED(hres)) { > + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); > + return hres; > + } > + > + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) > + ITypeInfo_Release(typeinfo); > + } > + > + *typeinfo = typeinfos[tid]; > + return S_OK; You should increment the ref count when you are returning a pointer, even if it's also stored in a global variable. -- Alexandre Julliard julliard(a)winehq.org

2 3