October 2007 - Wine-commits

Dan Hipschman : widl: Remove printf format strings that aren' t really format strings.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 4fb7a0e40ed9c8ef47faa1d4ce4f26a545614dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb7a0e40ed9c8ef47faa1d4c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 17 18:05:37 2007 -0700 widl: Remove printf format strings that aren't really format strings. --- tools/widl/typegen.c | 4 ++-- tools/widl/widl.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bf24d3f..53ec78c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2501,7 +2501,7 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, fprintf(file, " *)_StubMsg.Buffer = *"); else fprintf(file, " *)_StubMsg.Buffer = "); - fprintf(file, varname); + fprintf(file, "%s", varname); fprintf(file, ";\n"); } else if (phase == PHASE_UNMARSHAL) @@ -2510,7 +2510,7 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, print_file(file, indent, ""); else print_file(file, indent, "*"); - fprintf(file, varname); + fprintf(file, "%s", varname); if (pass == PASS_IN && is_ptr(type)) fprintf(file, " = ("); else diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 53c9e29..37f1a5e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -422,13 +422,13 @@ int main(int argc,char *argv[]) idfile_name = xstrdup(optarg); break; case 'V': - printf(version_string); + printf("%s", version_string); return 0; case 'W': pedantic = 1; break; default: - fprintf(stderr, usage); + fprintf(stderr, "%s", usage); return 1; } } @@ -458,7 +458,7 @@ int main(int argc,char *argv[]) input_name = xstrdup(argv[optind]); } else { - fprintf(stderr, usage); + fprintf(stderr, "%s", usage); return 1; }

1 0

Alexandre Julliard : configure: Check for fontconfig in the X directory if not found in the standard places .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 5c076730777acf27f2e861a9171cd936c1f1d50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c076730777acf27f2e861a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 17:04:01 2007 +0200 configure: Check for fontconfig in the X directory if not found in the standard places. --- configure | 238 +++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 13 +++ dlls/gdi32/Makefile.in | 2 +- 3 files changed, 251 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c076730777acf27f2e86…

1 0

Alexandre Julliard : server: Avoid refreshing areas of a window that have already been copied by the X server .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 952c82c2712704ade0ea73d8d8b31951b7ef0fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=952c82c2712704ade0ea73d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 17:28:04 2007 +0200 server: Avoid refreshing areas of a window that have already been copied by the X server. --- dlls/winex11.drv/winpos.c | 2 ++ server/window.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 02e6151..da08bd4 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -264,6 +264,8 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, old_client_rect = data->client_rect; + if (!data->whole_window) swp_flags |= SWP_NOCOPYBITS; /* we can't rely on X11 to move the bits */ + if (!(win = WIN_GetPtr( hwnd ))) return FALSE; if (win == WND_OTHER_PROCESS) { diff --git a/server/window.c b/server/window.c index 7c246dc..15e4bc0 100644 --- a/server/window.c +++ b/server/window.c @@ -1333,6 +1333,7 @@ static void set_window_pos( struct window *win, struct window *previous, const rectangle_t old_window_rect = win->window_rect; const rectangle_t old_visible_rect = win->visible_rect; const rectangle_t old_client_rect = win->client_rect; + int client_changed, frame_changed; int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); if (win->parent && !is_visible( win->parent )) visible = 0; @@ -1405,17 +1406,39 @@ static void set_window_pos( struct window *win, struct window *previous, /* expose the whole non-client area if it changed in any way */ - if ((swp_flags & SWP_FRAMECHANGED) || - memcmp( window_rect, &old_window_rect, sizeof(old_window_rect) ) || - memcmp( visible_rect, &old_visible_rect, sizeof(old_visible_rect) ) || - memcmp( client_rect, &old_client_rect, sizeof(old_client_rect) )) + if (swp_flags & SWP_NOCOPYBITS) + { + frame_changed = ((swp_flags & SWP_FRAMECHANGED) || + memcmp( window_rect, &old_window_rect, sizeof(old_window_rect) ) || + memcmp( visible_rect, &old_visible_rect, sizeof(old_visible_rect) )); + client_changed = memcmp( client_rect, &old_client_rect, sizeof(old_client_rect) ); + } + else + { + /* assume the bits have been moved to follow the window rect */ + int x_offset = window_rect->left - old_window_rect.left; + int y_offset = window_rect->top - old_window_rect.top; + frame_changed = ((swp_flags & SWP_FRAMECHANGED) || + window_rect->right - old_window_rect.right != x_offset || + window_rect->bottom - old_window_rect.bottom != y_offset || + visible_rect->left - old_visible_rect.left != x_offset || + visible_rect->right - old_visible_rect.right != x_offset || + visible_rect->top - old_visible_rect.top != y_offset || + visible_rect->bottom - old_visible_rect.bottom != y_offset); + client_changed = (client_rect->left - old_client_rect.left != x_offset || + client_rect->right - old_client_rect.right != x_offset || + client_rect->top - old_client_rect.top != y_offset || + client_rect->bottom - old_client_rect.bottom != y_offset); + } + + if (frame_changed || client_changed) { struct region *tmp = create_empty_region(); if (tmp) { /* subtract the valid portion of client rect from the total region */ - if (!memcmp( client_rect, &old_client_rect, sizeof(old_client_rect) )) + if (!client_changed) set_region_rect( tmp, client_rect ); else if (valid_rects) set_region_rect( tmp, &valid_rects[0] );

1 0

Alexandre Julliard : server: Don' t expose the parent window in areas that are now part of the child visible region .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: a771c53e27a89959d163c8f544467641ecc8a240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a771c53e27a89959d163c8f54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 17:43:06 2007 +0200 server: Don't expose the parent window in areas that are now part of the child visible region. --- server/window.c | 99 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 38 deletions(-) diff --git a/server/window.c b/server/window.c index 15e4bc0..ce5297c 100644 --- a/server/window.c +++ b/server/window.c @@ -1303,23 +1303,51 @@ static unsigned int get_window_update_flags( struct window *win, struct window * } -/* expose a region of a window on its parent */ -/* the region is in window coordinates */ -static void expose_window( struct window *win, struct region *region ) +/* expose the areas revealed by a vis region change on the window parent */ +/* returns the region exposed on the window itself (in client coordinates) */ +static struct region *expose_window( struct window *win, const rectangle_t *old_window_rect, + struct region *old_vis_rgn ) { struct window *parent = win; - int offset_x = win->window_rect.left - win->client_rect.left; - int offset_y = win->window_rect.top - win->client_rect.top; + struct region *new_vis_rgn, *exposed_rgn; - if (win->parent && !is_desktop_window(win->parent)) + if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; + + if ((exposed_rgn = create_empty_region())) { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - parent = win->parent; + if (subtract_region( exposed_rgn, new_vis_rgn, old_vis_rgn ) && !is_region_empty( exposed_rgn )) + { + /* make it relative to the new client area */ + offset_region( exposed_rgn, win->window_rect.left - win->client_rect.left, + win->window_rect.top - win->client_rect.top ); + } + else + { + free_region( exposed_rgn ); + exposed_rgn = NULL; + } } - offset_region( region, offset_x, offset_y ); - redraw_window( parent, region, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); - offset_region( region, -offset_x, -offset_y ); + + /* make it relative to the old window pos for subtracting */ + offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, + win->window_rect.top - old_window_rect->top ); + + if (subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) && !is_region_empty( new_vis_rgn )) + { + /* make it relative to new client rect again */ + int offset_x = old_window_rect->left - win->client_rect.left; + int offset_y = old_window_rect->top - win->client_rect.top; + if (win->parent && !is_desktop_window(win->parent)) + { + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + parent = win->parent; + } + offset_region( new_vis_rgn, offset_x, offset_y ); + redraw_window( parent, new_vis_rgn, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + } + free_region( new_vis_rgn ); + return exposed_rgn; } @@ -1329,7 +1357,7 @@ static void set_window_pos( struct window *win, struct window *previous, const rectangle_t *client_rect, const rectangle_t *visible_rect, const rectangle_t *valid_rects ) { - struct region *old_vis_rgn = NULL, *new_vis_rgn; + struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; const rectangle_t old_visible_rect = win->visible_rect; const rectangle_t old_client_rect = win->client_rect; @@ -1357,23 +1385,10 @@ static void set_window_pos( struct window *win, struct window *previous, /* if the window is not visible, everything is easy */ if (!visible) return; - if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) - { - free_region( old_vis_rgn ); - clear_error(); /* ignore error since the window info has been modified already */ - return; - } - /* expose anything revealed by the change */ if (!(swp_flags & SWP_NOREDRAW)) - { - offset_region( old_vis_rgn, old_window_rect.left - window_rect->left, - old_window_rect.top - window_rect->top ); - if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) - expose_window( win, new_vis_rgn ); - } - free_region( old_vis_rgn ); + exposed_rgn = expose_window( win, &old_window_rect, old_vis_rgn ); if (!(win->style & WS_VISIBLE)) { @@ -1443,19 +1458,28 @@ static void set_window_pos( struct window *win, struct window *previous, else if (valid_rects) set_region_rect( tmp, &valid_rects[0] ); - set_region_rect( new_vis_rgn, window_rect ); - if (subtract_region( tmp, new_vis_rgn, tmp )) + set_region_rect( old_vis_rgn, window_rect ); + if (!subtract_region( tmp, old_vis_rgn, tmp )) free_region( tmp ); + else { if (!is_desktop_window(win)) offset_region( tmp, -client_rect->left, -client_rect->top ); - redraw_window( win, tmp, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); + if (exposed_rgn) + { + union_region( exposed_rgn, exposed_rgn, tmp ); + free_region( tmp ); + } + else exposed_rgn = tmp; } - free_region( tmp ); } } + if (exposed_rgn) + redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); + done: - free_region( new_vis_rgn ); + free_region( old_vis_rgn ); + if (exposed_rgn) free_region( exposed_rgn ); clear_error(); /* we ignore out of memory errors once the new rects have been set */ } @@ -1463,7 +1487,7 @@ done: /* set the window region, updating the update region if necessary */ static void set_window_region( struct window *win, struct region *region, int redraw ) { - struct region *old_vis_rgn = NULL, *new_vis_rgn; + struct region *old_vis_rgn = NULL, *exposed_rgn; /* no need to redraw if window is not visible */ if (redraw && !is_visible( win )) redraw = 0; @@ -1473,12 +1497,11 @@ static void set_window_region( struct window *win, struct region *region, int re if (win->win_region) free_region( win->win_region ); win->win_region = region; - if (old_vis_rgn && (new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) + /* expose anything revealed by the change */ + if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn )))) { - /* expose anything revealed by the change */ - if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) - expose_window( win, new_vis_rgn ); - free_region( new_vis_rgn ); + redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); + free_region( exposed_rgn ); } if (old_vis_rgn) free_region( old_vis_rgn );

1 0

Jacek Caban : hlink.idl: Undef unicode GetObject macro.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: a41cab9b52893f472de6ce2e9199e5452e60fb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41cab9b52893f472de6ce2e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:16:01 2007 +0200 hlink.idl: Undef unicode GetObject macro. --- include/hlink.idl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 3e33891..7c5156e 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -277,6 +277,10 @@ interface IHlinkBrowseContext : IUnknown [in, unique] IMoniker *pimk, [out] DWORD *pdwRegister); +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef GetObject") +cpp_quote("#endif") + HRESULT GetObject( [in, unique] IMoniker *pimk, [in] BOOL fBindIfRootRegistered,

1 0

Jacek Caban : mshtml: Import dimm.idl and fix compilation.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 62894b488d0b03a922b80df358bfca202a977fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62894b488d0b03a922b80df35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:16:21 2007 +0200 mshtml: Import dimm.idl and fix compilation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/view.c | 1 - include/mshtml.idl | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a493109..14ae1be 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wingdi.h" #include "docobj.h" #include "mshtml.h" #include "mshtmhst.h" diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e5ef7a7..e24fa77 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wingdi.h" #include "commctrl.h" #include "ole2.h" #include "resource.h" diff --git a/include/mshtml.idl b/include/mshtml.idl index adc87ed..35bf10d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -21,7 +21,7 @@ #include <olectl.h> import "ocidl.idl"; -/* import "dimm.idl"; */ +import "dimm.idl"; cpp_quote("#include <olectl.h>")

1 0

Andrew Talbot : oleview: Fix a memory leak.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: c8cb3b5fbb8744d4aba910d03e2dcf31ed5ad30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cb3b5fbb8744d4aba910d03… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 17 21:15:53 2007 +0100 oleview: Fix a memory leak. --- programs/oleview/pane.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 54ac274..f274be8 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -151,7 +151,11 @@ BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst) pane = HeapAlloc(GetProcessHeap(), 0, sizeof(PANE)); *hWndCreated = CreateWindow(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)pane, hInst, NULL); - if(!hWndCreated) return FALSE; + if(!hWndCreated) + { + HeapFree(GetProcessHeap(), 0, pane); + return FALSE; + } pane->left = NULL; pane->right = NULL;

1 0

Michael Jung : rsaenh: Enlarge buffer in test_enum_container. Fixes two test failures on Vista.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: b3a3804be8987b6b7d1d6e8bc163ad9a6ed8176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a3804be8987b6b7d1d6e8bc… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Wed Oct 17 22:40:09 2007 +0200 rsaenh: Enlarge buffer in test_enum_container. Fixes two test failures on Vista. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 163aa5e..076467e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1546,7 +1546,7 @@ static void test_schannel_provider(void) static void test_enum_container(void) { - BYTE abContainerName[256]; + BYTE abContainerName[MAX_PATH + 2]; /* Larger than maximum name len */ DWORD dwBufferLen; BOOL result, fFound = FALSE;

1 0

Alexandre Julliard : winapi_stats: Make sure to return an error if winapi_extract failed.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: tools Branch: master Commit: d6488666432b437c6dffe8a88da1ce3d1d738d74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6488666432b437c6dffe8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 21:32:57 2007 +0200 winapi_stats: Make sure to return an error if winapi_extract failed. --- winapi_stats | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winapi_stats b/winapi_stats index 9f5e774..9de76e5 100755 --- a/winapi_stats +++ b/winapi_stats @@ -22,7 +22,7 @@ while (<STATS>) ${$stats{" Total"}}[4] += $forwards; } } -close STATS; +close STATS or die "winapi_extract failed"; my $bg = 0;

1 0

Detlef Riekenberg : spoolss: Add a stub for SplIsUpgrade.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: c91350b18cc5150d78fcaa76c5111c9e4970d6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91350b18cc5150d78fcaa76c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 16 23:30:49 2007 +0200 spoolss: Add a stub for SplIsUpgrade. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index b7fc0bd..2f893d5 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -122,7 +122,7 @@ @ stub SplDriverUnloadComplete @ stub SplGetSpoolFileInfo @ stdcall SplInitializeWinSpoolDrv(ptr) -@ stub SplIsUpgrade +@ stdcall SplIsUpgrade() @ stub SplProcessPnPEvent @ stub SplReadPrinter @ stub SplRegisterForDeviceEvents diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 52365c7..9a9ec48 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -209,3 +209,12 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) return TRUE; } + +/****************************************************************** + * SplIsUpgrade [SPOOLSS.@] + */ +BOOL WINAPI SplIsUpgrade(void) +{ + FIXME("() stub\n"); + return FALSE; +}

1 0