November 2010 - Wine-Commits

Andrew Eikum : hlink: Site data should only be set if the hlink has an HlinkSite.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: a8e39c66f798e9c056b5ff26e3bdcc9eba2b9230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e39c66f798e9c056b5ff26e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 1 12:06:08 2010 -0500 hlink: Site data should only be set if the hlink has an HlinkSite. --- dlls/hlink/link.c | 5 +++-- dlls/hlink/tests/hlink.c | 2 +- dlls/mshtml/tests/htmldoc.c | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 3e22c47..b0d99aa 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -211,10 +211,11 @@ static HRESULT WINAPI IHlink_fnGetHlinkSite( IHlink* iface, TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData); *ppihlSite = This->Site; - *pdwSiteData = This->SiteData; - if (This->Site) + if (This->Site) { IHlinkSite_AddRef(This->Site); + *pdwSiteData = This->SiteData; + } return S_OK; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 21422bc..3cb6db4 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1788,7 +1788,7 @@ static void test_HlinkClone(void) hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(fnd_site == NULL, "Expected NULL site\n"); - todo_wine ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data); + ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data); IHlink_Release(cloned); IHlink_Release(hl); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 641153b..80f137b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -708,7 +708,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(site == NULL, "site = %p\n, expected NULL\n", site); - todo_wine ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data); }

1 0

Paul Vriens : iccvid: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 249c6a22e9a0514cc9212c127c14eca83f9bda96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=249c6a22e9a0514cc9212c127… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 21:11:47 2010 +0100 iccvid: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_Sr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 02ed092..403f5a3 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ iccvid_Ro.rc \ iccvid_Ru.rc \ iccvid_Si.rc \ + iccvid_Sr.rc \ iccvid_Sv.rc \ iccvid_Tr.rc \ iccvid_Uk.rc diff --git a/dlls/iccvid/iccvid_Sr.rc b/dlls/iccvid/iccvid_Sr.rc new file mode 100644 index 0000000..577af59 --- /dev/null +++ b/dlls/iccvid/iccvid_Sr.rc @@ -0,0 +1,38 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Đorđe Vasiljević + * + * 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 "iccvid_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NAME "Cinepak видео кодек" + IDS_DESCRIPTION "Cinepak видео кодек" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NAME "Cinepak video kodek" + IDS_DESCRIPTION "Cinepak video kodek" +}

1 0

Paul Vriens : xcopy: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 046f96e05649319d10c3c40e307abb6e6ada49ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=046f96e05649319d10c3c40e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 20:53:39 2010 +0100 xcopy: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/xcopy/Makefile.in | 1 + programs/xcopy/Sr.rc | 141 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 764ded5..4183824 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc diff --git a/programs/xcopy/Sr.rc b/programs/xcopy/Sr.rc new file mode 100644 index 0000000..92f7ef3 --- /dev/null +++ b/programs/xcopy/Sr.rc @@ -0,0 +1,141 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Serbian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright 2010 Đorđe Vasiljević + * + * 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 "xcopy.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + STRING_INVPARMS, "Неисправан број параметара. Користите xcopy /? за помоћ\n" + STRING_INVPARM, "Неисправан параметар „%s“. Користите xcopy /? за помоћ\n" + STRING_PAUSE, "Притисните <enter> да започнете умножавање\n" + STRING_SIMCOPY, "%d датотека/е ће бити уможено\n" + STRING_COPY, "%d датотека/е је умножено\n" + STRING_QISDIR, "Да ли је „%s“ назив датотеке или фасцикла\n\ + на одредишту?\n\ + (Д - датотека, Ф - фасцикла)\n" + STRING_SRCPROMPT,"%s? (Да|Не)\n" + STRING_OVERWRITE,"Заменити %s? (Да|Не|Све)\n" + STRING_COPYFAIL, "Умножавање „%s“ у „%s“ није успело са r/c %d\n" + STRING_OPENFAIL, "Отварање „%s“ датотеке није успело\n" + STRING_READFAIL, "Читање „%s“ датотеке није успело\n" + STRING_YES_CHAR, "Д" + STRING_NO_CHAR, "Н" + STRING_ALL_CHAR, "С" + STRING_FILE_CHAR,"Д" + STRING_DIR_CHAR, "Ф" + + STRING_HELP, +"XCOPY — умножава изворне датотеке или гране фасцикли у одредиште\n\ +\n\ +Синтакса:\n\ +XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Где:\n\ +\n\ +[/I] Претпостави фасциклу када одредиште не постоји и када се умножавају две или\n\ +\tвише датотека\n\ +[/S] Умножи фасцикле и потфасцикле\n\ +[/E] Умножи фасцикле и потфасцикле заједно с празним\n\ +[/Q] Не приказуј називе током умножавања.\n\ +[/F] Прикажи цео извор и одредиште током умножавања\n\ +[/L] Опонашај радњу приказујући називе који ће бити умножени\n\ +[/W] Питај пре почињања умножавања\n\ +[/T] Прави празну структуру фасцикле, али не умножава датотеке\n\ +[/Y] Потисни упит при замењивању датотека\n\ +[/-Y] Омогући упит при замењивању датотека\n\ +[/P] Питај за сваку изворну датотеку пре умножавања\n\ +[/N] Умножи користећи кратке називе\n\ +[/U] Умножи само оне датотеке које постоје у одредишту\n\ +[/R] Замени све датотеке које се само читају\n\ +[/H] Укључи сакривене и системске датотеке у умножавање\n\ +[/C] Настави иако дође до грешке у умножавању\n\ +[/A] Умножи само архивиране датотеке\n\ +[/M] Умножи само архивиране датотеке и уклони\n\ +\tособине архиве\n\ +[/D | /D:m-d-y] Умножи нове или измењене датотеке након одређеног датума.\n\ +\t\tАко датум није унесен, умножи само ако је одредиште старије\n\ +\t\tод извора\n\n" + +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + STRING_INVPARMS, "Neispravan broj parametara. Koristite xcopy /? za pomoć\n" + STRING_INVPARM, "Neispravan parametar „%s“. Koristite xcopy /? za pomoć\n" + STRING_PAUSE, "Pritisnite <enter> da započnete umnožavanje\n" + STRING_SIMCOPY, "%d datoteka/e će biti umoženo\n" + STRING_COPY, "%d datoteka/e je umnoženo\n" + STRING_QISDIR, "Da li je „%s“ naziv datoteke ili fascikla\n\ + na odredištu?\n\ + (D - datoteka, F - fascikla)\n" + STRING_SRCPROMPT,"%s? (Da|Ne)\n" + STRING_OVERWRITE,"Zameniti %s? (Da|Ne|Sve)\n" + STRING_COPYFAIL, "Umnožavanje „%s“ u „%s“ nije uspelo sa r/c %d\n" + STRING_OPENFAIL, "Otvaranje „%s“ datoteke nije uspelo\n" + STRING_READFAIL, "Čitanje „%s“ datoteke nije uspelo\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "S" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "F" + + STRING_HELP, +"XCOPY — umnožava izvorne datoteke ili grane fascikli u odredište\n\ +\n\ +Sintaksa:\n\ +XCOPY izvor [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Gde:\n\ +\n\ +[/I] Pretpostavi fasciklu kada odredište ne postoji i kada se umnožavaju dve ili\n\ +\tviše datoteka\n\ +[/S] Umnoži fascikle i potfascikle\n\ +[/E] Umnoži fascikle i potfascikle zajedno s praznim\n\ +[/Q] Ne prikazuj nazive tokom umnožavanja.\n\ +[/F] Prikaži ceo izvor i odredište tokom umnožavanja\n\ +[/L] Oponašaj radnju prikazujući nazive koji će biti umnoženi\n\ +[/W] Pitaj pre počinjanja umnožavanja\n\ +[/T] Pravi praznu strukturu fascikle, ali ne umnožava datoteke\n\ +[/Y] Potisni upit pri zamenjivanju datoteka\n\ +[/-Y] Omogući upit pri zamenjivanju datoteka\n\ +[/P] Pitaj za svaku izvornu datoteku pre umnožavanja\n\ +[/N] Umnoži koristeći kratke nazive\n\ +[/U] Umnoži samo one datoteke koje postoje u odredištu\n\ +[/R] Zameni sve datoteke koje se samo čitaju\n\ +[/H] Uključi sakrivene i sistemske datoteke u umnožavanje\n\ +[/C] Nastavi iako dođe do greške u umnožavanju\n\ +[/A] Umnoži samo arhivirane datoteke\n\ +[/M] Umnoži samo arhivirane datoteke i ukloni\n\ +\tosobine arhive\n\ +[/D | /D:m-d-y] Umnoži nove ili izmenjene datoteke nakon određenog datuma.\n\ +\t\tAko datum nije unesen, umnoži samo ako je odredište starije\n\ +\t\tod izvora\n\n" + +}

1 0

Alexandre Julliard : winex11: Improve management of the lifetime of embedded windows.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 68f497bdccf395383dd0f8c56f7e75c95ba5c62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f497bdccf395383dd0f8c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 19:45:12 2010 +0100 winex11: Improve management of the lifetime of embedded windows. --- dlls/winex11.drv/event.c | 68 ++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/systray.c | 9 +++++ dlls/winex11.drv/window.c | 3 +- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + 5 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 9fbb002..89d3a93 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -72,11 +72,26 @@ extern BOOL ximInComposeMode; #define DndURL 128 /* KDE drag&drop */ +#define XEMBED_EMBEDDED_NOTIFY 0 +#define XEMBED_WINDOW_ACTIVATE 1 +#define XEMBED_WINDOW_DEACTIVATE 2 +#define XEMBED_REQUEST_FOCUS 3 +#define XEMBED_FOCUS_IN 4 +#define XEMBED_FOCUS_OUT 5 +#define XEMBED_FOCUS_NEXT 6 +#define XEMBED_FOCUS_PREV 7 +#define XEMBED_MODALITY_ON 10 +#define XEMBED_MODALITY_OFF 11 +#define XEMBED_REGISTER_ACCELERATOR 12 +#define XEMBED_UNREGISTER_ACCELERATOR 13 +#define XEMBED_ACTIVATE_ACCELERATOR 14 + /* Event handlers */ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_ReparentNotify( HWND hwnd, XEvent *event ); static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); @@ -111,7 +126,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* UnmapNotify */ { MapNotify, X11DRV_MapNotify }, /* MapRequest */ - /* ReparentNotify */ + { ReparentNotify, X11DRV_ReparentNotify }, { ConfigureNotify, X11DRV_ConfigureNotify }, /* ConfigureRequest */ /* GravityNotify */ @@ -127,7 +142,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 18; /* change this if you add handlers above */ +static int nb_event_handlers = 19; /* change this if you add handlers above */ /* return the name of an X event */ @@ -814,6 +829,30 @@ static BOOL is_net_wm_state_maximized( Display *display, struct x11drv_win_data /*********************************************************************** + * X11DRV_ReparentNotify + */ +static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) +{ + XReparentEvent *event = &xev->xreparent; + struct x11drv_win_data *data; + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->embedded) return; + if (event->parent == root_window) + { + TRACE( "%p/%lx reparented to root\n", hwnd, data->whole_window ); + data->embedder = 0; + SendMessageW( hwnd, WM_CLOSE, 0, 0 ); + } + else + { + TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); + data->embedder = event->parent; + } +} + + +/*********************************************************************** * X11DRV_ConfigureNotify */ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) @@ -1334,6 +1373,30 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) } } + +/********************************************************************** + * handle_xembed_protocol + */ +static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) +{ + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + + if (!data) return; + + switch (event->data.l[1]) + { + case XEMBED_EMBEDDED_NOTIFY: + TRACE( "win %p/%lx XEMBED_EMBEDDED_NOTIFY owner %lx\n", hwnd, event->window, event->data.l[3] ); + data->embedder = event->data.l[3]; + break; + default: + TRACE( "win %p/%lx XEMBED message %lu(%lu)\n", + hwnd, event->window, event->data.l[1], event->data.l[2] ); + break; + } +} + + /********************************************************************** * handle_dnd_protocol */ @@ -1366,6 +1429,7 @@ struct client_message_handler static const struct client_message_handler client_messages[] = { { XATOM_WM_PROTOCOLS, handle_wm_protocols }, + { XATOM__XEMBED, handle_xembed_protocol }, { XATOM_DndProtocol, handle_dnd_protocol }, { XATOM_XdndEnter, X11DRV_XDND_EnterEvent }, { XATOM_XdndPosition, X11DRV_XDND_PositionEvent }, diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index e500a33..9d15396 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -309,6 +309,15 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_TIMER: if (!IsWindow( icon->owner )) delete_icon( icon ); return 0; + + case WM_CLOSE: + if (icon->display == -1) + { + TRACE( "icon %u no longer embedded\n", icon->id ); + hide_icon( icon ); + add_to_standalone_tray( icon ); + } + return 0; } return DefWindowProcW( hwnd, msg, wparam, lparam ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dade30e..acf0b4d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1890,8 +1890,9 @@ void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) if (!(data = X11DRV_get_win_data( hwnd ))) return; - FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); + if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); destroy_whole_window( display, data, TRUE ); + if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 722ca85..4308823 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -660,6 +660,7 @@ enum x11drv_atoms XATOM__NET_WM_WINDOW_TYPE_NORMAL, XATOM__NET_WM_WINDOW_TYPE_UTILITY, XATOM__NET_WORKAREA, + XATOM__XEMBED, XATOM__XEMBED_INFO, XATOM_XdndAware, XATOM_XdndEnter, @@ -758,6 +759,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ + Window embedder; /* window id of embedder */ unsigned long configure_serial; /* serial number of last configure request */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8477082..fe4a88c 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -160,6 +160,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_WINDOW_TYPE_NORMAL", "_NET_WM_WINDOW_TYPE_UTILITY", "_NET_WORKAREA", + "_XEMBED", "_XEMBED_INFO", "XdndAware", "XdndEnter",

1 0

Alexandre Julliard : wineps: Remove unnecessary use of wownt32.h.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 645a65f46d45f24e9cc150d2fdfdd9564e7d73b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645a65f46d45f24e9cc150d2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 16:44:39 2010 +0100 wineps: Remove unnecessary use of wownt32.h. --- dlls/wineps.drv/driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index b5d1e90..7b30f3f 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -34,7 +34,6 @@ #include "winuser.h" #include "wine/wingdi16.h" -#include "wownt32.h" #include "prsht.h" #include "psdlg.h" @@ -375,7 +374,7 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput psh.dwSize = sizeof(psh); psh.pszCaption = SetupW; psh.nPages = 1; - psh.hwndParent = HWND_32(hwnd); + psh.hwndParent = hwnd; psh.u3.phpage = hpsp; pPropertySheet(&psh);

1 0

Huw Davies : ole32: Implement OnRun and OnStop.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: abf8da6727406d10148ea5b97f83bcf57412599a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf8da6727406d10148ea5b97… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 1 14:08:45 2010 +0000 ole32: Implement OnRun and OnStop. --- dlls/ole32/datacache.c | 98 ++++++++++++++++++++++++++++++++++++++++------ dlls/ole32/tests/ole2.c | 7 --- 2 files changed, 85 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a2e33a3..768dec7 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -109,6 +109,10 @@ typedef struct DataCacheEntry BOOL dirty; /* stream number (-1 if not set ) */ unsigned short stream_number; + /* sink id set when object is running */ + DWORD sink_id; + /* Advise sink flags */ + DWORD advise_flags; } DataCacheEntry; /**************************************************************************** @@ -156,6 +160,8 @@ struct DataCache DWORD last_cache_id; /* dirty flag */ BOOL dirty; + /* running object set by OnRun */ + IDataObject *running_object; }; typedef struct DataCache DataCache; @@ -209,13 +215,16 @@ static const char * debugstr_formatetc(const FORMATETC *formatetc) formatetc->lindex, formatetc->tymed); } -static void DataCacheEntry_Destroy(DataCacheEntry *cache_entry) +static void DataCacheEntry_Destroy(DataCache *cache, DataCacheEntry *cache_entry) { list_remove(&cache_entry->entry); if (cache_entry->storage) IStorage_Release(cache_entry->storage); HeapFree(GetProcessHeap(), 0, cache_entry->fmtetc.ptd); ReleaseStgMedium(&cache_entry->stgmedium); + if(cache_entry->sink_id) + IDataObject_DUnadvise(cache->running_object, cache_entry->sink_id); + HeapFree(GetProcessHeap(), 0, cache_entry); } @@ -233,7 +242,7 @@ static void DataCache_Destroy( } LIST_FOR_EACH_ENTRY_SAFE(cache_entry, next_cache_entry, &ptrToDestroy->cache_list, DataCacheEntry, entry) - DataCacheEntry_Destroy(cache_entry); + DataCacheEntry_Destroy(ptrToDestroy, cache_entry); if (ptrToDestroy->presentationStorage != NULL) { @@ -309,6 +318,8 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->id = This->last_cache_id++; (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; + (*cache_entry)->sink_id = 0; + (*cache_entry)->advise_flags = 0; list_add_tail(&This->cache_list, &(*cache_entry)->entry); return hr; } @@ -1855,6 +1866,26 @@ static ULONG WINAPI DataCache_IOleCache2_Release( return IUnknown_Release(this->outerUnknown); } +/***************************************************************************** + * setup_sink + * + * Set up the sink connection to the running object. + */ +static HRESULT setup_sink(DataCache *This, DataCacheEntry *cache_entry) +{ + HRESULT hr = S_FALSE; + DWORD flags; + + /* Clear the ADVFCACHE_* bits. Native also sets the two highest bits for some reason. */ + flags = cache_entry->advise_flags & ~(ADVFCACHE_NOHANDLER | ADVFCACHE_FORCEBUILTIN | ADVFCACHE_ONSAVE); + + if(This->running_object) + if(!(flags & ADVF_NODATA)) + hr = IDataObject_DAdvise(This->running_object, &cache_entry->fmtetc, flags, + (IAdviseSink *)&This->lpvtblIAdviseSink, &cache_entry->sink_id); + return hr; +} + static HRESULT WINAPI DataCache_Cache( IOleCache2* iface, FORMATETC* pformatetc, @@ -1885,7 +1916,11 @@ static HRESULT WINAPI DataCache_Cache( hr = DataCache_CreateEntry(This, pformatetc, &cache_entry); if (SUCCEEDED(hr)) + { *pdwConnection = cache_entry->id; + cache_entry->advise_flags = advf; + setup_sink(This, cache_entry); + } return hr; } @@ -1902,7 +1937,7 @@ static HRESULT WINAPI DataCache_Uncache( LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) if (cache_entry->id == dwConnection) { - DataCacheEntry_Destroy(cache_entry); + DataCacheEntry_Destroy(This, cache_entry); return S_OK; } @@ -2031,19 +2066,53 @@ static ULONG WINAPI DataCache_IOleCacheControl_Release( return IUnknown_Release(this->outerUnknown); } -static HRESULT WINAPI DataCache_OnRun( - IOleCacheControl* iface, - LPDATAOBJECT pDataObject) +/************************************************************************ + * DataCache_OnRun (IOleCacheControl) + */ +static HRESULT WINAPI DataCache_OnRun(IOleCacheControl* iface, IDataObject *data_obj) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCacheControl(iface); + DataCacheEntry *cache_entry; + + TRACE("(%p)->(%p)\n", iface, data_obj); + + if(This->running_object) return S_OK; + + /* No reference is taken on the data object */ + This->running_object = data_obj; + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + { + setup_sink(This, cache_entry); + } + + return S_OK; } -static HRESULT WINAPI DataCache_OnStop( - IOleCacheControl* iface) +/************************************************************************ + * DataCache_OnStop (IOleCacheControl) + */ +static HRESULT WINAPI DataCache_OnStop(IOleCacheControl* iface) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCacheControl(iface); + DataCacheEntry *cache_entry; + + TRACE("(%p)\n", iface); + + if(!This->running_object) return S_OK; + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + { + if(cache_entry->sink_id) + { + IDataObject_DUnadvise(This->running_object, cache_entry->sink_id); + cache_entry->sink_id = 0; + } + } + + /* No ref taken in OnRun, so no Release call here */ + This->running_object = NULL; + return S_OK; } /************************************************************************ @@ -2081,7 +2150,9 @@ static ULONG WINAPI DataCache_IAdviseSink_Release(IAdviseSink *iface) static void WINAPI DataCache_OnDataChange(IAdviseSink *iface, FORMATETC *fmt, STGMEDIUM *med) { - FIXME("stub\n"); + DataCache *This = impl_from_IAdviseSink(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_formatetc(fmt), med); + IOleCache_SetData((IOleCache2*)&This->lpvtblIOleCache2, fmt, med, FALSE); } static void WINAPI DataCache_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) @@ -2248,6 +2319,7 @@ static DataCache* DataCache_Construct( list_init(&newObject->cache_list); newObject->last_cache_id = 1; newObject->dirty = FALSE; + newObject->running_object = NULL; return newObject; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 460a08f..6de8cd1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1406,9 +1406,7 @@ static void test_data_cache(void) DeleteDC(hdcMem); hr = IOleCacheControl_OnRun(pOleCacheControl, &DataObject); - todo_wine { ok_ole_success(hr, "IOleCacheControl_OnRun"); - } hr = IPersistStorage_Save(pPS, pStorage, TRUE); ok_ole_success(hr, "IPersistStorage_Save"); @@ -1424,9 +1422,7 @@ static void test_data_cache(void) IOleCache_Release(pOleCache); IOleCacheControl_Release(pOleCacheControl); - todo_wine { CHECK_NO_EXTRA_METHODS(); - } /* Test with loaded data */ trace("Testing loaded data with CreateDataCache:\n"); @@ -1538,7 +1534,6 @@ static void test_data_cache(void) ok(hr == OLE_E_BLANK, "got %08x\n", hr); hr = IOleCacheControl_OnRun(pOleCacheControl, &DataObject); -todo_wine ok_ole_success(hr, "IOleCacheControl_OnRun"); fmtetc.cfFormat = cf_test_3; @@ -1551,7 +1546,6 @@ todo_wine fmtetc.cfFormat = cf_test_2; hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); -todo_wine ok(hr == S_OK, "got %08x\n", hr); ReleaseStgMedium(&stgmedium); @@ -1563,7 +1557,6 @@ todo_wine IDataObject_Release(pCacheDataObject); IOleCache_Release(pOleCache); -todo_wine CHECK_NO_EXTRA_METHODS(); IStorage_Release(pStorage);

1 0

Alexandre Julliard : kernel32: Remove unnecessary use of wownt32.h.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 5559ac4a89e152e1bee51d2cb164a502ea3b41fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5559ac4a89e152e1bee51d2cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 16:44:24 2010 +0100 kernel32: Remove unnecessary use of wownt32.h. --- dlls/kernel32/kernel_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 8bdd1d3..cf06765 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wincon.h" #include "winternl.h" -#include "wownt32.h" #include "wine/library.h" #include "kernel_private.h"

1 0

Alexandre Julliard : gdi32: Remove unnecessary uses of wownt32.h.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: f91481135954e0940e7e1cfaa127d18b45c61588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91481135954e0940e7e1cfaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 16:44:34 2010 +0100 gdi32: Remove unnecessary uses of wownt32.h. --- dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/mapping.c | 1 - dlls/gdi32/mfdrv/objects.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a23413d..04f02be 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -30,7 +30,6 @@ #include "winreg.h" #include "winternl.h" #include "winerror.h" -#include "wownt32.h" #include "gdi_private.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c799ea3..5067e49 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -66,7 +66,6 @@ #include "windef.h" #include "winbase.h" -#include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b247722..fe68893 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "wownt32.h" #include "gdi_private.h" #include "wine/exception.h" #include "wine/unicode.h" diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 8010b3d..667c83b 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index c6a68ca..c4b1602 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wownt32.h" #include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "gdi_private.h"

1 0

Huw Davies : ole32: Remove some useless comments.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 6b05b2a927132bc1199383df0e7d195d4c4a8db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b05b2a927132bc1199383df0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 1 13:11:37 2010 +0000 ole32: Remove some useless comments. --- dlls/ole32/datacache.c | 123 ++---------------------------------------------- 1 files changed, 5 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b05b2a927132bc119938…

1 0

Huw Davies : ole32: Rename cache entry parameters from 'This' - it leads to too much confusion with the data cache itself, which is the real COM object.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: c41c05057c41e3db2251fcf16f5df15f8f975092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41c05057c41e3db2251fcf16… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 1 12:06:27 2010 +0000 ole32: Rename cache entry parameters from 'This' - it leads to too much confusion with the data cache itself, which is the real COM object. --- dlls/ole32/datacache.c | 123 +++++++++++++++++++++++------------------------- 1 files changed, 59 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41c05057c41e3db2251f…

1 0