May 2005 - Wine-devel - list.winehq.org

Re: listview: Select the item under the point (x,y) in MouseHover
by Dimi Paun 20 May '05

20 May '05

On Thu, 2005-05-19 at 19:38 -0500, James Hawkins wrote: > + if (!lpLVItem) > + return FALSE; Please don't check for NULL, it's an internal function, you should never pass NULL there. And if you do, it should crash :) -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

1 0

Move GDI handles to the large heap
by Dimitrie O. Paun 19 May '05

19 May '05

I'm not sure if this is what Alexandre had in mind, but here it goes... ... I just realized that some things may break. In particular, what do we do with windows/syscolor.c:SYSCOLOR_MakeObjectSystem() Index: dlls/gdi/gdiobj.c =================================================================== RCS file: /var/cvs/wine/dlls/gdi/gdiobj.c,v retrieving revision 1.12 diff -u -p -r1.12 gdiobj.c --- dlls/gdi/gdiobj.c 18 May 2005 09:50:43 -0000 1.12 +++ dlls/gdi/gdiobj.c 19 May 2005 15:43:31 -0000 @@ -76,8 +76,6 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static SYSLEVEL GDI_level = { { &critsect_debug, -1, 0, 0, 0, 0 }, 3 }; -static WORD GDI_HeapSel; - inline static BOOL get_bool(char *buffer) { return (buffer[0] == 'y' || buffer[0] == 'Y' || @@ -602,7 +600,6 @@ inline static void dec_ref_count( HGDIOB */ BOOL GDI_Init(void) { - HINSTANCE16 instance; HKEY hkey; GDIOBJHDR *ptr; LOGFONTW default_gui_font; @@ -612,9 +609,6 @@ BOOL GDI_Init(void) if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Tweak.Fonts", &hkey)) hkey = 0; - /* create GDI heap */ - if ((instance = LoadLibrary16( "GDI.EXE" )) >= 32) GDI_HeapSel = instance | 7; - /* create stock objects */ stock_objects[WHITE_BRUSH] = CreateBrushIndirect( &WhiteBrush ); stock_objects[LTGRAY_BRUSH] = CreateBrushIndirect( &LtGrayBrush ); @@ -710,34 +704,9 @@ inline static GDIOBJHDR *alloc_large_hea void *GDI_AllocObject( WORD size, WORD magic, HGDIOBJ *handle, const struct gdi_obj_funcs *funcs ) { GDIOBJHDR *obj = NULL; - HLOCAL16 hlocal; _EnterSysLevel( &GDI_level ); - switch(magic) - { - case PEN_MAGIC: - case BRUSH_MAGIC: - if (GDI_HeapSel) - { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - - stack16->ds = GDI_HeapSel; - if ((hlocal = LocalAlloc16( LMEM_MOVEABLE, size ))) - { - assert( hlocal & 2 ); - obj = MapSL(LocalLock16( hlocal )); - *handle = (HGDIOBJ)(ULONG_PTR)hlocal; - } - stack16->ds = oldDS; - if (!hlocal) goto error; - break; - } - /* fall through */ - default: - if (!(obj = alloc_large_heap( size, handle ))) goto error; - break; - } + if (!(obj = alloc_large_heap( size, handle ))) goto error; obj->wMagic = magic|OBJECT_NOSYSTEM; obj->dwCount = 0; @@ -762,34 +731,16 @@ error: */ void *GDI_ReallocObject( WORD size, HGDIOBJ handle, void *object ) { - HGDIOBJ new_handle; void *new_ptr = NULL; + int i; - if ((UINT_PTR)handle & 2) /* GDI heap handle */ - { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 h = LOWORD(handle); - - stack16->ds = GDI_HeapSel; - LocalUnlock16( h ); - if ((new_handle = (HGDIOBJ)(ULONG_PTR)LocalReAlloc16( h, size, LMEM_MOVEABLE ))) - { - assert( new_handle == handle ); /* moveable handle cannot change */ - new_ptr = MapSL(LocalLock16( h )); - } - stack16->ds = oldDS; - } - else + i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) { - int i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) - { - new_ptr = HeapReAlloc( GetProcessHeap(), 0, large_handles[i], size ); - if (new_ptr) large_handles[i] = new_ptr; - } - else ERR( "Invalid handle %p\n", handle ); + new_ptr = HeapReAlloc( GetProcessHeap(), 0, large_handles[i], size ); + if (new_ptr) large_handles[i] = new_ptr; } + else ERR( "Invalid handle %p\n", handle ); if (!new_ptr) { TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount); @@ -805,30 +756,17 @@ void *GDI_ReallocObject( WORD size, HGDI BOOL GDI_FreeObject( HGDIOBJ handle, void *ptr ) { GDIOBJHDR *object = ptr; + int i; object->wMagic = 0; /* Mark it as invalid */ object->funcs = NULL; - if ((UINT_PTR)handle & 2) /* GDI heap handle */ + i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 h = LOWORD(handle); - - stack16->ds = GDI_HeapSel; - LocalUnlock16( h ); - LocalFree16( h ); - stack16->ds = oldDS; - } - else /* large heap handle */ - { - int i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) - { - HeapFree( GetProcessHeap(), 0, large_handles[i] ); - large_handles[i] = NULL; - } - else ERR( "Invalid handle %p\n", handle ); + HeapFree( GetProcessHeap(), 0, large_handles[i] ); + large_handles[i] = NULL; } + else ERR( "Invalid handle %p\n", handle ); TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount); _LeaveSysLevel( &GDI_level ); return TRUE; @@ -845,37 +783,15 @@ BOOL GDI_FreeObject( HGDIOBJ handle, voi void *GDI_GetObjPtr( HGDIOBJ handle, WORD magic ) { GDIOBJHDR *ptr = NULL; + int i; _EnterSysLevel( &GDI_level ); - if ((UINT_PTR)handle & 2) /* GDI heap handle */ - { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 h = LOWORD(handle); - - stack16->ds = GDI_HeapSel; - ptr = MapSL(LocalLock16( h )); - if (ptr) - { - if (((magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) || - (GDIMAGIC(ptr->wMagic) < FIRST_MAGIC) || - (GDIMAGIC(ptr->wMagic) > LAST_MAGIC)) - { - LocalUnlock16( h ); - ptr = NULL; - } - } - stack16->ds = oldDS; - } - else /* large heap handle */ + i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + if (i >= 0 && i < MAX_LARGE_HANDLES) { - int i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES) - { - ptr = large_handles[i]; - if (ptr && (magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) ptr = NULL; - } + ptr = large_handles[i]; + if (ptr && (magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) ptr = NULL; } if (!ptr) @@ -895,15 +811,6 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WOR */ void GDI_ReleaseObj( HGDIOBJ handle ) { - if ((UINT_PTR)handle & 2) - { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - - stack16->ds = GDI_HeapSel; - LocalUnlock16( LOWORD(handle) ); - stack16->ds = oldDS; - } TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount); _LeaveSysLevel( &GDI_level ); } @@ -1479,30 +1386,29 @@ DWORD WINAPI GdiSetBatchLimit( DWORD lim DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2, WORD wParam3 ) { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; DWORD ret = ~0UL; - stack16->ds = GDI_HeapSel; switch (wReqType) { case 0x0001: /* LocalAlloc */ - ret = LocalAlloc16( wParam1, wParam3 ); + WARN("LocalAlloc16(%x, %x): ignoring\n", wParam1, wParam3); + ret = 0; break; case 0x0002: /* LocalFree */ - ret = LocalFree16( wParam1 ); + WARN("LocalFree16(%x): ignoring\n", wParam1); + ret = 0; break; case 0x0003: /* LocalCompact */ - ret = LocalCompact16( wParam3 ); + WARN("LocalCompact16(%x): ignoring\n", wParam3); + ret = 65000; /* lie about the amount of free space */ break; case 0x0103: /* LocalHeap */ - ret = GDI_HeapSel; + WARN("LocalHeap16(): ignoring\n"); break; default: WARN("(wReqType=%04x): Unknown\n", wReqType); break; } - stack16->ds = oldDS; return ret; } @@ -1544,15 +1450,7 @@ void WINAPI FinalGdiInit16( HBRUSH16 hPa */ WORD WINAPI GdiFreeResources16( DWORD reserve ) { - STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); - HANDLE16 oldDS = stack16->ds; - WORD ret; - - stack16->ds = GDI_HeapSel; - ret = (WORD)( (int)LocalCountFree16() * 100 / (int)LocalHeapSize16() ); - stack16->ds = oldDS; - - return ret; + return 90; /* lie about it, it shouldn't matter */ } -- Dimi.

3 2

Another debugging tutorial
by Mike Hearn 19 May '05

19 May '05

This time, it's how to debug PE Explorer hanging when you double click on a DLL in the file open dialog (fixed in CVS). http://wiki.winehq.com/Debugging_the_PE_Explorer_file_open_dialog Newbie developers, I crave your feedback. Are these actually useful or am I wasting my time? Share and enjoy! thanks -mike

4 3

No rule to make target distclean ??
by Dustin Navea 19 May '05

19 May '05

Im troubleshooting bug 2962 http://bigs.winehq.com/show_bug.cgi?id=2962 and I had the reporter revert to the october release. But when trying to compile it, it failed, so I told him to do make distclean.. Now he's getting the no rule to make target distclean... Im stumped as to what to do... Can someone help me out? Dustin

2 1

Re: [include] fix in winternl
by Paul Vriens 19 May '05

19 May '05

> *SystemDriverInformation should be called SystemModuleInformation because > it provides information on any module in system address space, not only > drivers. > > ChangeLog: Rename SystemDriverInformation to SystemModuleInformation > > Ivan. > * > > Could you also change ntdll/nt.c as it's used there. (didn't that give compile problems ?). Cheers, Paul.

1 0

Detecting ulimit problem
by Eric Frias 19 May '05

19 May '05

I just ran into bug 2609: http://bugs.winehq.org/show_bug.cgi?id=2609 which is that wine fails to initialize when the user has a ulimit for virtual memory (address space) set to less than around 1300MB. This is something wine could test for and issue a warning. I know this isn't technically a problem with wine, but it's pretty unusual for an application to require that much address space. A user might not even realize they have a limit set if they haven't encountered problems with other large applications. It looks like I'm at least the third person to encounter this, and a hint to look at ulimit instead of other things (like the overcommit_memory setting) would've saved me some time. Something like: struct rlimit address_limits; int required_address_space = 1024 * 1024 * 1400; /* 1400M */ getrlimit(RLIMIT_AS, &address_limits); if (address_limits.rlim_max < required_address_space) WINE_WARN("Your virtual memory limit is set to %dk, which will\nprobably prevent wine from loading correctly. If you get an error,\nincrease the limit with 'ulimit -v' to at least %dk.\n", address_limits.rlim_max / 1024, required_address_space / 1024); I don't know how to determine the exact amount of address space wine requires, since it seems to vary somewhat with the application -- 1300M is enough for notepad, our own winelib app requires at least 1375M. Would a warning like this be appropriate? Eric

1 0

Re: Added the feature to change row height in owner draw controls.
by Dimitrie Paun 19 May '05

19 May '05

> Added the feature to change row height in owner draw controls. The indentation looks a bit funky on this one -- can you please use 4-space indentation? -- Dimi.

2 2

Re: list: make LIST_FOR_EACH_ENTRY look more like a for loop
by Alexandre Julliard 19 May '05

19 May '05

Dimi Paun <dimi(a)lattica.com> writes: > I've always been a bit confused about the parameters to the > list macros. If you don't use them much (which I didn't) it's > hard to remember them. I think it would be best if we are > consistent with other for loops out there. I think they are perfectly consistent as they are. The common form of a for loop is something like 'for cursor in list', that's also what LIST_FOR_EACH does, so it makes sense to have LIST_FOR_EACH_ENTRY do the same. The extra 2 parameters are implementation details about the object structure, that are just fine at the end. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: list: make LIST_FOR_EACH_ENTRY look more like a for loop
by Robert Shearman 19 May '05

19 May '05

Dimi Paun wrote: >I've always been a bit confused about the parameters to the >list macros. If you don't use them much (which I didn't) it's >hard to remember them. I think it would be best if we are >consistent with other for loops out there. > >ChangeLog > Change the parameter order for LIST_FOR_EACH_ENTRY() > to more closely match the for loop. > > > > >------------------------------------------------------------------------ > >Index: ./include/wine/list.h >=================================================================== >RCS file: /var/cvs/wine/include/wine/list.h,v >retrieving revision 1.6 >diff -u -p -r1.6 list.h >--- ./include/wine/list.h 18 May 2005 13:24:46 -0000 1.6 >+++ ./include/wine/list.h 19 May 2005 12:19:33 -0000 >@@ -55,7 +55,7 @@ struct list > * And to iterate over it: > * > * struct gadget *gadget; >- * LIST_FOR_EACH_ENTRY( gadget, &global_gadgets, struct gadget, entry ) >+ * LIST_FOR_EACH_ENTRY( struct gadget, entry, &global_gadgets, gadget ) > * { > * ... > * } > > I don't think this makes any more sense with your patch than before. LIST_FOR_EACH_ENTRY is different to a for statement because LIST_FOR_EACH_ENTRY doesn't declare the start condition, end condition and iterator because these are defined by the macro itself. The parameters are really just defining what you are iterating on and what you are using. Rob

1 0

Re: Corrected the priority of operators for LISTVIEW_GetNextItem function.
by taro-x＠justsystem.co.jp 19 May '05

19 May '05

2005-05-19 Kouji Sasaki <taro-x(a)justsystem.co.jp> > > Changelog: > > > > * dlls/comctl32/listview.c > > > > Corrected the priority of operators for LISTVIEW_GetNextItem function. > > > --- dlls/comctl32/listview.c 2005-04-14 22:58:24.000000000 +0900 > > +++ dlls/comctl32/listview.c 2005-05-16 11:29:08.003084512 +0900 > > @@ -5665,7 +5665,7 @@ > > * so it's worth optimizing */ > > if (uFlags & LVNI_FOCUSED) > > { > > - if (!(LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) == uMask) return -1; > > + if (!((LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) == uMask)) return -1; > > Wouldn't it be more readable and less confusing in the below form? > > if ((LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) != uMask) return -1; > > > -- > Dmitry. > I will send the modified patch, as changing the patch accordingly will make the source much easier to read. Changelog: * dlls/comctl32/listview.c Corrected the priority of operators for LISTVIEW_GetNextItem function. -- Justsystem Corporation <taro-x(a)justsystem.co.jp>

1 0