May 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Ignore the specified owner if it' s a zero-size window.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 8a5f578223a40397e15bc2b781784d90ebc9b16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5f578223a40397e15bc2b78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:44:56 2008 +0200 winex11: Ignore the specified owner if it's a zero-size window. Go back to not mapping zero-size windows. --- dlls/winex11.drv/window.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ad56a70..81aa989 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -127,6 +127,9 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec */ static BOOL is_window_rect_mapped( const RECT *rect ) { + /* don't map if rect is empty */ + if (IsRectEmpty( rect )) return FALSE; + /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -153,6 +156,19 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl /*********************************************************************** + * get_window_owner + */ +static HWND get_window_owner( HWND hwnd ) +{ + RECT rect; + HWND owner = GetWindow( hwnd, GW_OWNER ); + /* ignore the zero-size owners used by Delphi apps */ + if (owner && GetWindowRect( owner, &rect ) && IsRectEmpty( &rect )) owner = 0; + return owner; +} + + +/*********************************************************************** * get_mwm_decorations */ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, @@ -869,7 +885,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) { style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - owner = GetWindow( data->hwnd, GW_OWNER ); + owner = get_window_owner( data->hwnd ); } /* transient for hint */ @@ -964,7 +980,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + if (!(ex_style & WS_EX_APPWINDOW) && get_window_owner( data->hwnd )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */

1 0

Alexandre Julliard : winex11: Only unmap a window when explicitly hidden, not just when WS_VISIBLE is cleared.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 6b9517a70a18553f588b584826cd9e9b9accfb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9517a70a18553f588b58482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:45:17 2008 +0200 winex11: Only unmap a window when explicitly hidden, not just when WS_VISIBLE is cleared. --- dlls/winex11.drv/window.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 81aa989..f4eb82e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2011,9 +2011,12 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (event_type != ConfigureNotify && event_type != PropertyNotify) event_type = 0; /* ignore other events */ - if (data->mapped && (!(new_style & WS_VISIBLE) || - (!event_type && !is_window_rect_mapped( rectWindow )))) - unmap_window( display, data ); + if (data->mapped) + { + if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || + (!event_type && !is_window_rect_mapped( rectWindow ))) + unmap_window( display, data ); + } /* don't change position if we are about to minimize or maximize a managed window */ if (!event_type &&

1 0

Alexandre Julliard : make_makefiles: Avoid duplicate rules for static import libs on PE builds.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 6cb1ac0575c10beeccbdc697fb7a85e0698d3f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb1ac0575c10beeccbdc697f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:31:35 2008 +0200 make_makefiles: Avoid duplicate rules for static import libs on PE builds. --- dlls/Makefile.in | 4 ++-- tools/make_makefiles | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d3bb2b7..755c75a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -766,8 +766,8 @@ dciman32/libdciman32.$(IMPLIBEXT): dciman32/dciman32.spec $(WINEBUILD) ddraw/libddraw.$(IMPLIBEXT): ddraw/ddraw.spec $(WINEBUILD) @cd ddraw && $(MAKE) libddraw.$(IMPLIBEXT) -dinput/libdinput.$(IMPLIBEXT): dinput/dinput.spec $(WINEBUILD) - @cd dinput && $(MAKE) libdinput.$(IMPLIBEXT) +dinput/libdinput.def: dinput/dinput.spec $(WINEBUILD) + @cd dinput && $(MAKE) libdinput.def dinput/libdinput.$(STATIC_IMPLIBEXT): dummy @cd dinput && $(MAKE) libdinput.$(STATIC_IMPLIBEXT) diff --git a/tools/make_makefiles b/tools/make_makefiles index f727288..2a5f692 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -539,11 +539,18 @@ sub update_dlls(@) my $lib = $importlibs{$mod}; my $spec = $mod; $spec =~ s/\.dll$//; - $text .= sprintf "%s/lib%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec; - $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(IMPLIBEXT)\n\n", $dir, $lib; - next unless $static_implibs{$mod}; - $text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec; - $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib; + if (defined($static_implibs{$mod})) + { + $text .= sprintf "%s/lib%s.def: %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec; + $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.def\n\n", $dir, $lib; + $text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec; + $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib; + } + else + { + $text .= sprintf "%s/lib%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec; + $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(IMPLIBEXT)\n\n", $dir, $lib; + } } foreach my $mod (sort @lib_symlinks) {

1 0

Alexandre Julliard : msftedit: Export a few more IIDs.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 0567e72c29ae360b73d15485ba7c4c3ddbad4bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0567e72c29ae360b73d15485b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 14:44:08 2008 +0200 msftedit: Export a few more IIDs. --- dlls/msftedit/msftedit.spec | 6 +++--- dlls/msftedit/msftedit_main.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index 6f0e9e2..0dd878d 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -1,9 +1,9 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback 4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices -5 stub IID_ITextServices -6 stub IID_ITextHost -7 stub IID_ITextHost2 +5 extern IID_ITextServices +6 extern IID_ITextHost +7 extern IID_ITextHost2 8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index 7fcb6ee..58a8b60 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -26,12 +26,17 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" - -#include "winreg.h" +#include "richedit.h" +#include "imm.h" #include "shlwapi.h" +#include "oleidl.h" +#include "initguid.h" +#include "textserv.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msftedit);

1 0

Alexandre Julliard : opengl32: Dynamically load libGLU.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 06640efa613fc4e707614eaca6facc7fb26c5f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06640efa613fc4e707614eaca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 14:44:49 2008 +0200 opengl32: Dynamically load libGLU. Based on a patch by Roderick Colenbrander. --- configure | 3 +- configure.ac | 3 +- dlls/glu32/Makefile.in | 2 +- dlls/opengl32/wgl.c | 84 ++++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 73 insertions(+), 19 deletions(-) diff --git a/configure b/configure index b732efd..0ee0b8c 100755 --- a/configure +++ b/configure @@ -11173,8 +11173,7 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBGLU "$ac_cv_lib_soname_GLU" _ACEOF - OPENGL_LIBS="$OPENGL_LIBS -lGLU" - GLU32FILES='$(GLU32FILES)' + GLU32FILES='$(GLU32FILES)' fi fi diff --git a/configure.ac b/configure.ac index 946fa94..33562e3 100644 --- a/configure.ac +++ b/configure.ac @@ -746,8 +746,7 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) if test "$ac_cv_header_GL_glu_h" = "yes" then - WINE_CHECK_SONAME(GLU,gluLookAt,[OPENGL_LIBS="$OPENGL_LIBS -lGLU" - GLU32FILES='$(GLU32FILES)'],, + WINE_CHECK_SONAME(GLU,gluLookAt,[GLU32FILES='$(GLU32FILES)'],, [$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"], diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 98d15e8..2fdbd99 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -6,7 +6,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 IMPORTS = kernel32 EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ +EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ C_SRCS = \ glu.c diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 2e3d118..6fbdeb4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -56,6 +56,19 @@ typedef struct wine_wgl_s { /** global wgl object */ static wine_wgl_t wine_wgl; +#ifdef SONAME_LIBGLU +#define MAKE_FUNCPTR(f) static typeof(f) * p##f; +MAKE_FUNCPTR(gluNewTess) +MAKE_FUNCPTR(gluDeleteTess) +MAKE_FUNCPTR(gluTessBeginContour) +MAKE_FUNCPTR(gluTessBeginPolygon) +MAKE_FUNCPTR(gluTessCallback) +MAKE_FUNCPTR(gluTessEndContour) +MAKE_FUNCPTR(gluTessEndPolygon) +MAKE_FUNCPTR(gluTessVertex) +#undef MAKE_FUNCPTR +#endif /* SONAME_LIBGLU */ + /* x11drv GDI escapes */ #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes @@ -76,6 +89,7 @@ void (*wine_tsx11_lock_ptr)(void) = NULL; void (*wine_tsx11_unlock_ptr)(void) = NULL; static HMODULE opengl32_handle; +static void* libglu_handle = NULL; static char* internal_gl_disabled_extensions = NULL; static char* internal_gl_extensions = NULL; @@ -315,6 +329,42 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, #ifdef SONAME_LIBGLU +static void *load_libglu(void) +{ + static int already_loaded; + void *handle; + + if (already_loaded) return libglu_handle; + already_loaded = 1; + + TRACE("Trying to load GLU library: %s\n", SONAME_LIBGLU); + handle = wine_dlopen(SONAME_LIBGLU, RTLD_NOW, NULL, 0); + if (!handle) + { + WARN("Failed to load %s\n", SONAME_LIBGLU); + return NULL; + } + +#define LOAD_FUNCPTR(f) if((p##f = (void*)wine_dlsym(handle, #f, NULL, 0)) == NULL) goto sym_not_found; +LOAD_FUNCPTR(gluNewTess) +LOAD_FUNCPTR(gluDeleteTess) +LOAD_FUNCPTR(gluTessBeginContour) +LOAD_FUNCPTR(gluTessBeginPolygon) +LOAD_FUNCPTR(gluTessCallback) +LOAD_FUNCPTR(gluTessEndContour) +LOAD_FUNCPTR(gluTessEndPolygon) +LOAD_FUNCPTR(gluTessVertex) +#undef LOAD_FUNCPTR + libglu_handle = handle; + return handle; + +sym_not_found: + WARN("Unable to load function ptrs from libGLU\n"); + /* Close the library as we won't use it */ + wine_dlclose(handle, NULL, 0); + return NULL; +} + static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; @@ -365,14 +415,19 @@ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, TRACE("(%p, %d, %d, %d, %f, %f, %d, %p, %s)\n", hdc, first, count, listBase, deviation, extrusion, format, lpgmf, unicode ? "W" : "A"); + if (!load_libglu()) + { + ERR("libGLU is required for this function but isn't loaded\n"); + return FALSE; + } ENTER_GL(); - tess = gluNewTess(); + tess = pgluNewTess(); if(tess) { - gluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); - gluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); - gluTessCallback(tess, GLU_TESS_END, tess_callback_end); + pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); + pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); + pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); } LEAVE_GL(); @@ -430,17 +485,17 @@ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, ENTER_GL(); glNewList(listBase++, GL_COMPILE); - gluTessBeginPolygon(tess, NULL); + pgluTessBeginPolygon(tess, NULL); pph = (TTPOLYGONHEADER*)buf; while((BYTE*)pph < buf + needed) { TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); - gluTessBeginContour(tess); + pgluTessBeginContour(tess); fixed_to_double(pph->pfxStart, em_size, vertices); - gluTessVertex(tess, vertices, vertices); + pgluTessVertex(tess, vertices, vertices); vertices += 3; ppc = (TTPOLYCURVE*)((char*)pph + sizeof(*pph)); @@ -454,7 +509,7 @@ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, { TRACE("\t\tline to %d, %d\n", ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); - gluTessVertex(tess, vertices, vertices); + pgluTessVertex(tess, vertices, vertices); vertices += 3; } break; @@ -467,28 +522,28 @@ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, ppc->apfx[i * 2].x.value, ppc->apfx[i * 3].y.value, ppc->apfx[i * 2 + 1].x.value, ppc->apfx[i * 3 + 1].y.value); fixed_to_double(ppc->apfx[i * 2], em_size, vertices); - gluTessVertex(tess, vertices, vertices); + pgluTessVertex(tess, vertices, vertices); vertices += 3; fixed_to_double(ppc->apfx[i * 2 + 1], em_size, vertices); - gluTessVertex(tess, vertices, vertices); + pgluTessVertex(tess, vertices, vertices); vertices += 3; } break; default: ERR("\t\tcurve type = %d\n", ppc->wType); - gluTessEndContour(tess); + pgluTessEndContour(tess); goto error_in_list; } ppc = (TTPOLYCURVE*)((char*)ppc + sizeof(*ppc) + (ppc->cpfx - 1) * sizeof(POINTFX)); } - gluTessEndContour(tess); + pgluTessEndContour(tess); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); } error_in_list: - gluTessEndPolygon(tess); + pgluTessEndPolygon(tess); glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); glEndList(); LEAVE_GL(); @@ -498,7 +553,7 @@ error_in_list: error: DeleteObject(SelectObject(hdc, old_font)); - gluDeleteTess(tess); + pgluDeleteTess(tess); return TRUE; } @@ -676,6 +731,7 @@ static BOOL process_attach(void) static void process_detach(void) { + if (libglu_handle) wine_dlclose(libglu_handle, NULL, 0); HeapFree(GetProcessHeap(), 0, internal_gl_extensions); HeapFree(GetProcessHeap(), 0, internal_gl_disabled_extensions); }

1 0

Alexandre Julliard : winex11: Don' t free the pixmap in X11DRV_DIB_CreateDIBFromPixmap since we don't own it.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 617e5162a2119129da666513b29f9271ad0ec883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=617e5162a2119129da666513b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:43:33 2008 +0200 winex11: Don't free the pixmap in X11DRV_DIB_CreateDIBFromPixmap since we don't own it. --- dlls/winex11.drv/dib.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index f23592c..87bd9d1 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4874,7 +4874,8 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) { HDC hdcMem; X_PHYSBITMAP *physBitmap; - HBITMAP hBmp = 0, old; + Pixmap orig_pixmap; + HBITMAP hBmp = 0; HGLOBAL hPackedDIB = 0; Window root; int x,y; /* Unused */ @@ -4899,17 +4900,14 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) /* force bitmap to be owned by a screen DC */ hdcMem = CreateCompatibleDC( hdc ); - old = SelectObject( hdcMem, hBmp ); + SelectObject( hdcMem, SelectObject( hdcMem, hBmp )); + DeleteDC( hdcMem ); physBitmap = X11DRV_get_phys_bitmap( hBmp ); - wine_tsx11_lock(); - if (physBitmap->pixmap) XFreePixmap( gdi_display, physBitmap->pixmap ); + /* swap the new pixmap in */ + orig_pixmap = physBitmap->pixmap; physBitmap->pixmap = pixmap; - wine_tsx11_unlock(); - - SelectObject( hdcMem, old ); - DeleteDC( hdcMem ); /* * Create a packed DIB from the Pixmap wrapper bitmap created above. @@ -4918,9 +4916,8 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) */ hPackedDIB = X11DRV_DIB_CreateDIBFromBitmap(hdc, hBmp); - /* We can now get rid of the HBITMAP wrapper we created earlier. - * Note: Simply calling DeleteObject will free the embedded Pixmap as well. - */ + /* we can now get rid of the HBITMAP and its original pixmap */ + physBitmap->pixmap = orig_pixmap; DeleteObject(hBmp); TRACE("\tReturning packed DIB %p\n", hPackedDIB); @@ -4956,6 +4953,6 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) /* Delete the DDB we created earlier now that we have stolen its pixmap */ DeleteObject(hBmp); - TRACE("Returning Pixmap %ld\n", pixmap); + TRACE("Returning Pixmap %lx\n", pixmap); return pixmap; }

1 0

Rico Schüller : msftedit: Add DllGetVersion.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 3fa635f9dc33df9857d05d58c375cd2bc2e57878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa635f9dc33df9857d05d58c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 30 19:55:25 2008 +0200 msftedit: Add DllGetVersion. --- dlls/msftedit/Makefile.in | 5 +++ dlls/msftedit/msftedit.spec | 2 +- dlls/msftedit/msftedit_main.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/msftedit/version.rc | 26 +++++++++++++++ 4 files changed, 101 insertions(+), 1 deletions(-) diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in index 829b834..d00682a 100644 --- a/dlls/msftedit/Makefile.in +++ b/dlls/msftedit/Makefile.in @@ -5,6 +5,11 @@ VPATH = @srcdir@ MODULE = msftedit.dll IMPORTS = uuid riched20 kernel32 +C_SRCS = \ + msftedit_main.c + +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index be36be5..6f0e9e2 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -8,7 +8,7 @@ 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc 11 stub SetCustomTextOutHandlerEx -12 stub DllGetVersion +12 stdcall -private DllGetVersion(ptr) 13 stub RichEditWndProc 14 stub RichListBoxWndProc 15 stub RichComboBoxWndProc diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c new file mode 100644 index 0000000..7fcb6ee --- /dev/null +++ b/dlls/msftedit/msftedit_main.c @@ -0,0 +1,69 @@ +/* + * msftedit main file + * + * Copyright (C) 2008 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/debug.h" + +#include "winreg.h" +#include "shlwapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msftedit); + +/*********************************************************************** + * DllMain. + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/*********************************************************************** + * DllGetVersion (msftedit.@) + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +{ + if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); + + /* this is what WINXP SP2 reports */ + info->dwMajorVersion = 41; + info->dwMinorVersion = 15; + info->dwBuildNumber = 1507; + info->dwPlatformID = 1; + return NOERROR; +} diff --git a/dlls/msftedit/version.rc b/dlls/msftedit/version.rc new file mode 100644 index 0000000..ce5ef0e --- /dev/null +++ b/dlls/msftedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Rich Text Edit Control" +#define WINE_FILENAME_STR "msftedit.dll" +#define WINE_FILEVERSION 5,41,15,1509 +#define WINE_FILEVERSION_STR "5,41,15,1509" +#define WINE_PRODUCTVERSION 5,41,15,1509 +#define WINE_PRODUCTVERSION_STR "5,41,15,1509" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : configure: Improve the check for the GLU library.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: ad79873527df8be77e0df812af51795320eca8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad79873527df8be77e0df812a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 13:29:02 2008 +0200 configure: Improve the check for the GLU library. --- configure | 61 +++++++++++++++++++++++++++++++++++++++----------- configure.ac | 17 ++++++++------ dlls/opengl32/wgl.c | 6 ++-- include/config.h.in | 3 ++ 4 files changed, 63 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 2f1f1ca..b732efd 100755 --- a/configure +++ b/configure @@ -1388,6 +1388,7 @@ Optional Packages: --without-esd do not use the EsounD sound support --without-fontconfig do not use fontconfig --without-gphoto do not use gphoto (Digital Camera support) + --without-glu do not use the GLU library --without-hal do not use HAL (dynamic device support) --without-jack do not use the Jack sound support --without-jpeg do not use JPEG @@ -1972,6 +1973,12 @@ if test "${with_gphoto+set}" = set; then fi +# Check whether --with-glu was given. +if test "${with_glu+set}" = set; then + withval=$with_glu; if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi +fi + + # Check whether --with-hal was given. if test "${with_hal+set}" = set; then withval=$with_hal; @@ -11089,15 +11096,16 @@ _ACEOF fi - - { echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5 -echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; } -if test "${ac_cv_lib_GLU_gluLookAt+set}" = set; then + if test "$ac_cv_header_GL_glu_h" = "yes" + then + { echo "$as_me:$LINENO: checking for -lGLU" >&5 +echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_GLU+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS + ac_check_soname_save_LIBS=$LIBS LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11137,24 +11145,49 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_GLU_gluLookAt=yes + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_GLU=`otool -L conftest$ac_exeext | grep "libGLU\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGLU\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_GLU=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGLU\\.$LIBEXT" | sed -e "s/^.*$libGLU\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_GLU_gluLookAt=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS=$ac_check_soname_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluLookAt" >&5 -echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6; } -if test $ac_cv_lib_GLU_gluLookAt = yes; then - OPENGL_LIBS="$OPENGL_LIBS -lGLU" - GLU32FILES='$(GLU32FILES)' +if test "x$ac_cv_lib_soname_GLU" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GLU" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_GLU" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBGLU "$ac_cv_lib_soname_GLU" +_ACEOF + + OPENGL_LIBS="$OPENGL_LIBS -lGLU" + GLU32FILES='$(GLU32FILES)' +fi + + fi + if test "x$ac_cv_lib_soname_GLU" = "x"; then + case "x$with_glu" in + x) wine_notices="$wine_notices|libGLU development files not found, GLU won't be supported." ;; + xno) ;; + *) { { echo "$as_me:$LINENO: error: libGLU development files not found, GLU won't be supported. +This is an error since --with-glu was requested." >&5 +echo "$as_me: error: libGLU development files not found, GLU won't be supported. +This is an error since --with-glu was requested." >&2;} + { (exit 1); exit 1; }; } ;; +esac fi else diff --git a/configure.ac b/configure.ac index e38f5e7..946fa94 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,8 @@ AC_ARG_WITH(esd, AS_HELP_STRING([--without-esd],[do not use the EsounD sou AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]), [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) +AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), + [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]), [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi]) @@ -742,13 +744,14 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c fi], $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) - - dnl Check for GLU32 library. - AC_CHECK_LIB(GLU,gluLookAt, - [OPENGL_LIBS="$OPENGL_LIBS -lGLU" - GLU32FILES='$(GLU32FILES)'] - ,, - $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) + if test "$ac_cv_header_GL_glu_h" = "yes" + then + WINE_CHECK_SONAME(GLU,gluLookAt,[OPENGL_LIBS="$OPENGL_LIBS -lGLU" + GLU32FILES='$(GLU32FILES)'],, + [$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS]) + fi + WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"], + [libGLU development files not found, GLU won't be supported.]) else opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries." fi diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6944f37..2e3d118 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -313,7 +313,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, return TRUE; } -#ifdef HAVE_GL_GLU_H +#ifdef SONAME_LIBGLU static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { @@ -503,7 +503,7 @@ error_in_list: } -#else /* HAVE_GL_GLU_H */ +#else /* SONAME_LIBGLU */ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, DWORD first, @@ -519,7 +519,7 @@ static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, return FALSE; } -#endif /* HAVE_GL_GLU_H */ +#endif /* SONAME_LIBGLU */ /*********************************************************************** * wglUseFontOutlinesA (OPENGL32.@) diff --git a/include/config.h.in b/include/config.h.in index e384f96..d956790 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1035,6 +1035,9 @@ /* Define to the soname of the libGL library. */ #undef SONAME_LIBGL +/* Define to the soname of the libGLU library. */ +#undef SONAME_LIBGLU + /* Define to the soname of the libhal library. */ #undef SONAME_LIBHAL

1 0

Dan Hipschman : gdi32: Add font faces to families in a specific order.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: c3537c4086b52201f1158a68d6b4aab59b76af87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3537c4086b52201f1158a68d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 30 11:51:00 2008 -0700 gdi32: Add font faces to families in a specific order. --- dlls/gdi32/freetype.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 82150d3..414a85e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1116,6 +1116,44 @@ static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, return err; } +static inline int TestStyles(DWORD flags, DWORD styles) +{ + return (flags & styles) == styles; +} + +static int StyleOrdering(Face *face) +{ + if (TestStyles(face->ntmFlags, NTM_BOLD | NTM_ITALIC)) + return 3; + if (TestStyles(face->ntmFlags, NTM_ITALIC)) + return 2; + if (TestStyles(face->ntmFlags, NTM_BOLD)) + return 1; + if (TestStyles(face->ntmFlags, NTM_REGULAR)) + return 0; + + WARN("Don't know how to order font %s %s with flags 0x%08x\n", + debugstr_w(face->family->FamilyName), + debugstr_w(face->StyleName), + face->ntmFlags); + + return 9999; +} + +/* Add a style of face to a font family using an ordering of the list such + that regular fonts come before bold and italic, and single styles come + before compound styles. */ +static void AddFaceToFamily(Face *face, Family *family) +{ + struct list *entry; + + LIST_FOR_EACH( entry, &family->faces ) + { + Face *ent = LIST_ENTRY(entry, Face, entry); + if (StyleOrdering(face) < StyleOrdering(ent)) break; + } + list_add_before( entry, &face->entry ); +} #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 @@ -1363,7 +1401,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; - list_add_tail(&family->faces, &face->entry); face->StyleName = StyleW; if (file) { @@ -1438,6 +1475,9 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if (!(face->fs.fsCsb[0] & FS_SYMBOL)) have_installed_roman_font = TRUE; + + AddFaceToFamily(face, family); + } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); num_faces = ft_face->num_faces;

1 0

Paul Vriens : kernel32/tests: Fix tests on win9x.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: d3c4e3d4a7b135a1d71bdb513076f4266d7017dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c4e3d4a7b135a1d71bdb513… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 1 10:56:09 2008 +0200 kernel32/tests: Fix tests on win9x. --- dlls/kernel32/tests/toolhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index aafc982..48b6a6b 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -63,7 +63,7 @@ static int init(void) int argc; char** argv; HANDLE ev1, ev2, ev3, hThread; - DWORD w; + DWORD w, tid; argc = winetest_get_mainargs( &argv ); strcpy(selfname, argv[0]); @@ -78,7 +78,7 @@ static int init(void) ev3 = CreateEvent(NULL, FALSE, FALSE, NULL); if (ev3 == NULL) ExitProcess(WAIT_ABANDONED); - hThread = CreateThread(NULL, 0, sub_thread, ev3, 0, NULL); + hThread = CreateThread(NULL, 0, sub_thread, ev3, 0, &tid); if (hThread == NULL) ExitProcess(WAIT_ABANDONED); if (!LoadLibraryA("shell32.dll")) ExitProcess(WAIT_ABANDONED);

1 0