December 2011 - Wine-commits

Jacek Caban : jscript: Handle invalid break statements in compiler.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 7361cdc2f3deea0b2df519f2f8242d3fc382386a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7361cdc2f3deea0b2df519f2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:13:44 2011 +0100 jscript: Handle invalid break statements in compiler. --- dlls/jscript/compile.c | 7 ++++++- dlls/jscript/engine.c | 19 +++++++------------ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ po/ar.po | 34 +++++++++++++++++++--------------- po/bg.po | 34 +++++++++++++++++++--------------- po/ca.po | 34 +++++++++++++++++++--------------- po/cs.po | 34 +++++++++++++++++++--------------- po/da.po | 34 +++++++++++++++++++--------------- po/de.po | 34 +++++++++++++++++++--------------- po/el.po | 34 +++++++++++++++++++--------------- po/en.po | 34 +++++++++++++++++++--------------- po/en_US.po | 34 +++++++++++++++++++--------------- po/eo.po | 34 +++++++++++++++++++--------------- po/es.po | 34 +++++++++++++++++++--------------- po/fa.po | 34 +++++++++++++++++++--------------- po/fi.po | 34 +++++++++++++++++++--------------- po/fr.po | 34 +++++++++++++++++++--------------- po/he.po | 34 +++++++++++++++++++--------------- po/hi.po | 34 +++++++++++++++++++--------------- po/hu.po | 34 +++++++++++++++++++--------------- po/it.po | 34 +++++++++++++++++++--------------- po/ja.po | 34 +++++++++++++++++++--------------- po/ko.po | 34 +++++++++++++++++++--------------- po/lt.po | 34 +++++++++++++++++++--------------- po/ml.po | 34 +++++++++++++++++++--------------- po/nb_NO.po | 34 +++++++++++++++++++--------------- po/nl.po | 34 +++++++++++++++++++--------------- po/or.po | 34 +++++++++++++++++++--------------- po/pa.po | 34 +++++++++++++++++++--------------- po/pl.po | 34 +++++++++++++++++++--------------- po/pt_BR.po | 34 +++++++++++++++++++--------------- po/pt_PT.po | 34 +++++++++++++++++++--------------- po/rm.po | 34 +++++++++++++++++++--------------- po/ro.po | 34 +++++++++++++++++++--------------- po/ru.po | 34 +++++++++++++++++++--------------- po/sk.po | 34 +++++++++++++++++++--------------- po/sl.po | 34 +++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 34 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 34 +++++++++++++++++++--------------- po/sv.po | 34 +++++++++++++++++++--------------- po/te.po | 34 +++++++++++++++++++--------------- po/th.po | 34 +++++++++++++++++++--------------- po/tr.po | 34 +++++++++++++++++++--------------- po/uk.po | 34 +++++++++++++++++++--------------- po/wa.po | 34 +++++++++++++++++++--------------- po/wine.pot | 34 +++++++++++++++++++--------------- po/zh_CN.po | 34 +++++++++++++++++++--------------- po/zh_TW.po | 34 +++++++++++++++++++--------------- 51 files changed, 873 insertions(+), 688 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7361cdc2f3deea0b2df51…

1 0

Francois Gouget : winecfg: Fix the group box labels to follow the Windows GUI guidelines.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: e39d648f7d14ef7b1d840a0483157173b5178892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39d648f7d14ef7b1d840a048… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:32:32 2011 +0100 winecfg: Fix the group box labels to follow the Windows GUI guidelines. Use sentence capitalization for group box labels. Don't assign access keys to group box labels. Don't pad group box labels with spaces. --- po/ar.po | 33 ++++++++++++++++------------- po/bg.po | 38 ++++++++++++++++++++++----------- po/ca.po | 40 +++++++++++++++++++++++------------ po/cs.po | 38 ++++++++++++++++++++++----------- po/da.po | 38 ++++++++++++++++++++++----------- po/de.po | 38 ++++++++++++++++++++++----------- po/el.po | 30 ++++++++++++++------------ po/en.po | 42 ++++++++++++++++++------------------ po/en_US.po | 48 +++++++++++++++++++++--------------------- po/eo.po | 29 +++++++++++++------------ po/es.po | 38 ++++++++++++++++++++++----------- po/fa.po | 33 ++++++++++++++++------------- po/fi.po | 38 ++++++++++++++++++++++----------- po/fr.po | 38 ++++++++++++++++++++++----------- po/he.po | 32 +++++++++++++++------------- po/hi.po | 27 ++++++++++++----------- po/hu.po | 38 ++++++++++++++++++++++----------- po/it.po | 38 ++++++++++++++++++++++----------- po/ja.po | 38 ++++++++++++++++++++++----------- po/ko.po | 38 ++++++++++++++++++++++----------- po/lt.po | 38 ++++++++++++++++++++++----------- po/ml.po | 27 ++++++++++++----------- po/nb_NO.po | 38 ++++++++++++++++++++++----------- po/nl.po | 38 ++++++++++++++++++++++----------- po/or.po | 27 ++++++++++++----------- po/pa.po | 27 ++++++++++++----------- po/pl.po | 38 ++++++++++++++++++++++----------- po/pt_BR.po | 38 ++++++++++++++++++++++----------- po/pt_PT.po | 38 ++++++++++++++++++++++----------- po/rm.po | 30 ++++++++++++++------------ po/ro.po | 38 ++++++++++++++++++++++----------- po/ru.po | 38 ++++++++++++++++++++++----------- po/sk.po | 27 ++++++++++++----------- po/sl.po | 38 ++++++++++++++++++++++----------- po/sr_RS(a)cyrillic.po | 33 ++++++++++++++++------------- po/sr_RS(a)latin.po | 38 ++++++++++++++++++++++----------- po/sv.po | 38 ++++++++++++++++++++++----------- po/te.po | 27 ++++++++++++----------- po/th.po | 30 ++++++++++++++------------ po/tr.po | 38 ++++++++++++++++++++++----------- po/uk.po | 38 ++++++++++++++++++++++----------- po/wa.po | 30 ++++++++++++++------------ po/wine.pot | 24 ++++++++++---------- po/zh_CN.po | 38 ++++++++++++++++++++++----------- po/zh_TW.po | 38 ++++++++++++++++++++++----------- programs/winecfg/winecfg.rc | 24 ++++++++++---------- 46 files changed, 979 insertions(+), 629 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e39d648f7d14ef7b1d840…

1 0

Francois Gouget : include: pstore.idl should import wtypes.idl.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 8eb1dee11711d6ac6f816f465c5a7f582f1963c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb1dee11711d6ac6f816f465… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:31:08 2011 +0100 include: pstore.idl should import wtypes.idl. --- include/pstore.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/pstore.idl b/include/pstore.idl index 590b905..4f9623e 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "wtypes.idl"; import "oaidl.idl"; cpp_quote("#define PST_KEY_CURRENT_USER 0")

1 0

Francois Gouget : include: oledb.idl should include accctrl.h.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 570c8b53f27de1e738f3b2a07c2742f48a7a9ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570c8b53f27de1e738f3b2a07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:32:16 2011 +0100 include: oledb.idl should include accctrl.h. --- include/oledb.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/oledb.idl b/include/oledb.idl index 488a160..fb57501 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -72,5 +72,7 @@ typedef struct { #include "binres.idl" #include "crtrow.idl" +cpp_quote("#include <accctrl.h>") + cpp_quote("#include <poppack.h>") cpp_quote("")

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 1c8fb40f7edc1dad7c0c416a299c2ac4a3350f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8fb40f7edc1dad7c0c416a2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index c7d21b5..902bd60 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-21 21:04+0300\n" +"PO-Revision-Date: 2011-12-29 20:49+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -427,7 +427,7 @@ msgstr "Spausdintuvas:" #: comdlg32.rc:214 comdlg32.rc:391 msgid "Print range" -msgstr "Rėžis" +msgstr "Spausdinimo rėžiai" #: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216 msgid "&All" @@ -2128,9 +2128,8 @@ msgid "Certification Path" msgstr "Liudijimo kelias" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "Liudijimo &kelias" +msgstr "Liudijimo kelias" #: cryptui.rc:214 msgid "&View Certificate" @@ -3331,9 +3330,8 @@ msgid "Asking for %s" msgstr "Prašoma %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Pradžios tinklalapis " +msgstr "Pradžios tinklalapis" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3354,9 +3352,8 @@ msgid "&Blank page" msgstr "&Tuščias puslapis" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Naršymo istorija " +msgstr "Naršymo istorija" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -10365,9 +10362,8 @@ msgid "&Footer:" msgstr "&Poraštė:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "Paraštės (milimetrais):" +msgstr "Paraštės (milimetrais)" #: notepad.rc:113 msgid "&Left:" @@ -11749,12 +11745,10 @@ msgid "&Show processes from all users" msgstr "&Rodyti visų naudotojų procesus" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "CP naudojimas" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" msgstr "ATM naudojimas" @@ -11763,17 +11757,14 @@ msgid "Totals" msgstr "Sumos" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" msgstr "Virtualioji atmintis (K)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Fizinė atmintis (K)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" msgstr "Branduolio atmintis (K)" @@ -11814,12 +11805,10 @@ msgid "Nonpaged" msgstr "Nesukeičiama" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "CP naudojimo istorija" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Atminties naudojimo istorija" @@ -13435,9 +13424,8 @@ msgid "By File Type" msgstr "Pagal failo tipą" #: winefile.rc:146 -#, fuzzy msgid "File type" -msgstr "Failų tipai" +msgstr "Failo tipas" #: winefile.rc:147 msgid "&Directories" @@ -13496,9 +13484,8 @@ msgid "&Compressed" msgstr "Su&glaudintas" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Versijos informacija" +msgstr "Versijos informacija" #: winefile.rc:93 msgid "Applying font settings" @@ -13604,7 +13591,6 @@ msgid "Fastest Times" msgstr "Geriausi laikai" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Geriausi laikai"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: dc56f5878b7f12774c98b8baba7591c581a9e727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc56f5878b7f12774c98b8bab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 29 21:41:49 2011 +0100 po: Update French translation. --- po/fr.po | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7e5c58e..025b669 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-21 21:00+0100\n" +"PO-Revision-Date: 2011-12-29 21:39+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2131,9 +2131,8 @@ msgid "Certification Path" msgstr "Chemin de certification" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "Chemin de &certification" +msgstr "Chemin de certification" #: cryptui.rc:214 msgid "&View Certificate" @@ -3347,9 +3346,8 @@ msgid "Asking for %s" msgstr "Demande de %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Page d'accueil " +msgstr "Page d'accueil" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3368,9 +3366,8 @@ msgid "&Blank page" msgstr "Page &blanche" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Historique de navigation " +msgstr "Historique de navigation" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -10462,9 +10459,8 @@ msgid "&Footer:" msgstr "&Pied de page :" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "&Marges (millimètres):" +msgstr "Marges (millimètres)" #: notepad.rc:113 msgid "&Left:" @@ -11868,12 +11864,10 @@ msgid "&Show processes from all users" msgstr "Afficher les processus de &tous les utilisateurs" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "Util. processeur" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" msgstr "Util. mémoire" @@ -11882,19 +11876,16 @@ msgid "Totals" msgstr "Totaux" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" msgstr "Charge dédiée (Kio)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Mémoire physique (Kio)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" -msgstr "Mémoire pour le noyau (Kio)" +msgstr "Mémoire noyau (Kio)" #: taskmgr.rc:382 taskmgr.rc:290 msgid "Handles" @@ -11933,12 +11924,10 @@ msgid "Nonpaged" msgstr "Non paginée" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Historique de l'utilisation du processeur" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Historique de l'utilisation de la mémoire" @@ -13569,9 +13558,8 @@ msgid "By File Type" msgstr "Par type de fichier" #: winefile.rc:146 -#, fuzzy msgid "File type" -msgstr "Type de fichier " +msgstr "Type de fichier" #: winefile.rc:147 msgid "&Directories" @@ -13630,9 +13618,8 @@ msgid "&Compressed" msgstr "&Compressé" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Informations de version" +msgstr "Informations de version" #: winefile.rc:93 msgid "Applying font settings" @@ -13738,7 +13725,6 @@ msgid "Fastest Times" msgstr "Meilleurs temps" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Meilleurs temps"

1 0

Dmitry Timoshkov : user32: Add some SetFocus message tests.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 229fb8a4478fa4aa9ed55b697938fd11c066b2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=229fb8a4478fa4aa9ed55b697… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 30 15:36:19 2011 +0800 user32: Add some SetFocus message tests. --- dlls/user32/tests/msg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1a02e02..407fc7b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13490,6 +13490,105 @@ end: flush_sequence(); } + +static const struct message WmSetFocus_1[] = { + { HCBT_SETFOCUS, hook }, /* child */ + { HCBT_ACTIVATE, hook }, /* parent */ + { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, + { WM_NCACTIVATE, sent|wparam|parent, 1 }, + { WM_GETTEXT, sent|defwinproc|parent|optional }, + { WM_GETTEXT, sent|defwinproc|parent|optional }, + { WM_ACTIVATE, sent|wparam|parent, 1 }, + { HCBT_SETFOCUS, hook }, /* parent */ + { WM_SETFOCUS, sent|defwinproc|parent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { 0 } +}; +static const struct message WmSetFocus_2[] = { + { HCBT_SETFOCUS, hook }, /* parent */ + { WM_KILLFOCUS, sent }, + { WM_SETFOCUS, sent|parent }, + { 0 } +}; +static const struct message WmSetFocus_3[] = { + { HCBT_SETFOCUS, hook }, /* child */ + { 0 } +}; +static const struct message WmSetFocus_4[] = { + { 0 } +}; + +static void test_SetFocus(void) +{ + HWND parent, old_parent, child, old_focus; + MSG msg; + + parent = CreateWindowEx(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok(parent != 0, "failed to create parent window\n"); + child = CreateWindowEx(0, "TestWindowClass", NULL, WS_CHILD, + 0, 0, 0, 0, parent, 0, 0, NULL); + ok(child != 0, "failed to create child window\n"); + + trace("parent %p, child %p\n", parent, child); + + SetFocus(0); + SetActiveWindow(0); + + flush_events(); + flush_sequence(); + + ok(GetActiveWindow() == 0, "expected active 0, got %p\n", GetActiveWindow()); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + log_all_parent_messages++; + + old_focus = SetFocus(child); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmSetFocus_1, "SetFocus on a child window", TRUE); + ok(old_focus == parent, "expected old focus %p, got %p\n", parent, old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == child, "expected focus %p, got %p\n", child, GetFocus()); + + old_focus = SetFocus(parent); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmSetFocus_2, "SetFocus on a parent window", FALSE); + ok(old_focus == child, "expected old focus %p, got %p\n", child, old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + old_parent = SetParent(child, GetDesktopWindow()); + ok(old_parent == parent, "expected old parent %p, got %p\n", parent, old_parent); + + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + flush_events(); + flush_sequence(); + + old_focus = SetFocus(child); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmSetFocus_3, "SetFocus on a child window", TRUE); + ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + old_focus = SetActiveWindow(child); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetActiveWindow on a child window", FALSE); + ok(old_focus == parent, "expected old active %p, got %p\n", parent, old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + log_all_parent_messages--; + + DestroyWindow(child); + DestroyWindow(parent); +} + START_TEST(msg) { char **test_argv; @@ -13553,6 +13652,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_SetFocus(); test_SetParent(); test_PostMessage(); test_ShowWindow();

1 0

Francois Gouget : include: Fix the wia idl imports.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 9cdc6ac0d4ac2f2d554f4c34417b402bc36d423f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdc6ac0d4ac2f2d554f4c344… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:27:27 2011 +0100 include: Fix the wia idl imports. --- include/wia_lh.idl | 5 +++-- include/wia_xp.idl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 5024787..e13a658 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "objidl.idl"; +import "unknwn.idl"; +import "oaidl.idl"; +import "propidl.idl"; interface IEnumWIA_DEV_INFO; interface IWiaItem; diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 5024787..e13a658 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "objidl.idl"; +import "unknwn.idl"; +import "oaidl.idl"; +import "propidl.idl"; interface IEnumWIA_DEV_INFO; interface IWiaItem;

1 0

Francois Gouget : include: Fix the metahost.idl import directives.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 49447ad1d549438c837fcb9025f0a52cc9ed09cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49447ad1d549438c837fcb902… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:30:54 2011 +0100 include: Fix the metahost.idl import directives. --- dlls/mscoree/tests/metahost.c | 1 + include/metahost.idl | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 50821be..a9872f0 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -24,6 +24,7 @@ #include "ole2.h" #include "corerror.h" +#include "ocidl.h" #include "initguid.h" #include "metahost.h" #include "wine/test.h" diff --git a/include/metahost.idl b/include/metahost.idl index bd19c48..51cd784 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "propidl.idl"; +import "unknwn.idl"; +import "oaidl.idl"; +import "ocidl.idl"; +import "mscoree.idl"; cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef LoadLibrary")

1 0

Francois Gouget : include: strmif.idl should import unknwn.idl.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: e86ced4ed555b605e3e596b349c3759def68d287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86ced4ed555b605e3e596b34… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:30:58 2011 +0100 include: strmif.idl should import unknwn.idl. --- include/strmif.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/strmif.idl b/include/strmif.idl index a1cad6b..a06f99b 100644 --- a/include/strmif.idl +++ b/include/strmif.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "unknwn.idl"; import "objidl.idl"; #include <devenum.idl>

1 0