wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: winebuild and circular DLL dependencies
by Alexandre Julliard 12 Oct '01

12 Oct '01

eric pouech <eric.pouech(a)wanadoo.fr> writes: > well, I think we need to differentiate two things: > - circular deps in normal imports > - circular refs of DLLs for delayed imports I consider that both are wrong. I think it's important to maintain proper layers and ensure that dll dependencies always go in one direction. Of course this is not always possible thanks to Microsoft design (or lack of it); but in the cases where we need to hack something I want it to be very explicit that something unusual is going on. If we make it so that any dll can easily import any other one, we'll quickly end up with an inextricable mess of cross-dll dependencies, simply because adding an import in the spec file for any dll that you may need is so much easier than having to use GetProcAddress and think about minimizing inter-dll calls because they are a pain to do. So there aren't really technical reasons we cannot do it, the issue is enforcing a structure by not making it too easy to do things the wrong way. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: winebuild and circular DLL dependencies
by Alexandre Julliard 12 Oct '01

12 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > Well, can this be done with delayed imports yet? I have a situation here > where ole32 imports stuff from rpcrt4 (windows uses delayed imports for > that), and rpcrt4 imports stuff from ole32 (again, windows uses delayed > imports). It would be nice if I could use the winebuild delayed import > mechanism to achieve this, instead of doing it manually with callout > tables and stuff... but I suppose winebuild has to be changed to read > the .spec files instead of using nm on compiled libraries... anyone > working on it? No, and I don't think it's a desirable feature, it's too error-prone. Besides, circular dependencies are really something to avoid, so it must not be too easy to do... (what does rpcrt4 need from ole32 BTW?) -- Alexandre Julliard julliard(a)winehq.com

3 2

BUG: mouse_event does not move pointer for relative coordinates
by Andriy P 12 Oct '01

12 Oct '01

The attached test program moves pointer under Windows NT. Under Wine the pointer changes position on move request in absolute coordinates and does not move for relative coordinates. I found out that variables PosX and PosY ARE updated in queue_mouse_event in windows/input.c. Can somebody give me a hint where to go from there? I don't see further any difference in processing between absolute and relative movement. In case somebody will fix this bug, don't worry about different relative distance reported under Windows and in Wine. I alredy fixed that part and will submit the patch soon. Thanks, Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Make a great connection at Yahoo! Personals. http://personals.yahoo.com

1 0

Re:winebuild and circular DLL dependencies
by Eric Pouech 12 Oct '01

12 Oct '01

well, I must have this somewhere in my tree, but didn't publish it because Alexandre was somehow reluctant to use this type of features (not the reading of missing symbols from .spec files, but the circular deps). Alexandre, any "new" comments ? A+ > Well, can this be done with delayed imports yet? I have a situation here > where ole32 imports stuff from rpcrt4 (windows uses delayed imports for > that), and rpcrt4 imports stuff from ole32 (again, windows uses delayed > imports). It would be nice if I could use the winebuild delayed import > mechanism to achieve this, instead of doing it manually with callout > tables and stuff... but I suppose winebuild has to be changed to read > the .spec files instead of using nm on compiled libraries... anyone > working on it? > > > > --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle __________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Pendant tout l'été, gagnez une Ford Ka sur Voila Gratter ! http://cybergrattage.voila.fr/voila

1 0

winebuild and circular DLL dependencies
by Ove Kaaven 12 Oct '01

12 Oct '01

Well, can this be done with delayed imports yet? I have a situation here where ole32 imports stuff from rpcrt4 (windows uses delayed imports for that), and rpcrt4 imports stuff from ole32 (again, windows uses delayed imports). It would be nice if I could use the winebuild delayed import mechanism to achieve this, instead of doing it manually with callout tables and stuff... but I suppose winebuild has to be changed to read the .spec files instead of using nm on compiled libraries... anyone working on it?

1 0

Re: Nasty Evil Memory Fragmentation fix
by Alexandre Julliard 11 Oct '01

11 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > Not that much. Wine's allocator already implements the *features* of that > allocator (boundary tags, bins), it just doesn't implement all the > *strategies* used for selecting which free block to allocate memory from > (though the only big things we lack there is "best fit" and "wilderness > preservation", the latter of which Alexandre talked about). Well, we do have (almost) best fit, that's the only reason for having multiple free lists. It's just that we probably need more bins sizes to make it really useful. > We just need > to make sure Wine's free block selection routine uses the same strategies > as this allocator, and we'd get exactly the same performance as that > allocator, but without replacing the whole thing and sacrificing the > compatibility we have or introducing new bugs. Well, this depends how easy it is to plug the new allocator in; but if it doesn't require too many changes, it will certainly introduce less bugs than trying to tweak the existing code. Plus all the profiling work has been done already, which would have to be done on the Wine code. -- Alexandre Julliard julliard(a)winehq.com

1 0

FIXME:pthread_rwlock_rdlock
by 510045342665-0001＠t-online.de 11 Oct '01

11 Oct '01

Hi, I am running a compiler with wine. There are many fixme message that I can't switch off. What do they mean, is someone working on it, is the problem serious ? Not having them at stdout would be great :-) as the compiler output + wine fixmes get a little confusing... [scan1.c] FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock --Dirk

1 0

Re: Nasty Evil Memory Fragmentation fix
by Alexandre Julliard 11 Oct '01

11 Oct '01

Gavriel State <gav(a)transgaming.com> writes: > We ended up creating a new subheap every time one of these larger > blocks came along. The new space from the subheap then went to > the top of the freelist, so all the small allocations then filled > it up until the next large block allocation. IE: We never got a > chance to reuse freed blocks in older subheaps - at least not > very well. That's why we have multiple free lists. The code is using the Win95 values now, but there is no reason we couldn't add a few larger values in the HEAP_freeListSizes array, instead of creating a new mechanism. > Despite the workaround, we're still not too pleased with the current > heap allocator. It's quite slow, and still not as efficient as > it could be. It would probably be worth the effort to integrate > a new allocator - anyone know if there's a high-quality Wine-license- > compatible allocator out there? A new allocator would definitely be a good thing. This one was done the way it is in order to use a compatible memory layout, but it turns out this is not necessary so we could scrap it. -- Alexandre Julliard julliard(a)winehq.com

3 3

Re: fixed FILE_GetUnixHanlde for sockets
by Andreas Mohr 11 Oct '01

11 Oct '01

On Thu, Oct 11, 2001 at 06:53:33PM +0200, Kai Morich wrote: > added sock_get_info in server/sock.c (patch includes changelog) "Patch includes changelog". hmm, patch. which patch ? which changelog ? ;-) -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://home.nexgo.de/andi.mohr/

1 0

SHGetSpecialFolderPathA and CSIDL_FOLDER_MASK
by Chris Green 11 Oct '01

11 Oct '01

I've been looking at this function, and I am starting to suspect we have the wrong definition of CSIDL_FOLDER_MASK (currently 0x00ff). What I've been seeing (eg. installing MS Office 97) seems to imply that only the lower 6 bits, rather than 8, are related to the folder, and the others are something else. Does anyone else think that the mask should be 0x003f? regards Chris _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

2 1

Re: Nasty Evil Memory Fragmentation fix
by Alexandre Julliard 11 Oct '01

11 Oct '01

Gavriel State <gav(a)transgaming.com> writes: > This still doesn't help us: as Ove points out, we still end up allocating > from newly created free blocks even if old blocks would suit us better. But you want to use new blocks in general. The exception is that you want to avoid using the uncommitted part at the end of the heap, and I agree we could do a special case for that. But it has nothing to do with the size of the block. > I've had a brief look at the code referenced by Adam Moss (found at > http://g.oswego.edu/dl/html/malloc.html), and it looks like it would > be a vast improvement over Wine's current Heap manager. It even has > Windows code that uses VirtualAlloc to reserve actual memory. Yes, that would certainly be better that tweaking the existing code. You may want to look at ptmalloc too, it's supposed to be better at multi-threading (at least to get some ideas, the license is not 100% compatible with ours). -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Nasty Evil Memory Fragmentation fix
by Alexandre Julliard 11 Oct '01

11 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > Well, after looking at some allocator algorithms, it seems to me there's > no reason to change neither the bin sizes nor the data structures. We just > have to change the free block selection algorithm - from my reading of the > code, right now it seems to always choose the *newest* (most recently > added) free block that's big enough. By changing it to always choose the > *oldest* free block instead, we'd already have a huge improvement. > (That's essentially the effect of Gav's patch, but only for big blocks, > but I suspect that could safely be done for *all* block sizes) I don't think that's a good idea. It's pretty bad for the cache and paging system to reuse oldest blocks first. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: wine/ include/win.h include/wine/server_protoc ...
by Gerard Patel 10 Oct '01

10 Oct '01

At 06:46 PM 10/10/2001 +0200, you wrote: >No the application does a SendMessage > >096ed3f8:Call user32.SendMessageA(ffffffff,0000c00c,00000000,00000000) ret=004141aa ffffffff = Broadcast message. Take a look at this /*********************************************************************** * broadcast_message_callback * * Helper callback for broadcasting messages. */ static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) { struct send_message_info *info = (struct send_message_info *)lparam; if (!(GetWindowLongW( hwnd, GWL_STYLE ) & (WS_POPUP|WS_CAPTION))) return TRUE; GetWindowLong does not work currently between processes. There are a lot to do for the whole of Apis to work between processes yes, but there is not so much remaining for this kind of installer to work IMO. Gerard

1 0

Buisness Apps
by Nick Hudson 10 Oct '01

10 Oct '01

Greetings, Has anyone got Quick Books Pro 2001 and ACT! 2000 to run on wine? In quick books I get this error when it goes to install it: fixme:ole:CoGetClassObject CLSCTX_LOCAL_SERVER not supported! and it says that the set up failed..... in ACT! 2001 I the install stalls out when I have to say what country I am in.... I have to ctrl+alt+F1 and do a killall to get rid of it. Also its not seeing my ethernet connection.... do I need to add anything to the config file to make this work right? I was trying to install IE over the web.... As far as I can tell it doesnt see that im on the network Thanks Nick Hudson

1 0

Re: wine/ include/win.h include/wine/server_protoc ...
by Alexandre Julliard 10 Oct '01

10 Oct '01

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > The WIN_FindWndPtr message flooded the xterm during install, so I supected > soething still wrong... There are still a *lot* of functions that need to be adapted for handles belonging to other processes, so yes if you run multiple processes right now you'll most likely get flooded with messages. Working on it... -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: wine/ include/win.h include/wine/server_protoc ...
by Alexandre Julliard 10 Oct '01

10 Oct '01

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > No the application does a SendMessage > > 096ed3f8:Call user32.SendMessageA(ffffffff,0000c00c,00000000,00000000) ret=004141aa > err:win:WIN_FindWndPtr window 1002a belongs to other process > err:win:WIN_FindWndPtr window 10021 belongs to other process > err:win:WIN_FindWndPtr window 10029 belongs to other process > 096ed3f8:Ret user32.SendMessageA() retval=00000001 ret=004141aa > 096ed3f8:Call user32.SendMessageA(ffffffff,0000c00d,00000000,00000000) ret=004141bc > err:win:WIN_FindWndPtr window 1002a belongs to other process > err:win:WIN_FindWndPtr window 10021 belongs to other process > err:win:WIN_FindWndPtr window 10029 belongs to other process > 096ed3f8:Ret user32.SendMessageA() retval=00000001 ret=004141bc > > 096ed3f8 is a process created with Winexec, so I expect it to be a > sibling. Why isn't the WindowsFunction of at least that process called? It will be called only if the process has created a top-level window. Could you check if this is the case? -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: CommandLineToArgvW fix
by Eric Pouech 10 Oct '01

10 Oct '01

just a last question (that I didn't check) what if the process name contains spaces like: C:\Program Files\foo\bar.exe what does Windows do ? returns in argv[0] "C:\Program" or "C:\Program Files". The later would also require testing of existence of the directories (doing a more semantical approach while current implementation is purely syntaxical) A+ > > > Here's another version that uses GlobalLock... > I also retested in Windows and I believe the comment about spaces was > wrong. > > > -- > Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ > It really galls me that most of the computer power in the world > is wasted on screen savers. > Chris Caldwell from the GIMPS project > http://www.mersenne.org/prime.htm > --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle __________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Pendant tout l'été, gagnez une Ford Ka sur Voila Gratter ! http://cybergrattage.voila.fr/voila

2 1

Re: wine/ include/win.h include/wine/server_protoc ...
by Gerard Patel 10 Oct '01

10 Oct '01

At 04:55 PM 10/10/2001 +0200, you wrote: . > Alexandre> Implemented inter-process FindWindow(). > >Shouldn't this avoid errors like these: >err:win:WIN_FindWndPtr window 1002a belongs to other process >err:win:WIN_FindWndPtr window 10021 belongs to other process >err:win:WIN_FindWndPtr window 10029 belongs to other process Handles of other process windows can be returned by FindWindow, yes. But current Wine returns them also in enumeration functions, like EnumWindows. A functions like SetCursor, when trying to set the cursor for all desktop children, triggers this kind of message. The error message shows that Wine development is not complete because some function fails between processes (in SetCursor case, it is X11DRV_get_whole_window), not necessarily a problem in FindWindow. Try to lookup the origin for the handles : it is a problem only if the app get them from a FindWindow call. Gerard

2 1

Re: Compiling WINE on solaris 7
by Jeremy White 10 Oct '01

10 Oct '01

> > First I thought this was a problem caused by the SUN as, but then I > installed the GNU as, and typed > "make clean; rm config.cache; configure && make depend && make" > but the problem remained. I suspect that the problem is that gcc is still invoking 'as' instead of 'gas'. My understanding is the only clean way to get gcc to use the GNU binutils is to rebuild it with such support. What we've done is very hackish, but seems to work - place symlinks called 'as', 'cc', and 'ld' that point to the respective GNU tools ahead of the 'normal' SUN tools in the PATH. HTH Jer

1 0

Re: wine/ include/win.h include/wine/server_protoc ...
by Uwe Bonnes 10 Oct '01

10 Oct '01

>>>>> "Alexandre" == Alexandre Julliard <julliard(a)winehq.com> writes: ... Alexandre> Implemented inter-process FindWindow(). Shouldn't this avoid errors like these: err:win:WIN_FindWndPtr window 1002a belongs to other process err:win:WIN_FindWndPtr window 10021 belongs to other process err:win:WIN_FindWndPtr window 10029 belongs to other process These errors still happens with the Quicklogic Installer. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Nasty Evil Memory Fragmentation fix
by Gavriel State 10 Oct '01

10 Oct '01

We just spent about 3 days tracking down a very subtle memory fragmentation problem in an app we're working on. The problem: App allocates lots of little blocks, then a few large blocks, then lots of little blocks. Throughout this process, many blocks would be freed from all over the heap. Repeat ad infinitum. We ended up creating a new subheap every time one of these larger blocks came along. The new space from the subheap then went to the top of the freelist, so all the small allocations then filled it up until the next large block allocation. IE: We never got a chance to reuse freed blocks in older subheaps - at least not very well. This fix addresses the problem by pushing 'large' freed blocks to the end of the free list, leaving 'small' blocks at the front, to be found sooner. The size of 'large' vs 'small' is tunable. Despite the workaround, we're still not too pleased with the current heap allocator. It's quite slow, and still not as efficient as it could be. It would probably be worth the effort to integrate a new allocator - anyone know if there's a high-quality Wine-license- compatible allocator out there? -Gav -- Gavriel State, CEO TransGaming Technologies Inc. http://www.transgaming.com gav(a)transgaming.com --- heap.c Wed Sep 26 19:11:21 2001 +++ /home/gavriels/transgaming/wine/memory/heap.c Tue Oct 9 23:53:15 2001 @@ -59,6 +59,8 @@ #define QUIET 1 /* Suppress messages */ #define NOISY 0 /* Report all errors */ +#define FREE_BLOCK_INSERTION_THRESHOLD 4096 + #define HEAP_NB_FREE_LISTS 4 /* Number of free lists */ /* Max size of the blocks on the free lists */ @@ -229,11 +231,11 @@ /*********************************************************************** - * HEAP_InsertFreeBlock + * HEAP_InsertFreeBlockAtFront * - * Insert a free block into the free list. + * Insert a free block into the front of the free list. */ -static void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena ) +static void HEAP_InsertFreeBlockAtFront( HEAP *heap, ARENA_FREE *pArena ) { FREE_LIST_ENTRY *pEntry = heap->freeList; while (pEntry->size < pArena->size) pEntry++; @@ -244,6 +246,31 @@ pEntry->arena.next = pArena; } +/*********************************************************************** + * HEAP_InsertFreeBlockAtEnd + * + * Insert a free block into the end of the free list. + */ +static void HEAP_InsertFreeBlockAtEnd( HEAP *heap, ARENA_FREE *pArena ) +{ + FREE_LIST_ENTRY *pEntry = heap->freeList; + + /* Determine which free list contains blocks of the appropriate size. */ + while (pEntry->size < pArena->size) pEntry++; + + /* But we want to put this block on the end of said appropriate free list. + * So instead, find the list for the next size up, knowing that they are + * all connected. */ + if (++pEntry == heap->freeList+HEAP_NB_FREE_LISTS) + pEntry = heap->freeList; + + pArena->size |= ARENA_FLAG_FREE; + pArena->next = &pEntry->arena; + pArena->prev = pEntry->arena.prev; + + pArena->next->prev = pArena; + pArena->prev->next = pArena; +} /*********************************************************************** * HEAP_FindSubHeap @@ -372,7 +399,11 @@ /* Last, insert the new block into the free list */ pFree->size = size - sizeof(*pFree); - HEAP_InsertFreeBlock( subheap->heap, pFree ); + + if ((pFree->size & ARENA_SIZE_MASK) > FREE_BLOCK_INSERTION_THRESHOLD) + HEAP_InsertFreeBlockAtEnd( subheap->heap, pFree ); + else + HEAP_InsertFreeBlockAtFront( subheap->heap, pFree ); }

2 1

Fwd: Re: Remove annoying fatal_error() after wineserver crash
by Malte Starostik 10 Oct '01

10 Oct '01

Seems I'm too used to mailing lists which set Reply-to to the list... Am Wednesday 10 October 2001 01:15 schrieben Sie: > Malte Starostik <malte(a)kde.org> writes: > > not sure about the reason for that "the socket exists, but I can't > > connect" message, but IMHO it's pretty annoying. I hit this fatal_exit() > > very often while debugging reaktivate. And in such cases - or when > > starting an app from a desktop / startmenu icon - when wine's STDERR goes > > to ~/.xsession-errors instead of a shell, the user has no chance to > > figure why an app won't start. Well, long story, short patch which Works > > for Me (TM) but I don't know if there's anything wrong with doing this... > > The problem with this is that it creates a race condition and we may > end up with two servers running in the same directory, which is bad. > > The error message should only happen when a previous server has > crashed, which is a critical error (the server should never crash no > matter what the app does). In that case you should also have a core > file in the same directory as the socket, which you can use to debug > and fix the crash. Thanks for the hint, I'll try to reproduce it with an appropriate ulimit set. But right, an actual wineserver crash didn't happen in a while. Unfortunately I have some system instability currently, so many times the message was caused by a stale socket lying around after a solid lockup of my box. What tends to happen rather often though is that wineserver keeps running after I quit all windows/winelib apps and consumes 100% CPU. In some of such cases, it'll only die on SIGKILL, which also leaves a socket around. I agree that neither a system lockup nor a hanging wineserver should happen though :) Maybe there could be a wineserver.pid file in the same dir and only if the process identified therein doesn't exist anymore, the socket will be autoremoved? But after all it's not too big a problem, guess there are more important issues. -- Malte Starostik PGP: 1024D/D2F3C787 [C138 2121 FAF3 410A 1C2A 27CD 5431 7745 D2F3 C787]

2 1

Re: Remove annoying fatal_error() after wineserver crash
by Alexandre Julliard 09 Oct '01

09 Oct '01

Malte Starostik <malte(a)kde.org> writes: > not sure about the reason for that "the socket exists, but I can't connect" > message, but IMHO it's pretty annoying. I hit this fatal_exit() very often > while debugging reaktivate. And in such cases - or when starting an app from > a desktop / startmenu icon - when wine's STDERR goes to ~/.xsession-errors > instead of a shell, the user has no chance to figure why an app won't start. > Well, long story, short patch which Works for Me (TM) but I don't know if > there's anything wrong with doing this... The problem with this is that it creates a race condition and we may end up with two servers running in the same directory, which is bad. The error message should only happen when a previous server has crashed, which is a critical error (the server should never crash no matter what the app does). In that case you should also have a core file in the same directory as the socket, which you can use to debug and fix the crash. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: SHGetSpecialFolderPathA
by Chris Green 09 Oct '01

09 Oct '01

That's the last time _I_ send a patch in the early hours of the morning! I missed a few commas... This one is better... Index: include/shlobj.h =================================================================== RCS file: /home/wine/wine/include/shlobj.h,v retrieving revision 1.47 diff -u -3 -p -r1.47 shlobj.h --- include/shlobj.h 2000/09/26 00:00:59 1.47 +++ include/shlobj.h 2001/10/09 21:53:39 @@ -461,6 +461,9 @@ HRESULT WINAPI SHGetSpecialFolderLocatio #define CSIDL_SENDTO 0x0009 #define CSIDL_BITBUCKET 0x000a #define CSIDL_STARTMENU 0x000b +#define CSIDL_MYDOCUMENTS 0x000c +#define CSIDL_MYMUSIC 0x000d +#define CSIDL_MYVIDEO 0x000e #define CSIDL_DESKTOPDIRECTORY 0x0010 #define CSIDL_DRIVES 0x0011 #define CSIDL_NETWORK 0x0012 @@ -473,6 +476,7 @@ HRESULT WINAPI SHGetSpecialFolderLocatio #define CSIDL_COMMON_DESKTOPDIRECTORY 0x0019 #define CSIDL_APPDATA 0x001a #define CSIDL_PRINTHOOD 0x001b +#define CSIDL_LOCAL_APPDATA 0x001c #define CSIDL_ALTSTARTUP 0x001d #define CSIDL_COMMON_ALTSTARTUP 0x001e #define CSIDL_COMMON_FAVORITES 0x001f @@ -494,8 +498,17 @@ HRESULT WINAPI SHGetSpecialFolderLocatio #define CSIDL_COMMON_ADMINTOOLS 0x002f #define CSIDL_ADMINTOOLS 0x0030 #define CSIDL_CONNECTIONS 0x0031 +#define CSIDL_COMMON_MUSIC 0x0035 +#define CSIDL_COMMON_PICTURES 0x0036 +#define CSIDL_COMMON_VIDEO 0x0037 +#define CSIDL_RESOURCES 0x0038 +#define CSIDL_RESOURCES_LOCALIZED 0x0039 +#define CSIDL_COMMON_OEM_LINKS 0x003a +#define CSIDL_CDBURN_AREA 0x003b +#define CSIDL_COMPUTERSNEARME 0x003d #define CSIDL_FOLDER_MASK 0x00ff - +#define CSIDL_FLAG_PER_USER_INIT 0x0800 +#define CSIDL_FLAG_NO_ALIAS 0x1000 #define CSIDL_FLAG_DONT_VERIFY 0x4000 #define CSIDL_FLAG_CREATE 0x8000 Index: dlls/shell32/shellpath.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shellpath.c,v retrieving revision 1.56 diff -u -3 -p -r1.56 shellpath.c --- dlls/shell32/shellpath.c 2001/08/16 18:49:57 1.56 +++ dlls/shell32/shellpath.c 2001/10/09 21:53:41 @@ -660,7 +660,7 @@ static const CSIDL_DATA CSIDL_Data[] = "Desktop", "Desktop" }, - { /* CSIDL_INTERNET (??) */ + { /* CSIDL_INTERNET */ 0, 1, /* FIXME */ NULL, NULL, @@ -715,22 +715,22 @@ static const CSIDL_DATA CSIDL_Data[] = "Start Menu", "Start Menu" }, - { /* not known */ - 0, 0, + { /* CSIDL_MYDOCUMENTS */ + 0, 1, /* FIXME */ NULL, NULL, }, - { /* not known */ - 0, 0, + { /* CSIDL_MYMUSIC */ + 0, 1, /* FIXME */ NULL, NULL, }, - { /* not known */ - 0, 0, + { /* CSIDL_MYVIDEO */ + 0, 1, /* FIXME */ NULL, NULL, }, - { /* not known */ + { /* unassigned */ 0, 0, NULL, NULL, @@ -795,8 +795,8 @@ static const CSIDL_DATA CSIDL_Data[] = "PrintHood", "PrintHood" }, - { /* not known */ - 0, 0, + { /* CSIDL_LOCAL_APPDATA */ + 0, 0, /* FIXME */ NULL, NULL, }, @@ -904,6 +904,66 @@ static const CSIDL_DATA CSIDL_Data[] = 0, 1, /* FIXME */ NULL, NULL + }, + { /* unassigned 32*/ + 0, 0, + NULL, + NULL, + }, + { /* unassigned 33*/ + 0, 0, + NULL, + NULL, + }, + { /* unassigned 34*/ + 0, 0, + NULL, + NULL, + }, + { /* CSIDL_COMMON_MUSIC */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_COMMON_PICTURES */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_COMMON_VIDEO */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_RESOURCES */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_RESOURCES_LOCALIZED */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_COMMON_OEM_LINKS */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* CSIDL_CDBURN_AREA */ + 0, 0, /* FIXME */ + NULL, + NULL, + }, + { /* unassigned 3C */ + 0, 0, + NULL, + NULL, + }, + { /* CSIDL_COMPUTERSNEARME */ + 0, 0, /* FIXME */ + NULL, + NULL, } }; #undef HKCU @@ -926,7 +986,7 @@ BOOL WINAPI SHGetSpecialFolderPathA ( TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate); - if ((folder > CSIDL_CONNECTIONS) || (CSIDL_Data[folder].hRootKey == 0)) + if ((folder > CSIDL_COMPUTERSNEARME) || (CSIDL_Data[folder].hRootKey == 0)) { ERR("folder unknown or not allowed\n"); return FALSE; _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

1 0

Re: Service Pack Information in registry
by Nerijus Baliunas 09 Oct '01

09 Oct '01

On Mon, 8 Oct 2001 22:36:27 +0200 Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: SL> Hello, SL> SL> during some investigations on CEMW i found a posting from Nerijus Baliunas SL> <nerijus(a)users.sourceforge.net> that contains the registry information to SL> make the installer of IE 4.0 thinking the SP3 is installed on a NT 4.0 system. SL> SL> Tschüß Stefan SL> SL> --- wine-20011004/winedefault.reg Fri Oct 5 13:12:57 2001 SL> +++ wine/winedefault.reg Mon Oct 8 22:25:33 2001 SL> @@ -100,6 +100,13 @@ SL> "OEMCP"="437" SL> SL> # SL> +# Win NT 4.0 with Service Pack 3 SL> +# SL> + SL> +[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Windows] SL> +"CSDVersion"="768" Maybe better to use "1536"? It means Service Pack 6. Regards, Nerijus

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