December 2002 - Wine-Devel - list.winehq.org

RE: PATCH: dlls/cabinet/cabextract.c and off_t
by Patrik Stridvall Dec. 27, 2002

Dec. 27, 2002

> On Fri, 27 Dec 2002, Greg Turner wrote: > >>>> If we really want to use off_t in this file (instead of > cab_off_t) > >>>> we need to #include sys/types.h, or we'll break > non-Linux systems. > >> Short to medium term, do you agree with my fix (#include > >> <sys/types.h>) so that Wine also builds on non-Linux systems? > > Maybe. I don't object, since it should be harmless to add > this, but I > > seem to be missing the point of why sys/types.h is needed at all. > > cab_off_t is just typedef'ed to UINT32, which should > compile just fine > > with only winnt.h, I think. Is there a particular scenario you are > > encountering that fails? If so, what is the compile error? > > The following line is the problem: > > fol->offset[0] = base_offset + (off_t) > EndGetI32(buf+cffold_DataOffset); > ^^^^^ > > Here we use off_t (which requires sys/types.h), that's why I wrote "If > we really want to use off_t in this file. Should this simply become > cab_off_t? Since the type of fol->offset is cab_off_t presumably... That is how I fixed it in my tree.

1 0

RtlUnicodeStringToInteger prototype (resending)
by Dan Kegel Dec. 27, 2002

Dec. 27, 2002

I sent this to wine-patches on the 25th, but it never appeared in the archive; is that list moderated? - Dan Changelog: * dlls/ntdll/{,tests/}rtlstr.c - fix prototype for RtlUnicodeToInteger Dan Kegel License: LGPL Index: dlls/ntdll/rtlstr.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/rtlstr.c,v retrieving revision 1.25 diff -u -r1.25 rtlstr.c --- dlls/ntdll/rtlstr.c 12 Nov 2002 02:17:34 -0000 1.25 +++ dlls/ntdll/rtlstr.c 25 Dec 2002 18:52:54 -0000 @@ -843,17 +843,17 @@ */ NTSTATUS WINAPI RtlUnicodeStringToInteger( const UNICODE_STRING *str, - int base, - int * pdest) + ULONG base, + PULONG pdest) { LPWSTR lpwstr = str->Buffer; WCHAR wchCurrent = 0; int CharsParsed = 0; - int RunningTotal = 0; + ULONG RunningTotal = 0; char bMinus = 0; /* no checking done on UNICODE_STRING and int* in native DLL either */ - TRACE("(%p, %d, %p)", str, base, pdest); + TRACE("(%p, %lu, %p)", str, base, pdest); switch (base) { @@ -895,8 +895,7 @@ wchCurrent = '0' + 10 + wchCurrent - 'A'; if ((wchCurrent - '0') >= base || wchCurrent < '0') { - *pdest = bMinus ? -RunningTotal: RunningTotal; - return STATUS_SUCCESS; + break; } /* * increase significance of previous digits each time @@ -905,6 +904,6 @@ RunningTotal = wchCurrent - '0' + RunningTotal * base; } - *pdest = bMinus ? -RunningTotal : RunningTotal; + *pdest = bMinus ? ((~RunningTotal)+1UL) : RunningTotal; return STATUS_SUCCESS; } Index: dlls/ntdll/tests/rtlstr.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/tests/rtlstr.c,v retrieving revision 1.2 diff -u -r1.2 rtlstr.c --- dlls/ntdll/tests/rtlstr.c 19 Dec 2002 21:15:41 -0000 1.2 +++ dlls/ntdll/tests/rtlstr.c 25 Dec 2002 18:52:54 -0000 @@ -66,7 +66,7 @@ /* more function pointers here */ /*static DWORD (WINAPI *pRtlIsTextUnicode)(LPVOID, DWORD, DWORD *);*/ -static NTSTATUS (WINAPI *pRtlUnicodeStringToInteger)(const UNICODE_STRING *, int, int *); +static NTSTATUS (WINAPI *pRtlUnicodeStringToInteger)(const UNICODE_STRING *, ULONG, PULONG); static void InitFunctionPtrs() { @@ -123,7 +123,7 @@ static void test_RtlUnicodeStringToInteger(void) { - int dest = 0; + ULONG dest = 0; int i; DWORD result; @@ -131,6 +131,7 @@ static const WCHAR stringwithint[][12] = { {'1','0','1','1','1','0','1','1','0','0',0}, {'1','2','3','4','5','6','7',0}, + {'-','2','1','4','7','4','8','3','6','4','7',0}, {'2','1','4','7','4','8','3','6','4','8',0}, {'-','2','1','4','7','4','8','3','6','4','8',0}, {'-','2','1','4',0}, @@ -141,11 +142,12 @@ {'0','x','1','2','3','4','5',0}, {'1','x','3','4',0} }; - static const int expectedresults[] = { + static const ULONG expectedresults[] = { 1011101100, 1234567, - 2147483648, - 2147483648, + -2147483647, + 2147483648UL, + 2147483648UL, /* 2 ^ 31 === - (2 ^ 31) */ -214, 214, 214, @@ -155,34 +157,37 @@ 1 }; /* these are for stringwithint[0]: */ - static const int expectedresultsbase[] = { + static const ULONG expectedresultsbase[] = { 748, /* base 2 */ 136610368, /* base 8 */ 1011101100, /* base 10 */ 286265600, /* base 16 */ }; - - for (i = 0; i < sizeof(expectedresults) / sizeof(int); i++) + + /* check assumption made in -0 test case */ + ok((2147483648UL == ((~2147483648UL) + 1UL)), "LONG is not 32 bits?"); + + for (i = 0; i < sizeof(expectedresults) / sizeof(expectedresults[0]); i++) { dest = 0xdeadbeef; pRtlInitUnicodeString(&uni, stringwithint[i]); result = pRtlUnicodeStringToInteger(&uni, 0, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 0); - ok(dest == expectedresults[i], "didn't return expected value (test %d): expected: %d, got: %d}", i, expectedresults[i], dest); + ok(dest == expectedresults[i], "didn't return expected value (test %d): expected: %lu, got: %lu}", i, expectedresults[i], dest); } pRtlInitUnicodeString(&uni, stringwithint[0]); result = pRtlUnicodeStringToInteger(&uni, 2, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 2); - ok(dest == expectedresultsbase[0], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[0], dest); + ok(dest == expectedresultsbase[0], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[0], dest); result = pRtlUnicodeStringToInteger(&uni, 8, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 8); - ok(dest == expectedresultsbase[1], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[1], dest); + ok(dest == expectedresultsbase[1], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[1], dest); result = pRtlUnicodeStringToInteger(&uni, 10, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 10); - ok(dest == expectedresultsbase[2], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[2], dest); + ok(dest == expectedresultsbase[2], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[2], dest); result = pRtlUnicodeStringToInteger(&uni, 16, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 16); - ok(dest == expectedresultsbase[3], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[3], dest); + ok(dest == expectedresultsbase[3], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[3], dest); } START_TEST(rtlstr)

2 2

Wine: several warnings in dlls/ntdll/tests/rtlstr.c
by Gerald Pfeifer Dec. 27, 2002

Dec. 27, 2002

Using GCC 2.95.3 on FreeBSD 4.7 (which has a couple of tests not usually supported by GCC 2.95) I get a couple of warnings due to recent changes/additions in Wine; these warnings seem to indicate real problems: rtlstr.c: In function `test_RtlInitUnicodeString': rtlstr.c:110: warning: implicit declaration of function `wcscmp' rtlstr.c: In function `test_RtlUnicodeStringToInteger': rtlstr.c:147: warning: decimal constant is so large that it is unsigned rtlstr.c:148: warning: decimal constant is so large that it is unsigned rtlstr.c:170: warning: int format, different type arg (arg 3) rtlstr.c:175: warning: int format, different type arg (arg 3) rtlstr.c:176: warning: int format, different type arg (arg 3) rtlstr.c:178: warning: int format, different type arg (arg 3) rtlstr.c:179: warning: int format, different type arg (arg 3) rtlstr.c:181: warning: int format, different type arg (arg 3) rtlstr.c:182: warning: int format, different type arg (arg 3) rtlstr.c:184: warning: int format, different type arg (arg 3) rtlstr.c:185: warning: int format, different type arg (arg 3) Robert, perhaps you could have a look at these? Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.pfeifer.com/gerald/

3 2

d3d three more renderstates for n2002
by Christoph Frick Dec. 27, 2002

Dec. 27, 2002

Hi! with one of the last patches from the cvs the game Nascar 2002 now recognizes the d3d rasterizer in the config tool. The patch below adds three more handlers for the D3DRENDERSTATE. As d3d seems to me pretty undocumented i can only try to find things out using goolgle and see the example code there - a link to doku would be really appreciated. Only the D3DRENDERSTATE_CLIPPING stuff seems pretty obvious. I dont have a clue what the EXTEND stuff does and can also only guess what the EDGEANTIALIAS does. I also was not able to test it in the game - the d3d stuff seem to lack a lot of functions this game relies on - i will try to add further functions step by step. The d3d7 code looks pretty bound to mesa - i dont use mesa, so i can not say if this works or not with mesa - only with the opengl provided by nvidia and what the manpages say. RFC and CU! Index: dlls/ddraw/mesa.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/mesa.c,v retrieving revision 1.20 diff -u -r1.20 mesa.c --- dlls/ddraw/mesa.c 24 Dec 2002 01:03:04 -0000 1.20 +++ dlls/ddraw/mesa.c 27 Dec 2002 11:43:32 -0000 @@ -345,6 +345,39 @@ glDisable(GL_LIGHTING); break; + case D3DRENDERSTATE_CLIPPING: + /* enables/disables clipping; get the maximal amount of + * possible clippling planes in this opengl implementation and + * enable/disable em all */ + { + GLint i, maxclipplanes; + glGetIntegerv(GL_MAX_CLIP_PLANES,&maxclipplanes); + for (i=0; i<maxclipplanes; i++) { + if (dwRenderState) { + glEnable(GL_CLIP_PLANE0+i); + } else { + glDisable(GL_CLIP_PLANE0+i); + } + } + } + break; + + case D3DRENDERSTATE_EXTENTS: + /* boolean + * dont have a clue what this does */ + FIXME("What is D3DRENDERSTATE_EXTENTS supposed to do?\n"); + break; + + case D3DRENDERSTATE_EDGEANTIALIAS: + /* in opengl the antialiasing of points, lines and polygons can + * be set separate - assuming this only actives it for polygons */ + if (dwRenderState) { + glEnable(GL_POLYGON_SMOOTH); + } else { + glDisable(GL_POLYGON_SMOOTH); + } + break; + default: ERR("Unhandled dwRenderStateType %s (%08x) !\n", _get_renderstate(dwRenderStateType), dwRender StateType); }

3 2

Re: Standard way of printing RECT in trace statements?
by Dan Kegel Dec. 27, 2002

Dec. 27, 2002

Francois Gouget wrote: > On Fri, 27 Dec 2002, Dan Kegel wrote: > [...] > >>I thought everyone always left NO_TRACE_MSGS undefined, >>so the rect2a function you favor gets called unconditionally, >>and its output filtered out. > > > No. Look at the TRACE macro again (include/wine/debug.h). The function > will only be called if __WINE_GET_DEBUGGING(dbcl,(dbch)) I stand corrected. Sweet. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

1 0

Standard way of printing RECT in trace statements?
by Dan Kegel Dec. 27, 2002

Dec. 27, 2002

Dimitrie O. Paun wrote: > Most of the case can be transformed to debugrect(), but that requires > some infrastructure work, so it belongs in a separate patch. I assume you're referring to the routine in listview.c: static inline char* debugrect(const RECT *rect) While that works, it also seems worth considering a macro-based approach. For instance: #define _RECT_FMT "(%ld,%ld)-(%ld,%ld)" #define _RECT_ARG(r) (r).left, (r).top, (r).right, (r).bottom ... Example use: TRACE("Combo client " _RECT_FMT ", setting Edit to " _RECT_FMT "\n", _RECT_ARG(rect), x, y, x + w, y + h); (FWIW, the Linux kernel uses a similar macro, NIPQUAD, to display IP addresses.) Although this doesn't hide things as well as the inline function, it might have some advantage in size and runtime, since it does more of its work at compile time. Either way, having a standard way of inserting values of Windows structures into TRACE statements would probably be nice to have. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

2 2

Re: Listview scroll patch
by Dimitrie O. Paun Dec. 27, 2002

Dec. 27, 2002

On December 27, 2002 01:18 am, Chris Morgan wrote: > +/* Return the corresponding text for a given scroll value */ > +static inline LPSTR debugscrollcode(int nScrollCode) > +{ > + switch(nScrollCode) > + { > + case SB_LINELEFT: return "SB_LINELEFT"; > + case SB_LINERIGHT: return "SB_LINERIGHT"; > + case SB_PAGELEFT: return "SB_PAGELEFT"; > + case SB_PAGERIGHT: return "SB_PAGERIGHT"; > + case SB_THUMBPOSITION: return "SB_THUMBPOSITION"; > + case SB_THUMBTRACK: return "SB_THUMBTRACK"; > + case SB_ENDSCROLL: return "SB_ENDSCROLL"; > + case SB_INTERNAL: return "SB_INTERNAL"; > + default: return "unknown"; > + } > +} Sorry to be a nag, but please use 4-space indents, like most of the code in there. 2-space indented code is old, and it's a mark for me to look over it, all new code should be 4-space indented. -- Dimi.

1 0

Re: Listview scroll patch
by Dimitrie O. Paun Dec. 27, 2002

Dec. 27, 2002

On December 26, 2002 04:06 pm, Chris Morgan wrote: > +/* Replace the scroll value with text */ > +#define SCROLL_CODE_TEXT(nScrollCode) \ > + (nScrollCode == SB_LINELEFT) ? "SB_LINELEFT" : (nScrollCode == > SB_LINERIGHT) \ + ? "SB_LINERIGHT" : (nScrollCode == > SB_INTERNAL) ? "SB_INTERNAL" : \ + (nScrollCode == > SB_PAGELEFT) ? "SB_PAGELEFT" : (nScrollCode == \ > + SB_PAGERIGHT) ? "SB_PAGERIGHT" : (nScrollCode == > SB_THUMBPOSITION) ? \ + "SB_THUMBPOSITION" : (nScrollCode == > SB_THUMBTRACK) ? \ + "SB_THUMBTRACK" : \ > + (nScrollCode == SB_ENDSCROLL) ? "SB_ENDSCROLL" \ > + : "unknown" Please do not introduce such macros. I don't really think it's necessary to transform the code to text (it clutters the output), but if you insist on doing it, just do it through a function: static inline LPCSTR debugscrollcode(INT nScrollCode) { ... } This is the pattern used throughout listview.c. But in general speaking, if you can do it without macros, then macros are not the answer. -- Dimi.

2 1

Old scrolling bug
by Duane Clark Dec. 27, 2002

Dec. 27, 2002

Howdy, Another in my pattern of posting intermediate debugging results here, in case anyone can contribute some insight... Looking into the bug that Dimitrie reported here: http://www.winehq.com/hypermail/wine-devel/2002/09/0748.html Here is what is happening (testing on the Listview Control Spy) when sliding the obscuring window. I changed a bunch of TRACE messages to ERR, and added a few. The window of interest, that the artifacts are appearing in is 0x10039 (the "Control Notifications" window): err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 0,138 11x1 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 304,138 4x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00032) 0,110 2x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00033) 0,108 99x1 err:x11drv:X11DRV_Expose win 0x10040 (2e00041) 0,126 293x1 err:win:BeginPaint hwnd 0x10021 hdc = 0x9e8 box = (0,138 - 409,139) err:win:EndPaint Here err:win:BeginPaint hwnd 0x10039 hdc = 0x9e8 box = (0,108 - 99,109) err:win:EndPaint Here err:win:BeginPaint hwnd 0x10040 hdc = 0x9e8 box = (0,0 - 293,186) err:win:EndPaint Here err:win:BeginPaint hwnd 0x10047 hdc = 0x890 box = (0,109 - 277,110) err:win:EndPaint Here So an initial exposure occurred and was almost immediately painted. The obscuring window is now at y=109. The first expose of the pair is a validate, and the second is the invalidate. Then ScrollWindowEx is called, which eventually gets to X11DRV_ScrollDC, where the bitblt that scrolls the window is called. err:bitblt:BitBlt hdcSrc=0x9e8 0,14 24 bpp->hdcDest=0x9e8 0,0 126x154x24 rop=cc0020 After scrolling, X11DRV_EndGraphicsExposures is called, which checks pending exposure events as a result of the scroll. err:x11drv:X11DRV_EndGraphicsExposures got 0,96 99x14 count 0 Note that the exposed part is the rectangle with y coordinates from 96 to 110. That means that before the bitblt copy had occurred, the obscuring window had already moved down one pixel. The bitblt moved the previously obscured rectangle at (0,109 - 99,110) to (0,95 - 99,96), but that rectangle did not get into the update rectangle. This is because the only pending events checked are those that are a direct result of exposure due to the copy in bitblt, and does not include any additional areas that were exposed by sliding the obscuring region. err:scroll:X11DRV_ScrollWindowEx A hwnd 0x10039 rgn rect = (0,96,126,168) err:win:GetUpdateRgn hrgnUpdate 0 err:scroll:X11DRV_ScrollWindowEx B hwnd 0x10039 rgn rect = (0,96,126,168) It should be pointed out that X did not lose the exposure event due to sliding the obscuring window, because here it shows up in the next exposure event err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 0,139 11x1 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 304,139 4x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00032) 0,111 2x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00033) 0,109 99x1 ^^^ Unfortunately, we have already handled the offset due to scrolling, so this event is put into the update region unshifted. The remaining exposures are new, so no shifting is needed. err:x11drv:X11DRV_Expose win 0x10040 (2e00041) 0,127 293x1 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 0,140 11x3 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 304,140 4x3 err:x11drv:X11DRV_Expose win 0x10039 (2e00032) 0,112 2x3 err:x11drv:X11DRV_Expose win 0x10039 (2e00033) 0,110 99x3 err:x11drv:X11DRV_Expose win 0x10040 (2e00041) 0,128 293x3 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 0,143 11x1 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 304,143 4x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00032) 0,115 2x1 err:x11drv:X11DRV_Expose win 0x10039 (2e00033) 0,113 99x1 err:x11drv:X11DRV_Expose win 0x10040 (2e00041) 0,131 293x1 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 0,144 11x2 err:x11drv:X11DRV_Expose win 0x10021 (2e00003) 304,144 4x2 err:x11drv:X11DRV_Expose win 0x10039 (2e00032) 0,116 2x2 err:x11drv:X11DRV_Expose win 0x10039 (2e00033) 0,114 99x2 err:x11drv:X11DRV_Expose win 0x10040 (2e00041) 0,132 293x2 err:win:BeginPaint hwnd 0x10021 hdc = 0x890 box = (0,139 - 409,146) err:win:EndPaint Here And finally the update region is painted. This update region includes the region exposed by the scroll, plus all the additional exposure events that occurred due to sliding the obscuring window. err:win:BeginPaint hwnd 0x10039 hdc = 0x890 box = (0,96 - 126,168) err:win:EndPaint Here But there is a one pixel artifact at (0,95 - 99,96), because it is not in the update region. Fundamentally, the problem is that the X events are handled out of order, because X11DRV_EndGraphicsExposures stripped out particular events (due to copying) without accounting for other pending events that might be relevant (plain old exposure).

1 1

Re: glibc 2.3.1 patch
by Dan Kegel Dec. 27, 2002

Dec. 27, 2002

Ove Kaaven wrote: > The newest glibc in debian unstable, 2.3.1-8, does not seem to want to > export h_errno anymore, which causes a link failure. (and netdb.h now > defines h_errno to *__h_errno_location() regardless of whether > _LIBC_REENTRANT is defined or not.) So I used this hack in WineX, not sure > if it would be anywhere close to the right approach, if the right approach > presumably wasn't to remove this file entirely. Hi Ove! Can you run this by the glibc mailing list? I'm sure Ulrich Drepper will be able to tell you whether it's the right fix. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

1 0

[Fwd: wine version]
by Tony Lambregts Dec. 26, 2002

Dec. 26, 2002

-------- Original Message -------- Subject: wine version Date: Wed, 25 Dec 2002 22:54:50 +0100 From: "puoti(a)inwind.it" <puoti(a)inwind.it> Reply-To: wine-devel(a)winehq.com To: "bugs" <bugs(a)winehq.com> > We are at wine-20021219, but when you submit a new bug you can't select a > version more recent that wine-2002 We kind of need to get this automated if we could (yes?) any suggestions? -- Tony Lambregts

1 0

wcscmp header? %S format string in ok()?
by Dan Kegel Dec. 26, 2002

Dec. 26, 2002

I get the following compiler warnings in dlls/ntdll/tests/rtlstr.c: gcc -c -I. -I. -I../../../include -I../../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -DNONAMELESSUNION -DNONAMELESSSTRUCT -D_REENTRANT -o rtlstr.o rtlstr.c rtlstr.c: In function `test_RtlInitUnicodeString': rtlstr.c:110: warning: implicit declaration of function `wcscmp' rtlstr.c: In function `test_RtlUnicodeStringToInteger': rtlstr.c:175: warning: wchar_t format, different type arg (arg 3) rtlstr.c:180: warning: wchar_t format, different type arg (arg 3) rtlstr.c:181: warning: wchar_t format, different type arg (arg 3) rtlstr.c:183: warning: wchar_t format, different type arg (arg 3) rtlstr.c:184: warning: wchar_t format, different type arg (arg 3) rtlstr.c:186: warning: wchar_t format, different type arg (arg 3) rtlstr.c:187: warning: wchar_t format, different type arg (arg 3) rtlstr.c:189: warning: wchar_t format, different type arg (arg 3) rtlstr.c:190: warning: wchar_t format, different type arg (arg 3) (Actually, before the patch I just sent in, there were a couple more.) Two questions: 1. what .h file should tests/rtlstr.c include to get wcscmp? Posix says one thing, MSDN says a similar thing, but I want to get the path right. 2. The whcar_t format warnings might be serious -- isn't posix's wchar_t different from win32's wchar_t? - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

2 1

D3D status - bis
by Lionel Ulmer Dec. 26, 2002

Dec. 26, 2002

Hi all, I created a small web page with the list of the demos / games I am using to test Direct3D and their various status. If anyone of you has a demo that is almost running (ie it starts in D3D mode and does not crash to reason not linked to D3D) and you want me to look at it, send me a private mail and we will see what I can do (once I come home to my ADSL line :-) ). I would also be glad of people testing the same demos than me with other OpenGL libraries to see if they have the same texturing problem that I have. The status page is here : http://www.bbrox.org/d3d_status.html Lionel -- Lionel Ulmer - http://www.bbrox.org/

3 6

Re: Patch for Spanish keyboard layout
by Jeff Smith Dec. 26, 2002

Dec. 26, 2002

Daniel, What version of wine sources are you diffing against? If it is any older than 20021219, you really need to get up to date. Development is fairly rapid on this project, and *many* problems are fixed from one release to the next. I submitted a patch for your problem on October 29th: http://www.winehq.com/hypermail/wine-patches/2002/10/0503.html It was committed to CVS the same day: http://www.winehq.com/hypermail/wine-cvs/2002/10/0481.html So this should have been in the last two or three tagged versions. >Hi! > >This is a correction for the "Spanish keyboard layout". I think the >original layout had a typo. The original layout had two keys for the >character "'". This new layout fixes this problem and works perfect on my >machine with my "Spanish keyboard". > >Thanks ... > >-- >Daniel Mario Vega >dv5a(a)dc.uba.ar _________________________________________________________________ Protect your PC - get McAfee.com VirusScan Online http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963

1 0

Re: Re: D3D status - bis
by fenix＠club-internet.fr Dec. 26, 2002

Dec. 26, 2002

----Message d'origine---- >De: "Ann and Jason Edmeades" <us(a)the-edmeades.demon.co.uk> >A: "wine devel" <wine-devel(a)winehq.com> >Sujet: Re: D3D status - bis >Date: Wed, 25 Dec 2002 23:36:47 -0000 > >>> very Good idea, but it will be better if we can separate D3D[1-7] to >D3D[8-9] demos >>> as the two development in wine ;) > >I would be interested in locations of any d3d8 demos/samples which I can >download via a url, especially if they get as far as starting - d3d8 support >is still early stages. To avoid clutter to the list, feel free to drop me an >email. Hi, Personnaly i use for simple samples: - dx8.1 sdk samples - some gamedev.net d3d8 samples/tutorials (a gamedeveloper site) - some tutorials from a french game magazine (i can send you this if you want) and for games (for hards tests): - splinter cell demo (with vertex/pixel shaders) - warcraft 3 demo (only simple d3d) >>Well, as I only work (for now) on D3D[1-7] and this page is more done for me >>to know where I stand on all the games, I did not want to add too much stuff >>(ie as long as I do not work on D3D8, I won't add any of these games on this >>list). >>Otherwise, it's a bigger project (like some sort if 'developper only' application database). > If anyone fancies maintaining a similar page for d3d8 it would probably help, as I am not the only one looking at this code, and a status would be a good idea. > I suspect though at the moment they are all in about the same(failing) state! ;) i'll send you a simple draft for my samples and games tests for beginning. >Jason > Raphael

1 0

Re: D3D status - bis
by Ann and Jason Edmeades Dec. 25, 2002

Dec. 25, 2002

>> very Good idea, but it will be better if we can separate D3D[1-7] to D3D[8-9] demos >> as the two development in wine ;) I would be interested in locations of any d3d8 demos/samples which I can download via a url, especially if they get as far as starting - d3d8 support is still early stages. To avoid clutter to the list, feel free to drop me an email. >Well, as I only work (for now) on D3D[1-7] and this page is more done for me >to know where I stand on all the games, I did not want to add too much stuff >(ie as long as I do not work on D3D8, I won't add any of these games on this >list). >Otherwise, it's a bigger project (like some sort of 'developper only' >application database). If anyone fancies maintaining a similar page for d3d8 it would probably help, as I am not the only one looking at this code, and a status would be a good idea. I suspect though at the moment they are all in about the same (failing) state! Jason

1 0

Re: Wine Contrib v0.4
by Jeff Smith Dec. 25, 2002

Dec. 25, 2002

There are several unmatched and interleaved tags on this page, which causes all kinds of funniness on various browsers. The unmatched anchor tags are particularly troublesome. I can send a patch if that would be simplest. Perhaps whoever is maintaining these pages should validate (validator.w3.org) it periodically. Anyone maintaining a wine page that needs help understanding validator error messages and/or how to correct them, I am glad to help. -- Jeff S >From: "Dimitrie O. Paun" <dpaun(a)rogers.com> > >Hi folks, > >Tom Wickline took over the Wine Contrib page, and >cleaned it up. He already went through 4 iterations, >and asked me to post it on my site for your reviewing >pleasure: > http://www.dssd.ca/wine/Wine-Contrib-0.4.html > >Please take a look at it, and let us know what you >think. The idea is to get it over with as soon as >possible so that work on other pages can commence. > >-- >Dimi. _________________________________________________________________ Protect your PC - get McAfee.com VirusScan Online http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963

2 1

Re: Validate imagelists
by Andreas Mohr Dec. 24, 2002

Dec. 24, 2002

On Tue, Dec 24, 2002 at 11:27:57AM -0800, Duane Clark wrote: > Changelog: > Validate imagelists with christmas magic. Huh ? > Index: dlls/comctl32/imagelist.h > =================================================================== > RCS file: /home/wine/wine/dlls/comctl32/imagelist.h,v > retrieving revision 1.3 > diff -u -r1.3 imagelist.h > --- dlls/comctl32/imagelist.h 31 May 2002 23:25:44 -0000 1.3 > +++ dlls/comctl32/imagelist.h 24 Dec 2002 19:26:09 -0000 > @@ -53,6 +53,8 @@ > INT nOvlIdx[15]; > }; > > +#define IMAGELIST_MAGIC 0x4C4D4948 "HIML" ?? Wouldn't that be more like 0x53414D58 ??? Merry Christmas, BTW ! :-) -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

1 0

Some D3D status updates...
by Lionel Ulmer Dec. 24, 2002

Dec. 24, 2002

Hi all, As it was one of my objectives when Christian's work prodded me into restarting working on D3D, I am happy to show here the first screen shot of SystemShock2 working (alas texture-less) with Wine : http://www.bbrox.org/system_shock2.png Merry Christmas to everybody :-) Lionel (with one week and a half of almost full-time hack vacation left :-) ) -- Lionel Ulmer - http://www.bbrox.org/

3 2

[JOY] wxWindows
by Dimitrie O. Paun Dec. 24, 2002

Dec. 24, 2002

Folks, Last night I managed to compile, link, and successfully run all(1) samples that come with wxWindows. In all honesty I am overjoyed! Let me explain why: -- wxWindows is a large piece of software that touches on most (if not all) Wine aspects. It does put our headers through their paces. -- The porting effort has been simple, and it took me a just a few days to do it. -- I have not used _any_ of the previous efforts to port wxWindows to Wine. I rather started with their MinGW port. -- Most of the changes have been trivial fixes for Wine which I have sent to wine-patches in the last few days. -- The hacks to wxWindows have been trivial and few in number. I have touched only a few files, and the changes are real simple. They'll need some cleaning up, and I'll submit them to the wxWindows folks for inclusion. -- The wine{gcc,wrap} combo is a great success. All I had to do was to touch only *one* file (makeg95.env), and modify only a few lines to get *everything* to compile and link. What does Wine get out of it: -- A good test for our headers -- Proof that wine{gcc,wrap} are a good idea (at least for me) -- A large number of sample that show quite a few problems in Wine. If anyone is interested in more details please let me know, and I'll be glad to provide them. Once we decide on the __WINE__ vs. __WINESRC__ thing, I'll cleanup the wxWindows changes and submit them for inclusion in their tree, so hopefully you'll be able to play with it using the official version not before long. Notes 1. All but a few: - 'dialup' did not compile because I had to disable dialup support in wxWindows since wine does not have a wininet.h - 'proplist' did not compile because I forgot to enable property lists in the configuration when I compiled wxWindows - 'tab' sample did not compile because it's recommended to not enable this deprecated option, so I did not. - the samples 'listbox', 'memcheck', and 'opengl/*' are not supported by wxWindows under MinGW, so I did not bother. -- Dimi.

2 2

'make test' failure on sysparams.c
by Dan Kegel Dec. 24, 2002

Dec. 24, 2002

On fresh cvs: ../../../tools/runtest -q -P wine -M user32.dll -T ../../.. -p user32_test.exe.so sysparams.c && touch sysparams.ok X Error of failed request: BadWindow (invalid Window parameter) Major opcode of failed request: 15 (X_QueryTree) Resource id in failed request: 0x2600003 Serial number of failed request: 45 Current serial number in output stream: 45 make[3]: *** [sysparams.ok] Error 1 This happens if I run 'make test' with a remote X window between two Red Hat 8.0 systems. (I haven't run the test locally on the screen that causes trouble, but I bet it'd be ok.) Can someone suggest the best way of tackling this? Thanks, Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

1 1

Re: Validate imagelists
by Dimitrie O. Paun Dec. 24, 2002

Dec. 24, 2002

On December 24, 2002 02:27 pm, Duane Clark wrote: > + if (himl == NULL || himl->magic!=IMAGELIST_MAGIC) What about a: static inline BOOL is_valid(HIMAGELIST himl) { return himl && himl->magic == IMAGELIST_MAGIC; } -- Dimi.

1 0

Mozilla-Win32 Winelib build update..
by Dustin Navea Dec. 24, 2002

Dec. 24, 2002

Hi guys, just wanted to update you all that I am having some trouble getting my hands on that DSL router I was planning on having last week. I should have it shortly after the first and can begin the build process then.. if all goes as planned. Sorry about the long wait and happy holidays to all. -Dustin

2 1

MSVC4, next two buttons on installer
by Dan Kegel Dec. 24, 2002

Dec. 24, 2002

I tried installing msvc++4.0 again with today's cvs wine. The 'exit' button works now, which is nice, but none of the other buttons do anything. (Well, they highlight when you mouse over them, and they play a sound, but that's it.) I discovered that under Windows, if you copy the disc's setup.exe to the hard drive, two of the buttons do nothing, just like in Wine. Two more buttons, however, simply launch external programs -- "Explore the CD" launches Windows Explorer on the directory containing setup.exe, and "Standard Template Library" launches WordPad on a particular file. OK, those sound so simple I ought to be able to get them working. So I copied wordpad.exe and mfc42.dll from my windows system into the same place on my fake windows area, and now when I click on "Standard Template Library", I get "Could not load the richEdit control DLL. The system may be low on memory or the file RICHED20.DLL may be missing or corrupt." OK, copied that too, now that button launches wordpad, albeit with lots of "fixme:clipboard:..." messages. Q1. What do I have to do to get Wine's builtin rich text DLL to work there? I tried "wine --dll riched32=b", but that didn't help. Q2. Any idea what I'd need to do to get a Windows Explorer going without actually installing the real Windows Explorer?-) Does Wine have a builtin Windows Explorer clone yet? Thanks, Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

2 3

Re: RECT (take 2)
by Dan Kegel Dec. 24, 2002

Dec. 24, 2002

Dimitrie O. Paun wrote: > Fixing the RECT definition (how come it fell through the cracks, > it's such a fundamental definition in Win32?) in one go doesn't > seem like it's going to happen. A lot of places need fixing, so > unless a Perl wizard (hint, hint) comes up with a magic script, > it's going to be a while until this is fixed. I had a go at the perl approach, at least for a subset of the changes. Here's the script I used to generate the initial patch: #!/bin/sh rm -rf orig after #make > log 2>&1 || /bin/true grep "warning: int format, LONG arg" log | sed -e 's/:.*//' | sort -u | sed 's,\.\./,,g' > fils find . | fgrep -f fils > absfils tar -czvf orig.tgz `cat absfils` mkdir orig cd orig; tar -xzvf ../orig.tgz; cd .. mkdir after cd after; tar -xzvf ../orig.tgz; cd .. cd after find . -type f | xargs perl -p -i.bak -e 's/\(%d,%d\)/(%ld,%ld)/g' cd .. diff -aur orig after > longify.patch I then removed any part of the patch that was wrong (first by eye, then iteratively by looking at compiler logs). This gets rid of quite a few of the warnings. The resulting patch is attached. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com diff -aur orig/controls/menu.c after/controls/menu.c --- orig/controls/menu.c 2002-12-21 21:52:08.000000000 -0800 +++ after/controls/menu.c 2002-12-24 05:11:18.000000000 -0800 @@ -965,7 +965,7 @@ - arrow_bitmap_width; } } - TRACE("(%d,%d)-(%d,%d)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); + TRACE("(%ld,%ld)-(%ld,%ld)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); } @@ -2688,7 +2688,7 @@ mt.pt.x = x; mt.pt.y = y; - TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%d,%d)-(%d,%d)\n", + TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%ld,%ld)-(%ld,%ld)\n", hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ? lprect->top : 0, (lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0); diff -aur orig/dlls/comctl32/comboex.c after/dlls/comctl32/comboex.c --- orig/dlls/comctl32/comboex.c 2002-12-21 21:52:08.000000000 -0800 +++ after/dlls/comctl32/comboex.c 2002-12-24 05:11:18.000000000 -0800 @@ -385,7 +385,7 @@ h = mysize.cy + 1; y = rect.bottom - h - 1; - TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n", + TRACE("Combo client (%ld,%ld)-(%ld,%ld), setting Edit to (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom, x, y, x + w, y + h); SetWindowPos(infoPtr->hwndEdit, HWND_TOP, x, y, w, h, SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER); @@ -891,10 +891,10 @@ height = cb_wrect.bottom-cb_wrect.top + cbx_wrect.bottom-cbx_wrect.top - (cbx_crect.bottom-cbx_crect.top); - TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, cbx_wrect.right-cbx_wrect.left, height); SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0, @@ -942,7 +942,7 @@ /* create combo box */ GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom); @@ -1033,7 +1033,7 @@ GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) CB wnd=(%ld,%ld)-(%ld,%ld)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); @@ -1042,7 +1042,7 @@ SWP_NOACTIVATE | SWP_NOREDRAW); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("CB window=(%d,%d)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld)\n", cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); SetWindowPos(hwnd, HWND_TOP, 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top, @@ -1291,7 +1291,7 @@ dis->CtlType, dis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", dis->itemID, dis->itemAction, dis->itemState); - TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", dis->hwndItem, dis->hDC, dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemData); @@ -1311,7 +1311,7 @@ if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) || ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { - TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n", + TRACE("drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld)\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom); } @@ -1327,14 +1327,14 @@ edrc.left=edrc.top=edrc.right=edrc.bottom=-1; if (infoPtr->hwndEdit) GetWindowRect (infoPtr->hwndEdit, &edrc); - TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n", + TRACE("window rects ex=(%ld,%ld)-(%ld,%ld), cb=(%ld,%ld)-(%ld,%ld), ed=(%ld,%ld)-(%ld,%ld)\n", exrc.left, exrc.top, exrc.right, exrc.bottom, cbrc.left, cbrc.top, cbrc.right, cbrc.bottom, edrc.left, edrc.top, edrc.right, edrc.bottom); } } else { - ERR("NOT drawing item -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n", + ERR("NOT drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld), action=%08x, state=%08x\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemAction, dis->itemState); @@ -1491,7 +1491,7 @@ rect.right = x + txtsize.cx; rect.top = dis->rcItem.top + 1; rect.bottom = dis->rcItem.bottom - 1; - TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n", + TRACE("drawing item %d text, rect=(%ld,%ld)-(%ld,%ld)\n", dis->itemID, rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED, &rect, str, len, 0); @@ -1617,10 +1617,10 @@ TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n", wp->x, wp->y, wp->cx, wp->cy, wp->flags); - TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, width, cb_wrect.bottom-cb_wrect.top); @@ -1702,7 +1702,7 @@ hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%d,%d)-(%d,%d)\n", + TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); @@ -1907,7 +1907,7 @@ hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%d,%d)-(%d,%d)\n", + TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); diff -aur orig/dlls/comctl32/listview.c after/dlls/comctl32/listview.c --- orig/dlls/comctl32/listview.c 2002-12-23 22:59:36.000000000 -0800 +++ after/dlls/comctl32/listview.c 2002-12-24 05:11:18.000000000 -0800 @@ -6462,7 +6462,7 @@ infoPtr->iconSpacing.cx = cx; infoPtr->iconSpacing.cy = cy; - TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n", + TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n", LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); diff -aur orig/dlls/comctl32/pager.c after/dlls/comctl32/pager.c --- orig/dlls/comctl32/pager.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/pager.c 2002-12-24 05:11:18.000000000 -0800 @@ -897,7 +897,7 @@ DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam); - TRACE("orig rect=(%d,%d)-(%d,%d)\n", + TRACE("orig rect=(%ld,%ld)-(%ld,%ld)\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); if (PAGER_IsHorizontal(hwnd)) @@ -912,7 +912,7 @@ /* Reset buttons and hide any grey ones */ scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left); - TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n", + TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n", infoPtr->nPos, scrollRange, infoPtr->nHeight, rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom, @@ -926,7 +926,7 @@ ltrc.right = ltrc.left + infoPtr->nButtonSize; rbrc = wnrc; rbrc.left = rbrc.right - infoPtr->nButtonSize; - TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n", + TRACE("horz lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n", ltrc.left, ltrc.top, ltrc.right, ltrc.bottom, rbrc.left, rbrc.top, rbrc.right, rbrc.bottom); if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState) @@ -961,7 +961,7 @@ /* Reset buttons and hide any grey ones */ scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top); - TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n", + TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n", infoPtr->nPos, scrollRange, infoPtr->nHeight, rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom, @@ -986,7 +986,7 @@ ltrc.right = ltrc.left + infoPtr->nButtonSize; rbrc = wnrc; rbrc.left = rbrc.right - infoPtr->nButtonSize; - TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n", + TRACE("vert lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n", ltrc.left, ltrc.top, ltrc.right, ltrc.bottom, rbrc.left, rbrc.top, rbrc.right, rbrc.bottom); if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState) @@ -1003,7 +1003,7 @@ lpRect->bottom = infoPtr->nHeight; } - TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", + TRACE("[%p] client rect set to %dx%d at (%ld,%ld) BtnState[%d,%d]\n", hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top, lpRect->left, lpRect->top, infoPtr->TLbtnState, infoPtr->BRbtnState); @@ -1232,7 +1232,7 @@ /* If in one of the buttons the capture and draw buttons */ if (btnrect) { - TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n", + TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n", hwnd, btnrect->left, btnrect->top, btnrect->right, btnrect->bottom, (infoPtr->bCapture) ? "TRUE" : "FALSE", diff -aur orig/dlls/comctl32/propsheet.c after/dlls/comctl32/propsheet.c --- orig/dlls/comctl32/propsheet.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/propsheet.c 2002-12-24 05:11:18.000000000 -0800 @@ -745,7 +745,7 @@ rc.right -= rc.left; rc.bottom -= rc.top; - TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting tab %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndTabCtrl, rc.right, rc.bottom); SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -761,7 +761,7 @@ /* * Resize the property sheet. */ - TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -830,7 +830,7 @@ /* * Resize the property sheet. */ - TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -1422,7 +1422,7 @@ pageHeight = rc.bottom - rc.top; padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo); - TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d, padx=%d, pady=%d\n", + TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d, padx=%d, pady=%d\n", (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom, pageWidth, pageHeight, padding.x, padding.y); SetWindowPos(hwndPage, HWND_TOP, @@ -1438,7 +1438,7 @@ PROPSHEET_GetPageRect(psInfo, hwndParent, &rc); pageWidth = rc.right - rc.left; pageHeight = rc.bottom - rc.top; - TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n", + TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d\n", (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom, pageWidth, pageHeight); SetWindowPos(hwndPage, HWND_TOP, diff -aur orig/dlls/comctl32/rebar.c after/dlls/comctl32/rebar.c --- orig/dlls/comctl32/rebar.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/rebar.c 2002-12-24 05:11:18.000000000 -0800 @@ -466,11 +466,11 @@ i, (pB->lpText) ? debugstr_w(pB->lpText) : "(null)"); TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n", i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy); - TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n", + TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%ld,%ld)-(%ld,%ld), Grip=(%ld,%ld)-(%ld,%ld)\n", i, pB->fStatus, pB->fDraw, pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom, pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom); - TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n", + TRACE("band # %u: Img=(%ld,%ld)-(%ld,%ld), Txt=(%ld,%ld)-(%ld,%ld), Child=(%ld,%ld)-(%ld,%ld)\n", i, pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom, pB->rcCapText.left, pB->rcCapText.top, pB->rcCapText.right, pB->rcCapText.bottom, @@ -679,7 +679,7 @@ (lpBand->rcoldBand.right !=lpBand->rcBand.right) || (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) { lpBand->fDraw |= NTF_INVALIDATE; - TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n", + TRACE("band %d row=%d: changed to (%ld,%ld)-(%ld,%ld) from (%ld,%ld)-(%ld,%ld)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, @@ -687,7 +687,7 @@ lpBand->rcoldBand.right, lpBand->rcoldBand.bottom); } else - TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n", + TRACE("band %d row=%d: unchanged (%ld,%ld)-(%ld,%ld)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -763,7 +763,7 @@ lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", + TRACE("Phase 1 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -833,7 +833,7 @@ lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", + TRACE("Phase 2 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -961,14 +961,14 @@ ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", + TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0), @@ -1100,14 +1100,14 @@ ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", + TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0), @@ -1264,7 +1264,7 @@ REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE); if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) { TRACE("Child rect changed by NOTIFY for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom, rbcz.rcChild.left, rbcz.rcChild.top, @@ -1310,7 +1310,7 @@ ERR("DeferWindowPos returned NULL\n"); } else { - TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n", + TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n", lpBand->hwndChild, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1370,12 +1370,12 @@ if (!infoPtr->DoRedraw) infoPtr->fStatus |= BAND_NEEDS_REDRAW; GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("Client is (%d,%d)-(%d,%d)\n", + TRACE("Client is (%ld,%ld)-(%ld,%ld)\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); if (lpRect) { rcAdj = *lpRect; - TRACE("adjustment rect is (%d,%d)-(%d,%d)\n", + TRACE("adjustment rect is (%ld,%ld)-(%ld,%ld)\n", rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom); } else { @@ -1531,7 +1531,7 @@ lpBand->uMinHeight = lpBand->lcy; x = rightx; } - TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n", + TRACE("P1 band %u, row %d, (%ld,%ld)-(%ld,%ld)\n", i, row, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -1672,11 +1672,11 @@ current->rcBand.bottom = current->rcBand.top + new_rh; y += adj_rh; } - TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n", + TRACE("P2 moving band %d to own row at (%ld,%ld)-(%ld,%ld)\n", current_idx, current->rcBand.left, current->rcBand.top, current->rcBand.right, current->rcBand.bottom); - TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n", + TRACE("P2 prev band %d at (%ld,%ld)-(%ld,%ld)\n", prev_idx, prev->rcBand.left, prev->rcBand.top, prev->rcBand.right, prev->rcBand.bottom); @@ -1779,7 +1779,7 @@ lpBand->rcBand.right = lpBand->rcBand.left + j; else lpBand->rcBand.bottom = lpBand->rcBand.top + j; - TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n", + TRACE("P2b band %d, row %d changed to (%ld,%ld)-(%ld,%ld)\n", iband, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -2141,7 +2141,7 @@ rcRowSep.right = infoPtr->calcSize.cx; DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM); } - TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n", + TRACE ("drawing band separator bottom (%ld,%ld)-(%ld,%ld)\n", rcRowSep.left, rcRowSep.top, rcRowSep.right, rcRowSep.bottom); } @@ -2159,7 +2159,7 @@ rcSep.right += SEP_WIDTH_SIZE; DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT); } - TRACE("drawing band separator right (%d,%d)-(%d,%d)\n", + TRACE("drawing band separator right (%ld,%ld)-(%ld,%ld)\n", rcSep.left, rcSep.top, rcSep.right, rcSep.bottom); } @@ -2186,7 +2186,7 @@ old = SetBkColor (hdc, new); rect = lpBand->rcBand; - TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n", + TRACE("%s background color=0x%06lx, band (%ld,%ld)-(%ld,%ld), clip (%ld,%ld)-(%ld,%ld)\n", (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), GetBkColor(hdc), @@ -2340,7 +2340,7 @@ LEADJ(band, Leadjust); READJ(band, Readjust); - TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n", + TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%ld,%ld)-(%ld,%ld)\n", i, Leadjust, Readjust, movement, ret, band->rcBand.left, band->rcBand.top, band->rcBand.right, band->rcBand.bottom); @@ -2422,7 +2422,7 @@ infoPtr->ihitoffset); infoPtr->dragNow = *ptsmove; - TRACE("before: movement=%d (%d,%d), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", + TRACE("before: movement=%d (%ld,%ld), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", movement, ptsmove->x, ptsmove->y, imindBand, ihitBand, imaxdBand, LHeaderSum, RHeaderSum); REBAR_DumpBand (infoPtr); @@ -2864,7 +2864,7 @@ lpBand = &infoPtr->bands[iBand]; CopyRect (lprc, &lpBand->rcBand); - TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand, + TRACE("band %d, (%ld,%ld)-(%ld,%ld)\n", iBand, lprc->left, lprc->top, lprc->right, lprc->bottom); return TRUE; @@ -3208,7 +3208,7 @@ movement = lpBand->rcBand.right - lpBand->rcBand.left - lpBand->cxHeader; if (movement < 0) { - ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n", + ERR("something is wrong, band=(%ld,%ld)-(%ld,%ld), cxheader=%d\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, lpBand->cxHeader); @@ -3650,7 +3650,7 @@ if (TRACE_ON(rebar)) { GetWindowRect(infoPtr->hwndSelf, &wnrc1); GetClientRect(infoPtr->hwndSelf, &clrc1); - TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", + TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -3827,7 +3827,7 @@ InflateRect((LPRECT)lParam, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); } - TRACE("new client=(%d,%d)-(%d,%d)\n", + TRACE("new client=(%ld,%ld)-(%ld,%ld)\n", ((LPRECT)lParam)->left, ((LPRECT)lParam)->top, ((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom); return 0; @@ -3852,7 +3852,7 @@ if (TRACE_ON(rebar)) { GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", + TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -3985,7 +3985,7 @@ return 0; GetWindowRect (infoPtr->hwndSelf, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%d,%d)-(%d,%d)\n", + TRACE("rect (%ld,%ld)-(%ld,%ld)\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); @@ -4026,7 +4026,7 @@ GetClientRect(infoPtr->hwndSelf, &rc); hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam; - TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", + TRACE("painting (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom, rc.left, rc.top, rc.right, rc.bottom); @@ -4151,14 +4151,14 @@ TRACE("still in CreateWindow\n"); infoPtr->fStatus &= ~CREATE_RUNNING; GetWindowRect ( infoPtr->hwndSelf, &rcWin); - TRACE("win rect (%d,%d)-(%d,%d)\n", + TRACE("win rect (%ld,%ld)-(%ld,%ld)\n", rcWin.left, rcWin.top, rcWin.right, rcWin.bottom); if ((lParam == 0) && (rcWin.right-rcWin.left == 0) && (rcWin.bottom-rcWin.top == 0)) { /* native control seems to do this */ GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient); - TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n", + TRACE("sizing rebar, message and client zero, parent client (%ld,%ld)\n", rcClient.right, rcClient.bottom); } else { @@ -4172,7 +4172,7 @@ /* do the actual WM_SIZE request */ GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", + TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4192,11 +4192,11 @@ /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */ /* native seems to use the current client rect for the size */ infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n", + TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n", rcClient.right, rcClient.bottom); } else { - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", + TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4210,7 +4210,7 @@ autosize.fChanged = 0; /* ??? */ autosize.rcActual = autosize.rcTarget; /* ??? */ REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE); - TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", + TRACE("RBN_AUTOSIZE client=(%ld,%ld), lp=%08lx\n", autosize.rcTarget.right, autosize.rcTarget.bottom, lParam); } @@ -4251,7 +4251,7 @@ ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED, wParam, lParam); GetWindowRect(infoPtr->hwndSelf, &rc); - TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n", + TRACE("hwnd %p new pos (%ld,%ld)-(%ld,%ld)\n", infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom); return ret; } diff -aur orig/dlls/comctl32/tab.c after/dlls/comctl32/tab.c --- orig/dlls/comctl32/tab.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/tab.c 2002-12-24 05:11:18.000000000 -0800 @@ -366,7 +366,7 @@ SELECTED_TAB_OFFSET, 0); } - TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n", + TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n", itemIndex, infoPtr->tabHeight, itemRect->left, itemRect->top, itemRect->right, itemRect->bottom); @@ -487,7 +487,7 @@ */ if (isVisible) { - TRACE("invalidate (%d,%d)-(%d,%d)\n", + TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", selectedRect.left,selectedRect.top, selectedRect.right,selectedRect.bottom); InvalidateRect(hwnd, &selectedRect, TRUE); @@ -1571,7 +1571,7 @@ else center_offset = ((drawRect->right - drawRect->left) - (cx + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2; - TRACE("for <%s>, c_o=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n", + TRACE("for <%s>, c_o=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%d\n", debugstr_w(infoPtr->items[iItem].pszText), center_offset, drawRect->left, drawRect->top, drawRect->right, drawRect->bottom, (rcText.right-rcText.left)); @@ -1855,7 +1855,7 @@ /* Adjust both rectangles to match native */ r.left += (1-ZZ); - TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -1899,7 +1899,7 @@ /* Adjust both rectangles to match native */ fillRect.right += (1-ZZ); - TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -1956,7 +1956,7 @@ r.bottom--; r.top -= ZZ; - TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<bottom> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2001,7 +2001,7 @@ /* Adjust both rectangles to match native */ fillRect.bottom += (1-ZZ); - TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<top> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2096,7 +2096,7 @@ } } - TRACE("border=(%d,%d)-(%d,%d)\n", + TRACE("border=(%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT); @@ -2348,7 +2348,7 @@ ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2; } - TRACE("invalidate (%d,%d)-(%d,%d)\n", + TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", clientRect.left,clientRect.top, clientRect.right,clientRect.bottom); InvalidateRect(hwnd, &clientRect, TRUE); @@ -2362,7 +2362,7 @@ hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam; - TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", + TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n", ps.fErase, ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom); diff -aur orig/dlls/comctl32/toolbar.c after/dlls/comctl32/toolbar.c --- orig/dlls/comctl32/toolbar.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/toolbar.c 2002-12-24 05:11:18.000000000 -0800 @@ -231,7 +231,7 @@ bP->fsState, bP->fsStyle, bP->dwData, bP->iString); TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); if (internal) - TRACE("button %d id %d, hot=%s, row=%d, rect=(%d,%d)-(%d,%d)\n", + TRACE("button %d id %d, hot=%s, row=%d, rect=(%ld,%ld)-(%ld,%ld)\n", btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, bP->rect.left, bP->rect.top, @@ -474,7 +474,7 @@ InflateRect (&myrect, -2, 0); - TRACE("rect=(%d,%d)-(%d,%d)\n", + TRACE("rect=(%ld,%ld)-(%ld,%ld)\n", myrect.left, myrect.top, myrect.right, myrect.bottom); newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? @@ -530,7 +530,7 @@ /* draw text */ if (lpText) { - TRACE("string rect=(%d,%d)-(%d,%d)\n", + TRACE("string rect=(%ld,%ld)-(%ld,%ld)\n", rcText->left, rcText->top, rcText->right, rcText->bottom); hOldFont = SelectObject (hdc, infoPtr->hFont); @@ -677,7 +677,7 @@ else rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2; - TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", + TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); TRACE ("iString: %x\n", btnPtr->iString); @@ -4578,7 +4578,7 @@ InvalidateRect(hwnd, 0, 1); GetWindowRect(hwnd, &rc); MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2); - TRACE("mapped to (%d,%d)-(%d,%d)\n", + TRACE("mapped to (%ld,%ld)-(%ld,%ld)\n", rc.left, rc.top, rc.right, rc.bottom); lpsize->cx = max(rc.right-rc.left, infoPtr->rcBound.right - infoPtr->rcBound.left); @@ -5397,7 +5397,7 @@ hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam; - TRACE("psrect=(%d,%d)-(%d,%d)\n", + TRACE("psrect=(%ld,%ld)-(%ld,%ld)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom); diff -aur orig/dlls/comctl32/treeview.c after/dlls/comctl32/treeview.c --- orig/dlls/comctl32/treeview.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/treeview.c 2002-12-24 05:11:18.000000000 -0800 @@ -2554,7 +2554,7 @@ InflateRect(&rcText, -2, -1); /* allow for the focus rect */ - TRACE("drawing text %s at (%d,%d)-(%d,%d)\n", + TRACE("drawing text %s at (%ld,%ld)-(%ld,%ld)\n", debugstr_a(wineItem->pszText), rcText.left, rcText.top, rcText.right, rcText.bottom); diff -aur orig/dlls/d3d8/device.c after/dlls/d3d8/device.c --- orig/dlls/d3d8/device.c 2002-12-23 22:59:37.000000000 -0800 +++ after/dlls/d3d8/device.c 2002-12-24 05:11:18.000000000 -0800 @@ -1048,7 +1048,7 @@ int copyperline = (r->right - r->left) * bytesPerPixel; int j; - TRACE("Copying rect %d (%d,%d),(%d,%d) -> (%ld,%ld)\n", i, r->left, r->top, + TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (%ld,%ld)\n", i, r->left, r->top, r->right, r->bottom, p->x, p->y); /* Find where to start */ diff -aur orig/dlls/oleaut32/olepicture.c after/dlls/oleaut32/olepicture.c --- orig/dlls/oleaut32/olepicture.c 2002-11-11 11:54:22.000000000 -0800 +++ after/dlls/oleaut32/olepicture.c 2002-12-24 05:11:18.000000000 -0800 @@ -498,7 +498,7 @@ TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n", This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); if(prcWBounds) - TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, + TRACE("prcWBounds (%ld,%ld) - (%ld,%ld)\n", prcWBounds->left, prcWBounds->top, prcWBounds->right, prcWBounds->bottom); /* diff -aur orig/dlls/user/text.c after/dlls/user/text.c --- orig/dlls/user/text.c 2002-11-22 13:22:15.000000000 -0800 +++ after/dlls/user/text.c 2002-12-24 05:11:18.000000000 -0800 @@ -846,7 +846,7 @@ int prefix_offset; ellipsis_data ellip; - TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count, + TRACE("%s, %d , [(%ld,%ld),(%ld,%ld)]\n", debugstr_wn (str, count), count, rect->left, rect->top, rect->right, rect->bottom); if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", diff -aur orig/dlls/wineps/escape.c after/dlls/wineps/escape.c --- orig/dlls/wineps/escape.c 2002-11-14 16:02:13.000000000 -0800 +++ after/dlls/wineps/escape.c 2002-12-24 05:11:18.000000000 -0800 @@ -182,7 +182,7 @@ WARN("cbInput != sizeof(RECT) (=%d) for SET_BOUNDS\n", cbInput); return 0; } - TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top, + TRACE("SET_BOUNDS (%ld,%ld) - (%ld,%ld)\n", r->left, r->top, r->right, r->bottom); return 0; } diff -aur orig/dlls/x11drv/winpos.c after/dlls/x11drv/winpos.c --- orig/dlls/x11drv/winpos.c 2002-12-21 21:52:19.000000000 -0800 +++ after/dlls/x11drv/winpos.c 2002-12-24 05:11:18.000000000 -0800 @@ -1589,7 +1589,7 @@ GetWindowRect( hwnd, &rect ); if (rect.left == winpos.x && rect.top == winpos.y) winpos.flags |= SWP_NOMOVE; else - TRACE( "%p moving from (%d,%d) to (%d,%d)\n", + TRACE( "%p moving from (%ld,%ld) to (%d,%d)\n", hwnd, rect.left, rect.top, winpos.x, winpos.y ); if ((rect.right - rect.left == winpos.cx && rect.bottom - rect.top == winpos.cy) || diff -aur orig/windows/nonclient.c after/windows/nonclient.c --- orig/windows/nonclient.c 2002-12-21 21:52:39.000000000 -0800 +++ after/windows/nonclient.c 2002-12-24 05:11:18.000000000 -0800 @@ -424,7 +424,7 @@ WS_EX_STATICEDGE | WS_EX_TOOLWINDOW); if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME; - TRACE("(%d,%d)-(%d,%d) %08lx %d %08lx\n", + TRACE("(%ld,%ld)-(%ld,%ld) %08lx %d %08lx\n", rect->left, rect->top, rect->right, rect->bottom, style, menu, exStyle ); diff -aur orig/windows/spy.c after/windows/spy.c --- orig/windows/spy.c 2002-12-21 21:52:39.000000000 -0800 +++ after/windows/spy.c 2002-12-24 05:11:18.000000000 -0800 @@ -2106,7 +2106,7 @@ { LPRECT rc = (LPRECT) sp_e->lParam; if (rc) { - TRACE("lParam rect (%d,%d)-(%d,%d)\n", + TRACE("lParam rect (%ld,%ld)-(%ld,%ld)\n", rc->left, rc->top, rc->right, rc->bottom); } break; @@ -2149,7 +2149,7 @@ lpdis->CtlType, lpdis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData); @@ -2187,7 +2187,7 @@ case WM_NCCALCSIZE: { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%d,%d)-(%d,%d)\n", + TRACE("Rect (%ld,%ld)-(%ld,%ld)\n", rc->left, rc->top, rc->right, rc->bottom); } break; diff -aur orig/windows/win.c after/windows/win.c --- orig/windows/win.c 2002-12-21 21:52:40.000000000 -0800 +++ after/windows/win.c 2002-12-24 05:11:18.000000000 -0800 @@ -576,7 +576,7 @@ win->rectWindow = *rectWindow; win->rectClient = *rectClient; - TRACE( "win %p window (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", hwnd, + TRACE( "win %p window (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", hwnd, rectWindow->left, rectWindow->top, rectWindow->right, rectWindow->bottom, rectClient->left, rectClient->top, rectClient->right, rectClient->bottom ); } diff -aur orig/windows/winpos.c after/windows/winpos.c --- orig/windows/winpos.c 2002-12-21 21:52:40.000000000 -0800 +++ after/windows/winpos.c 2002-12-24 05:11:18.000000000 -0800 @@ -158,7 +158,7 @@ if (ret) { MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), 0, (POINT *)rect, 2 ); - TRACE( "hwnd %p (%d,%d)-(%d,%d)\n", + TRACE( "hwnd %p (%ld,%ld)-(%ld,%ld)\n", hwnd, rect->left, rect->top, rect->right, rect->bottom); } return ret;

1 0