wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: OLEPICTURE: Initialize [orig|himetric][Width|Height] for PICTYPE_ICON case
by Alexandre Julliard 29 Mar '05

29 Mar '05

Alex Villacis Lasso <a_villacis(a)palosanto.com> writes: > + hdcRef = CreateCompatibleDC(0); > + pInfoBitmap = (BITMAPINFO *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); > + pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); > + GetDIBits(hdcRef, infoIcon.hbmColor, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); This seems a bit overkill just to retrieve the bitmap size. Couldn't you simply do a GetObject on the bitmap? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: MSVCRT: implement _chsize (RESEND)
by Alexandre Julliard 29 Mar '05

29 Mar '05

Hans Leidekker <hans(a)it.vu.nl> writes: > Anything wrong with this one? > > This should fix apps built with MinGW (bug report 2826). You should at least restore the file position before returning, though it would probably be better to not change the file position at all, this is not thread safe. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: KERNEL: improve stubs for DnsHostnameToComputerName{A,W} (RESEND)
by Dmitry Timoshkov 29 Mar '05

29 Mar '05

"Hans Leidekker" <hans(a)it.vu.nl> wrote: > +BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, > + LPSTR computername, LPDWORD size) > + for (i = 0; i <= len; i++) > + computername[i] = toupper(hostname[i]); You can't use toupper() from glibc on a name in a Windows encoding. Why not just call a W version to do the job? -- Dmitry.

2 1

BadDrawable and install shield.
by Oliver Stieber 29 Mar '05

29 Mar '05

Hi, I've been having a lot of problems with install shield and BadDrawables. 1: Does anyone know what's causing the problem? 2: Are there any plans to implement XSetErrorHandler and manager the errors better, even if it's an int3 that winedbg can catch. e.g. int myXErrorHandler(Display *display, XErrorEvent *xError){ switch(xError->type){ case BadDrawable: break; default: int3(); return XErrorHandler(NULL); } Xerror = xError->error_code; return 0; /* return value ignored */ } oid setErrorHandler(void){ XSetErrorHandler(myXErrorHandler); } void dosomething(void){ Xerror = 0; SomeXCall(); if(Xerror){ /* call failed, take appropriate action */ } } Some examples are.... http://www.download.com/Aliens-vs-Predator-2-single-player-demo/3000-7563_4… fixme:sync:SetNamedPipeHandleState 0xa8 0xb5bd50d4 (nil) (nil) wine: Unhandled exception (thread 002f), starting debugger... WineDbg starting on pid 0x11 X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 67 (X_PolyRectangle) Resource id in failed request: 0x6200007 Serial number of failed request: 989 Current serial number in output stream: 1049 http://games.softpedia.com/get/Games-Demo/Crazy-Taxi-Demo.shtml X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 62 (X_CopyArea) Resource id in failed request: 0x6000007 Serial number of failed request: 3252 Current serial number in output stream: 3258 http://www.download.com/1503-A-D-The-New-World-demo/3000-7485_4-10228730.ht… fixme:x11drv:X11DRV_SetWindowRgn not supported on other thread window 0x3002e X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 62 (X_CopyArea) Resource id in failed request: 0x5a00007 Serial number of failed request: 3152 Current serial number in output stream: 3158 http://www.download.com/Colin-McRae-Rally-2005-demo/3000-7531_4-10312485.ht… crashes at the end with fixme:propsheet:PROPSHEET_UnImplementedFlags PSH_RTLREADING X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 62 (X_CopyArea) Resource id in failed request: 0x6600007 Serial number of failed request: 28770 Current serial number in output stream: 28799 -- ICQ 169222899 MSN oliverthered(a)hotmail.com

2 2

Re: [PATCH] MapiSendMail() implementation
by Andreas Mohr 29 Mar '05

29 Mar '05

Hi, On Mon, Mar 07, 2005 at 11:54:56AM +0100, Jan Schiefer wrote: > This is an attempt of an basic MAPISendMail() implementation. > It does, what is should, it sends mails. > > Much more work is needed especially to clean it up and to implement more > features. ( Getting rid of printf's would be a good point to start... ) You mean much more work such as including mail.c in the patch? :) Andreas Mohr

6 7

Max Payne 2 IDirect3DDevice8Impl_ActiveRender error
by Tom Huckstep 29 Mar '05

29 Mar '05

Max Payne 2 works fine under the latest Wine CVS through all the 2D parts (menus), but as soon as I start a new game and it gets to a 3D bit the screen goes completely blank and I get lots of the following error on my terminal: err:d3d:IDirect3DDevice8Impl_ActiveRender cannot get valides GLXFBConfig for ... Does anyone have any idea why this is? Tom

2 4

Preloader Compiles with Coverage Flags
by Aaron Arvey 29 Mar '05

29 Mar '05

This is handy for when you want to compile entire wine source with gcov coverage analysis enabled. See http://www.winehq.org/hypermail/wine-patches/2005/02/0000.html for more information on how to compile wine with gcov support. Changelog: * loader/preloader.c adds empty __bb_init_func function Signed-off-by: Aaron Arvey <aarvey_at_cs.hmc.edu> Index: loader/preloader.c =================================================================== RCS file: /home/wine/wine/loader/preloader.c,v retrieving revision 1.13 diff -u -3 -p -r1.13 preloader.c --- loader/preloader.c 22 Mar 2005 16:42:25 -0000 1.13 +++ loader/preloader.c 29 Mar 2005 10:51:06 -0000 @@ -143,6 +143,12 @@ struct wld_link_map { ElfW(Addr) l_interp; }; +/* + * The __bb_init_func is an empty function only called when file + * is compiled with gcc flags "-fprofile-arcs -ftest-coverage". + * If using these flags, this function is necessary to compile. + */ +void __bb_init_func(){return;} /* * The _start function is the entry and exit point of this program

2 1

Re: winspool: some unicodification
by Huw D M Davies 29 Mar '05

29 Mar '05

On Tue, Mar 29, 2005 at 12:26:47AM -0500, Dimitrie O. Paun wrote: > ChangeLog > Unicodify WINSPOOL_OpenDriverReg(). > > > Index: dlls/winspool/info.c > =================================================================== > RCS file: /var/cvs/wine/dlls/winspool/info.c,v > retrieving revision 1.101 > diff -u -r1.101 info.c > --- dlls/winspool/info.c 21 Feb 2005 18:33:55 -0000 1.101 > +++ dlls/winspool/info.c 29 Mar 2005 05:23:05 -0000 > @@ -70,8 +70,13 @@ > > static const char Printers[] = > "System\\CurrentControlSet\\control\\Print\\Printers\\"; > -static const char Drivers[] = > -"System\\CurrentControlSet\\control\\Print\\Environments\\%s\\Drivers\\"; > + > +static const WCHAR DriversW[] = { 'S','y','s','t','e','m','\\','\\', > + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','\\', > + 'c','o','n','t','r','o','l','\\','\\', > + 'P','r','i','n','t','\\','\\', > + 'E','n','v','i','r','o','n','m','e','n','t','s','\\','\\', > + '%','s','\\','\\','D','r','i','v','e','r','s','\\','\\',0 }; > That's not quite right. I guess you need to tweak your unicodification macro ;-) Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: KERNEL32: implement CallNamedPipe
by Dmitry Timoshkov 29 Mar '05

29 Mar '05

"Mike McCormack" <mike(a)codeweavers.com> wrote: > ChangeLog: > * implement CallNamedPipe > + handle = CreateFileW( lpNamedPipeName, GENERIC_READ|GENERIC_WRITE, > + 0, NULL, OPEN_EXISTING, 0, NULL ); > + if( !handle ) > + return FALSE; CreateFile returns INVALID_HANDLE_VALUE on failure. -- Dmitry.

1 0

Re: Patch
by Dmitry Timoshkov 29 Mar '05

29 Mar '05

"Leonardo Krause" <leonardo.krause(a)serpro.gov.br> wrote: > + if ( ((keysym == 0xFF9F) || (keysym == 0x2C)) && (e->state & NumLockMask)) > + { > + if (keysym == 0xFF9F) > + return nonchar_key_vkey[keysym & 0xFF]; > + if (keysym == 0x2C) > + return keyc2vkey[0x3B]; > + } You need to at least use appropriate symbolic names instead of vague numbers. -- Dmitry.

1 0

Re: version: Use proper type for third parameter of VerQueryValue
by Dmitry Timoshkov 29 Mar '05

29 Mar '05

"James Hawkins" <truiken(a)gmail.com> wrote: > Changelog > * Use proper type for third parameter of VerQueryValue > -DWORD WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); > -DWORD WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); > +BOOL WINAPI VerQueryValueA(const LPVOID,LPCSTR,UINT*,UINT*); > +BOOL WINAPI VerQueryValueW(const LPVOID,LPCWSTR,UINT*,UINT*); Where did you get it? PSDK agrees with current Wine definition on the 3rd param type. Also the 2nd param should not be 'const'. -- Dmitry.

3 3

AW: Hotel full again?
by Hans-Ulrich Schmid 29 Mar '05

29 Mar '05

Hi, there are only three rooms left in the Telekom Hotel (Mail adress: Rezeption.Tagungshotel-Stuttgart(a)telekom.de ) from April 29 - May 1. There is no way to get room there for April 28. The alternatives are: IB-HOTEL AM WALLGRABEN ib-hotel-stuttgart(a)internationaler-bund.de ++49.711-7876100 http://dsw.nethotels.com/smg/english/Hotels/ib_hotel_am_wallgraben_/default… Hotel Römerhof info(a)hotelroemerhof.de ++49.711-687880 http://www.hotelroemerhof.de/english/index.html See you in Stuttgart Hans-Ulrich Schmid Wirtschaftsförderung Region Stuttgart GmbH Stuttgart Region Economic Development Corporation FIR_st - Forum IT-Region Stuttgart Friedrichstr. 10 70174 Stuttgart www.first.region-stuttgart.de www.opensource.region-stuttgart.de www.competenzatlas.de www.region-stuttgart.de Tel ++49.711.22835 - 27 Tel mobil ++49.172.7310463 Fax ++49.711.22835 - 55 > -----Ursprüngliche Nachricht----- > Von: Andrew Bartlett [mailto:abartlet@samba.org] > Gesendet: Freitag, 25. März 2005 22:59 > An: Hans-Ulrich Schmid > Cc: wine-devel(a)winehq.org > Betreff: Hotel full again? > > > I tried to book a double room 28th April -> 1st May (sharing with > tridge), and it seems the hotel is all full again :-( > > There seems to be quite a contingent of Samba folk intending to come > along (from a poll on the samba team list), and given the number of > 'maybe' and 'probably' replies, I suspect I'm not the only > one without a > room... > > Andrew Bartlett > -- > Andrew Bartlett > http://samba.org/~abartlet/ > Authentication Developer, Samba Team http://samba.org > Student Network Administrator, Hawker College http://hawkerc.net >

1 0

Wine on slashdot
by Jonathan Ernst 29 Mar '05

29 Mar '05

http://games.slashdot.org/games/05/03/28/1843246.shtml?tid=203&tid=106 "WineCVS is an extensive script for automated installation of different versions of wine and Cedega. Today it has been updated to support wine installation with latest DX9 features. The latest patch level of the script now includes a profile for installing Wine with Oliver Stiebers Direct3D 9 patchset. A short installation instruction and some more detailed information can be found at linux-gamers.net."

2 1

Japanese 106 keyboard mapping bug + patch
by Aric Cyr 29 Mar '05

29 Mar '05

I was having a mysterious problem with my Japanese 106 keyboard in World of Warcraft. The keyboard worked just fine when logging into the game or typing messages in game, etc. However, using the macro keys for the quickbar (1 2 3 ... 0) each of the keys was off by one. The keys were mapped as: 1 = 1 2 = 1 3 = 2 4 = 3 5 = 4 ... Notice that the 1 and 2 key both mapped to one, and every key after that maps to the previous key. This only occured for the top keyboard row and text input fields all worked correctly (which was the mysterious part). Anyways, I tracked down the problem to the keyboard layout for jp106 in the x11drv/keyboard.c. For Japanese keyboards, the first printable character on the keyboard is '1' (as the shown in the main_key_JA_jp106[MAIN_LEN][4] array). However, the jp106 keyboard is defined to use the regular qwerty scan and vkey maps, which seem to define the first key as OEM, not '1'. I believe this was causing my off-by-one key problem, so created a new jp106 qwerty scan and vkey map to fix the problem. I have tested the patch with World of Warcraft, and indeed my keys are now all mapped correctly. I am not familiar with the keyboard stuff too much, so let me know if there are any problems with the patch, otherwise please commit it. I also created a bug for this, and attached the patch there as well: http://bugs.winehq.org/show_bug.cgi?id=2832 -- Aric Cyr <acyr at alumni dot uwaterloo dot ca> (http://acyr.net) gpg fingerprint: 943A 1549 47AC D766 B7F8 D551 6703 7142 C282 D542

1 0

Re: KERNEL: Implement undocumented SetCPGlobal API call
by James Hawkins 29 Mar '05

29 Mar '05

On Tue, 29 Mar 2005 11:37:43 +1100, Troy Rollo <wine(a)troy.rollo.name> wrote: > SetCPGlobal is the undocumented partner of GetACP - it is used to set the > current ANSI code page. > > ChangeLog: > Implement SetCPGlobal (an undocumented Win32 API) A patch would be good :) -- James Hawkins

1 0

Re: KERNEL: Implement undocumented SetCPGlobal API call
by James Hawkins 29 Mar '05

29 Mar '05

1 0

advapi: remove signature checking code.
by Michael Jung 28 Mar '05

28 Mar '05

Hi, Microsoft signs it's cryptographic service provider (csp) dlls with a private key. advapi32 will only load csp dlls with a valid signature. We will never be able to implement this, since this would mean having access to Microsoft's private keys. Above this, Microsofts scheme doesn't give real security, since there are instructions on the web to replace advapi32's _NSAKEY with an arbitrary private key (this is if you have write access to advapi32.dll), allowing you to load a csp signed by yourself. I would like to remove the (stubbed) signature checking code from advapi32. This would clean up advapi32 somewhat and remove a FIXME message, which bothers me for some time and which confused wine users in at least two occurences. Comments anyone? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: msi:Fix Typelib Registration
by Huw D M Davies 28 Mar '05

28 Mar '05

On Mon, Mar 28, 2005 at 10:39:48AM -0600, Aric Stewart wrote: > make sure the GUID of the typelib we are registering matches the guid > requested from MSI. if not search the given typelib file to find the > typelib requested to register. > > > Index: dlls/msi/action.c > =================================================================== > RCS file: /home/wine/wine/dlls/msi/action.c,v > retrieving revision 1.105 > diff -u -r1.105 action.c > --- dlls/msi/action.c 28 Mar 2005 14:17:52 -0000 1.105 > +++ dlls/msi/action.c 28 Mar 2005 16:33:23 -0000 > @@ -4097,7 +4101,39 @@ > continue; > } > > + guid = load_dynamic_stringW(row,1); > res = LoadTypeLib(package->files[index].TargetPath,&ptLib); > + ITypeLib_GetLibAttr(ptLib, &attr); > + CLSIDFromString(guid, &clsid); > + if (!IsEqualGUID(&clsid,&attr->guid)) > + { > + static const WCHAR fmt[] = {'%','s','\\','%','i',0}; > + int i; > + int sz; > + > + TRACE("Initial match failure\n"); > + > + sz = strlenW(package->files[index].TargetPath)+4; > + sz *= sizeof(WCHAR); > + > + for (i = 2; i < 10; i++) > + { > + path = HeapAlloc(GetProcessHeap(),0,sz); > + sprintfW(path,fmt,package->files[index].TargetPath, i); > + TRACE("trying %s\n", debugstr_w(path)); > + res = LoadTypeLib(path,&ptLib); > + ITypeLib_GetLibAttr(ptLib, &attr); > + CLSIDFromString(guid, &clsid); > + if (IsEqualGUID(&clsid,&attr->guid)) > + break; > + HeapFree(GetProcessHeap(),0,path); > + res = E_FAIL; > + > + } > + } > + else > + path = strdupW(package->files[index].TargetPath); > + > if (SUCCEEDED(res)) > { > LPWSTR help; This doesn't look right. Maybe you need to enumerate through the typelib resources here. What information are you actually given? You're also leaking ITypeLibs and TLIBATTRs Huw.

1 0

Re: [dlls/msi/*] Strncpy elimination.
by Jakob Eriksson 28 Mar '05

28 Mar '05

Good thing you sent these patches. I was just thinking, should I dig in? :-) Peter Berg Larsen wrote: >I have been checking the usage of strncpy, replacing where apropriate with >a memcpy or lstrcpyn[AW]. The first raw diff was 100kb, so there is bound >to be one or two slips. These are the first batch which I found to be >obvious, correct, and didnt need a special comment. Note with correct I >mean if there was a \0 bug before then it still there. > >Changelog: > Janitorial Task: Check the usage of strncpy/strncpyW. > >Index: dlls/msi/action.c >=================================================================== >RCS file: /home/wine/wine/dlls/msi/action.c,v >retrieving revision 1.104 >diff -u -r1.104 action.c >--- dlls/msi/action.c 24 Mar 2005 21:01:38 -0000 1.104 >+++ dlls/msi/action.c 26 Mar 2005 09:40:49 -0000 >@@ -922,7 +922,7 @@ > while (*ptr == ' ') ptr++; > len = ptr2-ptr; > prop = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); >- strncpyW(prop,ptr,len); >+ memcpy(prop,ptr,len*sizeof(WCHAR)); > prop[len]=0; > ptr2++; > >@@ -942,7 +942,7 @@ > len -= 2; > } > val = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); >- strncpyW(val,ptr2,len); >+ memcpy(val,ptr2,len*sizeof(WCHAR)); > val[len] = 0; > > if (strlenW(prop) > 0) >Index: dlls/msi/dialog.c >=================================================================== >RCS file: /home/wine/wine/dlls/msi/dialog.c,v >retrieving revision 1.9 >diff -u -r1.9 dialog.c >--- dlls/msi/dialog.c 24 Mar 2005 15:09:31 -0000 1.9 >+++ dlls/msi/dialog.c 26 Mar 2005 09:40:51 -0000 >@@ -131,7 +131,7 @@ > ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); > if( !ret ) > return ret; >- strncpyW( ret, p, len ); >+ memcpy( ret, p, len*sizeof(WCHAR) ); > ret[len-1] = 0; > return ret; > } >Index: dlls/msi/format.c >=================================================================== >RCS file: /home/wine/wine/dlls/msi/format.c,v >retrieving revision 1.8 >diff -u -r1.8 format.c >--- dlls/msi/format.c 16 Mar 2005 11:31:35 -0000 1.8 >+++ dlls/msi/format.c 26 Mar 2005 09:40:51 -0000 >@@ -252,7 +252,7 @@ > *key = HeapAlloc(GetProcessHeap(),0,i*sizeof(WCHAR)); > /* do not have the [] in the key */ > i -= 1; >- strncpyW(*key,&(*mark)[1],i); >+ memcpy(*key,&(*mark)[1],i*sizeof(WCHAR)); > (*key)[i] = 0; > > TRACE("Found Key %s\n",debugstr_w(*key)); > > > >

3 3

Re: [libs/wine/*] Strncpy elimination.
by Alexandre Julliard 28 Mar '05

28 Mar '05

Peter Berg Larsen <pebl(a)math.ku.dk> writes: > Changelog: > Janitorial Task: Check the usage of strncpy/strncpyW. You can't use lstrcpynA in the libs/ directory, you have to stick to Unix APIs. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: DDRAW: Surface locking patch, take 2
by Matthew Mastracci 28 Mar '05

28 Mar '05

Matthew Mastracci wrote: > This patch (correctly) fixes the locking problems in SimCity 3000. We > now check to see if the blit src and dest are the same surface and, if > so, we make sure to lock the surface only once and, in the case of > BltFast, re-adjust the surface pointers. This patch also makes sure the > surfaces are correctly unlocked if a bad rectangle is passed. > > ChangeLog > Correctly lock and unlock surface for a single-surface Blt() and > BltFast() call. I'm just pinging the list ot see if there's any reason why this patch hasn't been applied yet. AFAIK, it takes into account all the feedback received so far. Let me know how I can fix it if there is an issue. :) Matt.

2 1

Re: dbghelp: better module support
by Eric Pouech 28 Mar '05

28 Mar '05

Eric Pouech a écrit : > minidumps now contain more accurate information about modules, > especially information that will allow when reloading a minidump in a > debugger to check whether we're using the right modules (ELF & PE) > implemented also check for this information in SymFindFileInPath > A+ Please use this version instead (the previous had an un-wanted statement) A+ -- Eric Pouech

1 0

dbghelp: small fixes
by Eric Pouech 28 Mar '05

28 Mar '05

this patch fixes a couple of bugs in dbghelp A+ -- Eric Pouech

1 0

Re: OLE32, compositemoniker: remove function prototypes, make functions static
by James Hawkins 28 Mar '05

28 Mar '05

On Mon, 28 Mar 2005 14:48:40 +0900, Mike McCormack <mike(a)codeweavers.com> wrote: > > There's more work like this to be done. Anybody want to help out? > > Mike > > ChangeLog: > * remove function prototypes, make functions static Candidate for a janitorial project? :) -- James Hawkins

2 1

Re: Implementation of EnumMoniker and Partial impl on MkParseDisplayName
by Mike McCormack 28 Mar '05

28 Mar '05

Hi Jeff, Jeff Latimer wrote: > This is the first installment of the implementation of > MkParseDisplayName. I would like feed back on style and usage. > > I think the implementation of the EnumMoniker interface looks ok. > Comments appreciated. I like that you've taken the time to write a test case! I don't know alot about monikers, but seeing that you've tested it gives me confidence... The following comments are a crash course in Wine programming... > +/*********************************************************************** > + * EnmumMoniker_Next > + */ > +HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IMoniker** rgelt, ULONG * pceltFetched) > +{ > +// DWORD i; > +// ULONG ref; We avoid C++ comments in Wine code to keep compatability with older compilers. > + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; > + TRACE("(%p) currentPos %d Tablastindx %d\n",This, (int)This->currentPos, (int)This->TabLastIndx); > + ULONG i; You declared "i" above, but commented it out. Try avoid putting dead code in comments. If code isn't compiled, it will become stale and confuse people. > + rc = CoGetMalloc(1, (LPMALLOC *) &ppMalloc); > if (!(IsValidInterface((LPUNKNOWN) pbc))) > return E_INVALIDARG; > + usernamelen = (int) lstrlenW(szUserName); // overall string len > + > > + if (szUserName[char_cnt] == (WCHAR) '@') { // This is a progid not a file name That's alot of casts. I don't think you really need that many, do you? > + /* retrieve the requested number of moniker from the current position */ > + for(i=0;((This->currentPos < This->TabLastIndx) && (i < celt));i++) > + rgelt[i]=(IMoniker*)This->TabMoniker[This->currentPos++].pmkObj; Better to avoid tabs... and too many brackets. A space or two extra in the for( i=0; (This->... might make things look better. > + if (szUserName[char_cnt] == '/' || > + szUserName[char_cnt] == '?' || > + szUserName[char_cnt] == '<' || > + szUserName[char_cnt] == '>' || > + szUserName[char_cnt] == '*' || > + szUserName[char_cnt] == '|' || > + szUserName[char_cnt] == ':') Maybe that can be shortened to : if (strchr("/?<>*|:",szUserName[char_cnt])) > + todo_wine { ok(hr==0x800401e4, "MkParseDisplayName - Progid not implemented hr=%08x\n", (int) hr); } 0x800401e4 is defined as MK_E_SYNTAX. It would be clearer to use the define rather than a number. %08lx is probably what you want instead of casting hr to (int) to get rid of the printf parameter type warning. > + > + IBindCtx_Release(pbc); > + > + /* A bad drive */ > + static const WCHAR wszDisplayName2[] = {'1',':','s','i','d',':', > '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; Again, for compatability, we avoid inline declarations, even though gcc can deal with them fine. Mike

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel