October 2007 - Wine-commits

Alexandre Julliard : winex11: Use ExtEscape to flush the GL drawable to the physdev.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 771d61a8865b56c088d5c6cb00367d262e9e790d URL: http://source.winehq.org/git/wine.git/?a=commit;h=771d61a8865b56c088d5c6cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:33:35 2007 +0200 winex11: Use ExtEscape to flush the GL drawable to the physdev. Based on a patch by Chris Robinson. --- dlls/winex11.drv/init.c | 3 +++ dlls/winex11.drv/opengl.c | 17 +++++++++++++---- dlls/winex11.drv/x11drv.h | 4 +++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 634a95a..8d360c0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -436,6 +436,9 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID return TRUE; } return FALSE; + case X11DRV_FLUSH_GL_DRAWABLE: + flush_gl_drawable(physDev); + return TRUE; } } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8224f68..c49a804 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1967,7 +1967,7 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) wine_tsx11_unlock(); } -static inline void update_drawable(X11DRV_PDEVICE *physDev) +void flush_gl_drawable(X11DRV_PDEVICE *physDev) { int w, h; @@ -1983,9 +1983,11 @@ static inline void update_drawable(X11DRV_PDEVICE *physDev) /* The GL drawable may be lagged behind if we don't flush first, so * flush the display make sure we copy up-to-date data */ + wine_tsx11_lock(); XFlush(gdi_display); XCopyArea(gdi_display, src, physDev->drawable, physDev->gc, 0, 0, w, h, physDev->dc_rect.left, physDev->dc_rect.top); + wine_tsx11_unlock(); } } @@ -1993,23 +1995,25 @@ static inline void update_drawable(X11DRV_PDEVICE *physDev) static void WINAPI X11DRV_wglFinish(void) { Wine_GLContext *ctx = NtCurrentTeb()->glContext; + enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; wine_tsx11_lock(); sync_context(ctx); pglFinish(); - update_drawable(ctx->physDev); wine_tsx11_unlock(); + ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } static void WINAPI X11DRV_wglFlush(void) { Wine_GLContext *ctx = NtCurrentTeb()->glContext; + enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; wine_tsx11_lock(); sync_context(ctx); pglFlush(); - update_drawable(ctx->physDev); wine_tsx11_unlock(); + ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } /** @@ -3292,7 +3296,8 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) } else pglXSwapBuffers(gdi_display, drawable); - update_drawable(physDev); + + flush_gl_drawable(physDev); wine_tsx11_unlock(); /* FPS support */ @@ -3375,6 +3380,10 @@ void mark_drawable_dirty(Drawable old, Drawable new) { } +void flush_gl_drawable(X11DRV_PDEVICE *physDev) +{ +} + Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) { return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 05f8d1c..2ff4905 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -477,7 +477,8 @@ enum x11drv_escape_codes X11DRV_GET_DCE, /* get the DCE pointer */ X11DRV_SET_DCE, /* set the DCE pointer */ X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ - X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */ + X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ + X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ }; struct x11drv_escape_set_drawable @@ -676,6 +677,7 @@ extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ); extern void mark_drawable_dirty( Drawable old, Drawable new ); extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap parent ); +extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern void alloc_window_dce( struct x11drv_win_data *data ); extern void free_window_dce( struct x11drv_win_data *data );

1 0

Alexandre Julliard : winex11: Don' t store a physdev pointer in the GL context.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 6cd7d068236c046a21c26241b7e635067dea908e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd7d068236c046a21c26241b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:38:51 2007 +0200 winex11: Don't store a physdev pointer in the GL context. --- dlls/winex11.drv/opengl.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c49a804..1a737dc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -109,8 +109,7 @@ typedef struct wine_glcontext { WineGLPixelFormat *fmt; GLXContext ctx; BOOL do_escape; - X11DRV_PDEVICE *physDev; - X11DRV_PDEVICE *pReadDev; + HDC read_hdc; Drawable drawables[2]; BOOL refresh_drawables; struct wine_glcontext *next; @@ -1498,7 +1497,6 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) ret = alloc_context(); wine_tsx11_unlock(); ret->hdc = hdc; - ret->physDev = physDev; ret->fmt = fmt; /*ret->vis = vis;*/ @@ -1553,12 +1551,10 @@ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) { HDC ret = 0; Wine_GLContext *ctx = NtCurrentTeb()->glContext; - X11DRV_PDEVICE *physDev = ctx ? ctx->pReadDev : NULL; - if(physDev) - ret = physDev->hdc; + if (ctx) ret = ctx->read_hdc; - TRACE(" returning %p (GL drawable %lu)\n", ret, physDev ? physDev->drawable : 0); + TRACE(" returning %p (GL drawable %lu)\n", ret, ctx ? ctx->drawables[1] : 0); return ret; } @@ -1650,8 +1646,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if(ret) { ctx->hdc = hdc; - ctx->physDev = physDev; - ctx->pReadDev = physDev; + ctx->read_hdc = hdc; ctx->drawables[0] = drawable; ctx->drawables[1] = drawable; ctx->refresh_drawables = FALSE; @@ -1702,8 +1697,7 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } ctx->hdc = pDrawDev->hdc; - ctx->physDev = pDrawDev; - ctx->pReadDev = pReadDev; + ctx->read_hdc = pReadDev->hdc; ctx->drawables[0] = d_draw; ctx->drawables[1] = d_read; ctx->refresh_drawables = FALSE;

1 0

Chris Robinson : winex11: Create GLXPixmap for bitmaps in SetPixelFormat.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: fa6598a260e5f710fbcf4ff2a52d707d5271e65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6598a260e5f710fbcf4ff2a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Oct 3 09:20:30 2007 -0700 winex11: Create GLXPixmap for bitmaps in SetPixelFormat. --- dlls/winex11.drv/opengl.c | 59 ++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1a737dc..226dfb9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -984,6 +984,26 @@ Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) } +static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev) +{ + GLXPixmap ret; + XVisualInfo *vis; + XVisualInfo template; + int num; + + wine_tsx11_lock(); + + /* Retrieve the visualid from our main visual which is the only visual we can use */ + template.visualid = XVisualIDFromVisual(visual); + vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); + + ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); + XFree(vis); + wine_tsx11_unlock(); + TRACE("return %lx\n", ret); + return ret; +} + /** * X11DRV_ChoosePixelFormat * @@ -1440,6 +1460,21 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, physDev->gl_drawable = X11DRV_get_gl_drawable(hwnd); } + else if(physDev->bitmap) { + if(!(value&GLX_PIXMAP_BIT)) { + WARN("Pixel format %d is not compatible for bitmap rendering\n", iPixelFormat); + return FALSE; + } + + physDev->bitmap->glxpixmap = create_bitmap_glxpixmap(physDev); + if(!physDev->bitmap->glxpixmap) { + WARN("Couldn't create glxpixmap for pixel format %d\n", iPixelFormat); + return FALSE; + } + } + else { + FIXME("called on a non-window, non-bitmap object?"); + } physDev->current_pf = iPixelFormat; @@ -3202,26 +3237,6 @@ static void X11DRV_WineGL_LoadExtensions(void) } -static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev) -{ - GLXPixmap ret; - XVisualInfo *vis; - XVisualInfo template; - int num; - - wine_tsx11_lock(); - - /* Retrieve the visualid from our main visual which is the only visual we can use */ - template.visualid = XVisualIDFromVisual(visual); - vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); - - ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); - XFree(vis); - wine_tsx11_unlock(); - TRACE("return %lx\n", ret); - return ret; -} - Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) { Drawable ret; @@ -3231,11 +3246,7 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) ret = physDev->drawable; /* PBuffer */ else - { - if(!physDev->bitmap->glxpixmap) - physDev->bitmap->glxpixmap = create_bitmap_glxpixmap(physDev); ret = physDev->bitmap->glxpixmap; - } } else if(physDev->gl_drawable) ret = physDev->gl_drawable;

1 0

Chris Robinson : winex11: Use the specified format for GL Bitmaps.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: d298b68f500ff88392d635f694a63e9a6886655f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d298b68f500ff88392d635f69… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Oct 3 09:29:28 2007 -0700 winex11: Use the specified format for GL Bitmaps. --- dlls/winex11.drv/opengl.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 226dfb9..588b3b6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -984,21 +984,19 @@ Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) } -static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev) +static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev, WineGLPixelFormat *fmt) { - GLXPixmap ret; + GLXPixmap ret = 0; XVisualInfo *vis; - XVisualInfo template; - int num; wine_tsx11_lock(); - /* Retrieve the visualid from our main visual which is the only visual we can use */ - template.visualid = XVisualIDFromVisual(visual); - vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); - - ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); - XFree(vis); + vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); + if(vis) { + if(vis->depth == physDev->bitmap->pixmap_depth) + ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); + XFree(vis); + } wine_tsx11_unlock(); TRACE("return %lx\n", ret); return ret; @@ -1466,7 +1464,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, return FALSE; } - physDev->bitmap->glxpixmap = create_bitmap_glxpixmap(physDev); + physDev->bitmap->glxpixmap = create_bitmap_glxpixmap(physDev, fmt); if(!physDev->bitmap->glxpixmap) { WARN("Couldn't create glxpixmap for pixel format %d\n", iPixelFormat); return FALSE;

1 0

Chris Robinson : winex11: Don' t choose double buffered modes with gdi support.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 0cca1ea876ce0451c4653ab895f19bd8597dab1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cca1ea876ce0451c4653ab89… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Oct 3 10:52:53 2007 -0700 winex11: Don't choose double buffered modes with gdi support. --- dlls/winex11.drv/opengl.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 588b3b6..c45fa68 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -607,6 +607,8 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; int pixelattrib = 0; + int supportgdi = -1; + int doublebuf = -1; /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ @@ -653,6 +655,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop); TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); + doublebuf = pop; break; case WGL_PIXEL_TYPE_ARB: @@ -673,6 +676,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); + supportgdi = pop; break; case WGL_DRAW_TO_BITMAP_ARB: @@ -772,6 +776,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ++cur; } + if(supportgdi > 0) { + if(doublebuf > 0) { + WARN("Attempting double-buffered gdi format\n"); + return -1; + } + if(doublebuf < 0) + PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, False); + } + /* Apply the OR'd drawable type bitmask now EVEN when WGL_DRAW_TO* is unset. * It is needed in all cases because GLX_DRAWABLE_TYPE default to GLX_WINDOW_BIT. */ PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib);

1 0

Louis Lenders : wine.inf: Add 2 keys for *.chm files.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: afb8f6257bef48b735abdfeb684a8635abcf3343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb8f6257bef48b735abdfeb6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 7 09:33:33 2007 +0100 wine.inf: Add 2 keys for *.chm files. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 2676f16..c311cd9 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -87,6 +87,7 @@ Services="System\CurrentControlSet\Services" [Classes] HKCR,.avi,"Content Type",2,"video/avi" +HKCR,.chm,,2,"chm.file" HKCR,.dll,"Content Type",2,"application/x-msdownload" HKCR,.exe,,2,"exefile" HKCR,.exe,"Content Type",2,"application/x-msdownload" @@ -108,6 +109,7 @@ HKCR,.wri,,2,"wrifile" HKCR,.wav,"Content Type",2,"audio/wav" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" +HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]"

1 0

Robert Shearman : mshtml: Set the SETUP_IS_CHROME_WRAPPER to FALSE as the embedded Gecko is always used to display content and not chrome .
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 836cdb88ce51c646352650200bc0016354d8e585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836cdb88ce51c646352650200… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Oct 10 13:15:21 2007 +0200 mshtml: Set the SETUP_IS_CHROME_WRAPPER to FALSE as the embedded Gecko is always used to display content and not chrome. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 23b2193..a2a1d47 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1537,7 +1537,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserSetup, (void**)&wbsetup); if(NS_SUCCEEDED(nsres)) { - nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, TRUE); + nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, FALSE); nsIWebBrowserSetup_Release(wbsetup); if(NS_FAILED(nsres)) ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08x\n", nsres);

1 0

Alexandre Julliard : msvcrt: Fix demangling of function pointers by maintaining the left/ right distinction for type references.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 49864b084d298221a79b9945424f3c4ec1acb3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=49864b084d298221a79b99454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 19:52:16 2007 +0200 msvcrt: Fix demangling of function pointers by maintaining the left/right distinction for type references. --- dlls/msvcrt/tests/cpp.c | 6 +++++- dlls/msvcrt/undname.c | 46 +++++++++++++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 5ffc27f..fea9885 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -979,6 +979,8 @@ static void test_demangle(void) {"?$aaa(a)Vbbb@ccc@@Vddd(a)2@", "aaa<class ccc::bbb,class ccc::ddd>"}, { "??0?$Foo(a)P6GHPAX0@Z@@QAE(a)PAD@Z", "public: __thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)"}, { "??0?$Foo(a)P6GHPAX0@Z@@QAE(a)PAD@Z", "__thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)", 0x880}, +{ "?Qux(a)Bar@@0PAP6AHPAV1(a)AAH1PAH@ZA", "private: static int (__cdecl** Bar::Qux)(class Bar *,int &,int &,int *)" }, +{ "?Qux(a)Bar@@0PAP6AHPAV1(a)AAH1PAH@ZA", "Bar::Qux", 0x1800}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; @@ -987,7 +989,9 @@ static void test_demangle(void) { name = p__unDName(0, test[i].in, 0, pmalloc, pfree, test[i].flags); ok(name != NULL && !strcmp_space(test[i].out, name), - "Got name \"%s\" for %d\n", name, i); + "Got name \"%s\" for %d\n", name, i ); + ok(name != NULL && !strcmp_space(test[i].out, name), + "Expected \"%s\"\n", test[i].out ); pfree(name); } } diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index c48e9ab..2816bfb 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -180,7 +180,7 @@ static void str_array_init(struct array* a) * str_array_push * Adding a new string to an array */ -static void str_array_push(struct parsed_symbol* sym, const char* ptr, size_t len, +static void str_array_push(struct parsed_symbol* sym, const char* ptr, int len, struct array* a) { assert(ptr); @@ -366,10 +366,10 @@ static BOOL get_modifier(char ch, const char** ret) return TRUE; } -static const char* get_modified_type(struct parsed_symbol* sym, char modif) +static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, + struct array *pmt_ref, char modif) { const char* modifier; - const char* ret = NULL; const char* str_modif; switch (modif) @@ -381,7 +381,7 @@ static const char* get_modified_type(struct parsed_symbol* sym, char modif) case 'R': str_modif = " * volatile"; break; case 'S': str_modif = " * const volatile"; break; case '?': str_modif = ""; break; - default: return NULL; + default: return FALSE; } if (get_modifier(*sym->current++, &modifier)) @@ -390,14 +390,21 @@ static const char* get_modified_type(struct parsed_symbol* sym, char modif) struct datatype_t sub_ct; /* Recurse to get the referred-to type */ - if (!demangle_datatype(sym, &sub_ct, NULL, FALSE)) - return NULL; - ret = str_printf(sym, "%s%s%s%s%s", - sub_ct.left, sub_ct.left && modifier ? " " : NULL, - modifier, sub_ct.right, str_modif); + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + return FALSE; + if (modifier) + ct->left = str_printf(sym, "%s %s%s", sub_ct.left, modifier, str_modif ); + else + { + /* don't insert a space between duplicate '*' */ + if (str_modif[0] && str_modif[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*') + str_modif++; + ct->left = str_printf(sym, "%s%s", sub_ct.left, str_modif ); + } + ct->right = sub_ct.right; sym->stack.num = mark; } - return ret; + return TRUE; } /****************************************************************** @@ -707,16 +714,16 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, break; case '?': /* not all the time is seems */ - if (!(ct->left = get_modified_type(sym, '?'))) goto done; + if (!get_modified_type(ct, sym, pmt_ref, '?')) goto done; break; case 'A': /* reference */ case 'B': /* volatile reference */ - if (!(ct->left = get_modified_type(sym, dt))) goto done; + if (!get_modified_type(ct, sym, pmt_ref, dt)) goto done; break; case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!(ct->left = get_modified_type(sym, in_args ? dt : 'P'))) goto done; + if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P')) goto done; break; case 'P': /* Pointer */ if (isdigit(*sym->current)) @@ -746,7 +753,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } else goto done; } - else if (!(ct->left = get_modified_type(sym, 'P'))) goto done; + else if (!get_modified_type(ct, sym, pmt_ref, 'P')) goto done; break; case 'W': if (*sym->current == '4') @@ -765,7 +772,9 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ - ct->left = str_array_get_ref(pmt_ref, dt - '0'); + /* left and right are pushed as two separate strings */ + ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); + ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done; add_pmt = FALSE; break; @@ -804,8 +813,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, break; } if (add_pmt && pmt_ref && in_args) - str_array_push(sym, str_printf(sym, "%s%s", ct->left, ct->right), - -1, pmt_ref); + { + /* left and right are pushed as two separate strings */ + str_array_push(sym, ct->left ? ct->left : "", -1, pmt_ref); + str_array_push(sym, ct->right ? ct->right : "", -1, pmt_ref); + } done: return ct->left != NULL;

1 0

Alexandre Julliard : server: Use the file_pos_t type for file sizes and offsets in the protocol structures .
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 235532ce28d3965472a88ca49ccc40d875fca0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=235532ce28d3965472a88ca49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 14:06:25 2007 +0200 server: Use the file_pos_t type for file sizes and offsets in the protocol structures. --- dlls/ntdll/file.c | 14 ++++-------- dlls/ntdll/sync.c | 3 +- dlls/ntdll/virtual.c | 20 ++++++++---------- include/wine/server_protocol.h | 25 ++++++++--------------- server/file.c | 8 +----- server/file.h | 2 - server/mapping.c | 18 ++++++---------- server/protocol.def | 23 +++++++-------------- server/trace.c | 41 ++++++++++++++++++++++++--------------- tools/make_requests | 1 + 10 files changed, 67 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=235532ce28d3965472a88…

1 0

Ken Thomases : ntdll: Work around a bug in Mac OS X's getdirentries().
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 54a471732fd8f99175118a7064caeeda5869dd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a471732fd8f99175118a706… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 5 10:48:55 2007 -0500 ntdll: Work around a bug in Mac OS X's getdirentries(). --- dlls/ntdll/directory.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index d4ccf5f..894d336 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1174,6 +1174,26 @@ done: #elif defined HAVE_GETDIRENTRIES /*********************************************************************** + * wine_getdirentries + * + * Wrapper for the BSD getdirentries system call to fix a bug in the + * Mac OS X version. For some file systems (at least Apple Filing + * Protocol a.k.a. AFP), getdirentries resets the file position to 0 + * when it's about to return 0 (no more entries). So, a subsequent + * getdirentries call starts over at the beginning again, causing an + * infinite loop. + */ +static inline int wine_getdirentries(int fd, char *buf, int nbytes, long *basep) +{ + int res = getdirentries(fd, buf, nbytes, basep); +#ifdef __APPLE__ + if (res == 0) + lseek(fd, *basep, SEEK_SET); +#endif + return res; +} + +/*********************************************************************** * read_directory_getdirentries * * Read a directory using the BSD getdirentries system call; helper for NtQueryDirectoryFile. @@ -1203,7 +1223,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff io->u.Status = STATUS_SUCCESS; /* FIXME: should make sure size is larger than filesystem block size */ - res = getdirentries( fd, data, size, &restart_pos ); + res = wine_getdirentries( fd, data, size, &restart_pos ); if (res == -1) { io->u.Status = FILE_GetNtStatus(); @@ -1306,7 +1326,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff restart_last_info = last_info; restart_info_pos = io->Information; restart: - res = getdirentries( fd, data, size, &restart_pos ); + res = wine_getdirentries( fd, data, size, &restart_pos ); de = (struct dirent *)data; }

1 0