February 2012 - Wine-Commits

Eric Pouech : winedbg: Let the lexer accept char definitions as integral values.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 45aa67b30aafc533536d2734c3a946f078ff2e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aa67b30aafc533536d2734c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Feb 11 11:36:21 2012 +0100 winedbg: Let the lexer accept char definitions as integral values. --- programs/winedbg/debug.l | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a12b637..30c8aea 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -113,6 +113,7 @@ static int read_input(const char* pfx, char* buf, int size) static int syntax_error; %} +OCTDIGIT [0-7] DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] @@ -157,6 +158,11 @@ STRING \"[^\n"]+\" "0x"{HEXDIGIT}+ { sscanf(yytext, "%lx", &dbg_lval.integer); return tNUM; } {DIGIT}+ { sscanf(yytext, "%ld", &dbg_lval.integer); return tNUM; } +"'\\''" { dbg_lval.integer = '\''; return tNUM;} +"'\\0"{OCTDIGIT}*"'" { sscanf(yytext + 3, "%lo", &dbg_lval.integer); return tNUM;} +"'\\x"{HEXDIGIT}+"'" { sscanf(yytext + 3, "%lx", &dbg_lval.integer); return tNUM;} +"'\\"[a-z]"'" { dbg_lval.integer = yytext[2] - 'a'; return tNUM;} +"'"."'" { dbg_lval.integer = yytext[1]; return tNUM;} <FORMAT_EXPECTED>"/"{DIGIT}+{FORMAT} { char* last; dbg_lval.integer = strtol(yytext+1, &last, 0) << 8;

1 0

André Hentschel : mshtml: Only release the interface if it exists.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 3950721c2d2ee70366d67370dd5930c1031867c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3950721c2d2ee70366d67370d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 19:40:59 2012 +0100 mshtml: Only release the interface if it exists. --- dlls/mshtml/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f131062..2e69902 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -268,7 +268,7 @@ static void set_downloading_proc(task_t *_task) IDropTarget *drop_target = NULL; hres = IDocHostUIHandler_GetDropTarget(doc->hostui, NULL /* FIXME */, &drop_target); - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres) && drop_target) { FIXME("Use IDropTarget\n"); IDropTarget_Release(drop_target); }

1 0

Alexandre Julliard : dbgeng: Add missing WINAPI.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 416344b938e4597ccfb1832ceb388f1662455109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416344b938e4597ccfb1832ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 15:26:38 2012 +0100 dbgeng: Add missing WINAPI. --- dlls/dbgeng/dbgeng.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index cab118f..b08be75 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -94,7 +94,7 @@ HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) * BUGS * Unimplemented */ -HRESULT DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) +HRESULT WINAPI DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) { FIXME("(%p,%p,%p): stub\n", RemoteOptions, InterfaceId, pInterface);

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 70c005705a76140338166acee1f0bc353b3ecea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c005705a76140338166acee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 9 16:32:44 2012 -0700 po: Update Catalan translation. --- po/ca.po | 202 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 100 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70c005705a76140338166…

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Danish translation.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 74d9fdfdd8f74fb44ab122b8dd36608a8d1cbc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d9fdfdd8f74fb44ab122b8d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:04 2012 +0100 po: Fix trailing full stops errors in the Danish translation. --- po/da.po | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/po/da.po b/po/da.po index e8eb307..4461398 100644 --- a/po/da.po +++ b/po/da.po @@ -831,11 +831,11 @@ msgstr "" #: comdlg32.rc:35 msgid "Path does not exist" -msgstr "Stien eksisterer ikke." +msgstr "Stien eksisterer ikke" #: comdlg32.rc:36 msgid "File does not exist" -msgstr "Filen eksisterer ikke." +msgstr "Filen eksisterer ikke" #: comdlg32.rc:41 msgid "Up One Level" @@ -6788,7 +6788,7 @@ msgstr "" #: msi.rc:28 msgid "path %s not found" -msgstr "kunne ikke finden stien '%s'." +msgstr "kunne ikke finden stien '%s'" #: msi.rc:29 msgid "insert disk %s" @@ -6829,15 +6829,15 @@ msgstr "" #: msi.rc:57 msgid "enter which folder contains %s" -msgstr "angiv kataloget som indeholder '%s'." +msgstr "angiv kataloget som indeholder '%s'" #: msi.rc:58 msgid "install source for feature missing" -msgstr "featurens installationskilde mangler." +msgstr "featurens installationskilde mangler" #: msi.rc:59 msgid "network drive for feature missing" -msgstr "featurens netværksdrev mangler." +msgstr "featurens netværksdrev mangler" #: msi.rc:60 msgid "feature from:" @@ -6845,7 +6845,7 @@ msgstr "feature fra:" #: msi.rc:61 msgid "choose which folder contains %s" -msgstr "Vælg kataloget som indeholder '%s'." +msgstr "Vælg kataloget som indeholder '%s'" #: msrle32.rc:28 msgid "Wine MS-RLE video codec" @@ -9094,7 +9094,7 @@ msgstr "" #: winmm.rc:126 msgid "An error occurred with the specified port." -msgstr "En fejl opstod med den specificerede port.." +msgstr "En fejl opstod med den specificerede port." #: winmm.rc:129 msgid "" @@ -9488,36 +9488,43 @@ msgstr "" "proceduren arves af kalderen.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Hjælp til CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Hjælp til CHDIR\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLS sletter konsolskærmen\n" +msgstr "CLS sletter konsolskærmen.\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Hjælp til COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Hjælp til CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Hjælp til DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Hjælp til DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Hjælp til DIR\n" @@ -9542,6 +9549,7 @@ msgstr "" "et @-tegn foran den.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Hjælp til ERASE\n" @@ -9584,6 +9592,7 @@ msgstr "" "GOTO har ingen effekt når den bruges interaktivt.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -9625,10 +9634,12 @@ msgstr "" "Du kan vise et drevs volumenavn med VOL-kommandoen.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Hjælp til MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Hjælp til MKDIR\n" @@ -9741,6 +9752,7 @@ msgstr "" "fil.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Hjælp til REN\n" @@ -9750,10 +9762,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Hjælp til RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Hjælp til RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Hjælp til RMDIR\n" @@ -9805,6 +9819,7 @@ msgstr "" "effekt hvis det bruges fra kommandolinien.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Hjælp til TIME\n" @@ -9850,6 +9865,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER viser CMD's versionnummer\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Hjælp til VOL\n" @@ -12597,7 +12613,7 @@ msgstr "Er ikke i stand til at Fejlsøge Processen" #: taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "Processen skal have affinitet, med mindst en processor." +msgstr "Processen skal have affinitet, med mindst en processor" #: taskmgr.rc:316 msgid "Invalid Option" @@ -13543,7 +13559,7 @@ msgstr "Wine Program Nedbrud" #: winedbg.rc:36 msgid "Internal errors - invalid parameters received" -msgstr "Interne fejl - ugyldige parametre modtaget." +msgstr "Interne fejl - ugyldige parametre modtaget" #: winedbg.rc:37 msgid "(unidentified)"

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Italian translation.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: bfdf0465e4f039bebc442e9c29acca9e5c5602a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdf0465e4f039bebc442e9c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:05 2012 +0100 po: Fix trailing full stops errors in the Italian translation. --- po/it.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/it.po b/po/it.po index 1e7462e..3837b50 100644 --- a/po/it.po +++ b/po/it.po @@ -13751,7 +13751,7 @@ msgstr "&Formato del carattere" #: wordpad.rc:61 msgid "&Def. char format" -msgstr "Formato del &def. car." +msgstr "Formato del &def. car" #: wordpad.rc:62 msgid "Paragrap&h format"

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Polish translation.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: a263cb9266ef482ae5572c0003e540d7a9a16d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a263cb9266ef482ae5572c000… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:08 2012 +0100 po: Fix trailing full stops errors in the Polish translation. --- po/pl.po | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/po/pl.po b/po/pl.po index 54ed4c1..0cb62fe 100644 --- a/po/pl.po +++ b/po/pl.po @@ -27,7 +27,7 @@ msgid "" "drive, click Install." msgstr "" "Aby dodać program z dysku, płyty CD-ROM lub dyskietki, kliknij przycisk " -"Zainstaluj" +"Zainstaluj." #: appwiz.rc:59 msgid "&Install..." @@ -795,7 +795,7 @@ msgstr "Nie znaleziono pliku" #: comdlg32.rc:30 msgid "Please verify that the correct file name was given" -msgstr "Sprawdź, czy podana nazwa pliku jest prawidłowa." +msgstr "Sprawdź, czy podana nazwa pliku jest prawidłowa" #: comdlg32.rc:31 msgid "" @@ -935,7 +935,7 @@ msgstr "Biały" #: comdlg32.rc:52 msgid "Unreadable Entry" -msgstr "Składnia zakresu stron jest nieprawidłowa." +msgstr "Składnia zakresu stron jest nieprawidłowa" #: comdlg32.rc:54 msgid "" @@ -943,7 +943,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "Ta wartość nie leży w zakresie stron.\n" -"Wprowadź wartość pomiędzy %1!d! i %2!d!.." +"Wprowadź wartość pomiędzy %1!d! i %2!d!." #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -5050,7 +5050,7 @@ msgstr "Wykonaj operację nawet gdy nic się nie zmieniło\n" #: winerror.mc:1896 msgid "The user profile is invalid\n" -msgstr "Profil użytkownika jest niepoprawny.\n" +msgstr "Profil użytkownika jest niepoprawny\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" @@ -7217,7 +7217,7 @@ msgstr "" #: oledlg.rc:40 msgid "Inserts the contents of the clipboard into your document." -msgstr "Wstawia zawartość schowka do dokumentu" +msgstr "Wstawia zawartość schowka do dokumentu." #: oledlg.rc:41 msgid "Unknown Type" @@ -8004,7 +8004,7 @@ msgstr "Nie mogę utworzyć nowego katalogu: Brak dostępu." #: shell32.rc:167 msgid "Error during creation of a new folder" -msgstr "Błąd przy tworzeniu nowego katalogu." +msgstr "Błąd przy tworzeniu nowego katalogu" #: shell32.rc:168 msgid "Confirm file deletion" @@ -8559,7 +8559,8 @@ msgstr "Sterownik urządzenia nie jest gotowy." #: winmm.rc:74 msgid "A problem occurred in initializing MCI. Try restarting Windows." msgstr "" -"Wystąpił problem podczas inicjowania MCI. Spróbuj uruchomić ponownie Windowsa" +"Wystąpił problem podczas inicjowania MCI. Spróbuj uruchomić ponownie " +"Windowsa." #: winmm.rc:75 msgid "" @@ -8892,7 +8893,7 @@ msgid "" "these applications; then, try again." msgstr "" "Wszystkie czasomierze multimediów są używane przez inne aplikacje. Zamknij " -"jedną z nich i spróbuj ponownie.." +"jedną z nich i spróbuj ponownie." #: winmm.rc:128 msgid "The system doesn't have a current MIDI port specified." @@ -9308,7 +9309,7 @@ msgstr "CHDIR <katalog> zmienia aktualny domyślny katalog.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLS czyści ekran konsoli\n" +msgstr "CLS czyści ekran konsoli.\n" #: cmd.rc:45 msgid "COPY <filename> copies a file.\n" @@ -9368,7 +9369,7 @@ msgstr "" "Składnia: FOR %zmienna IN (zbiór) DO polecenie\n" "\n" "Wymóg powtarzania znaku %, gdy używamy komendy FOR w pliku bat nie\n" -"istnieje w cmd\n" +"istnieje w cmd.\n" #: cmd.rc:81 msgid "" @@ -9686,7 +9687,7 @@ msgid "" "stack, and then changes the current directory to the supplied one.\n" msgstr "" "PUSHD <nazwakatalogu> zapamiętuje aktualny katalog na stosie, a\n" -"następnie przechodzi do katalogu podanego jako parametr\n" +"następnie przechodzi do katalogu podanego jako parametr.\n" #: cmd.rc:222 msgid "POPD changes current directory to the last one saved with PUSHD.\n" @@ -10652,7 +10653,7 @@ msgstr "Uruchom Edytor Rejestrów Wine" #: oleview.rc:107 msgid "Quit the application. Prompts to save changes" -msgstr "Zakończ aplikację. Możesz zostać zapytany, czy zapisać zmiany." +msgstr "Zakończ aplikację. Możesz zostać zapytany, czy zapisać zmiany" #: oleview.rc:108 msgid "Create an instance of the selected object" @@ -11232,7 +11233,7 @@ msgstr "Zawiera polecenia wyświetlające informacje o programie" #: regedit.rc:139 msgid "Contains commands for creating new keys or values" -msgstr "Zawiera polecenia do tworzenia nowych kluczy lub wartości." +msgstr "Zawiera polecenia do tworzenia nowych kluczy lub wartości" #: regedit.rc:124 msgid "Data" @@ -11797,7 +11798,7 @@ msgid "" "allowed to execute on." msgstr "" "Koligacja Procesora pozwala ustalić na których procesorach można uruchamiać " -"ten proces" +"ten proces." #: taskmgr.rc:446 msgid "CPU 0" @@ -11935,7 +11936,7 @@ msgstr "Wybierz kolumny" msgid "" "Select the columns that will appear on the Process page of the Task Manager." msgstr "" -"Wybierz kolumny, które będą widoczne na zakładce Procesy Menedżera Procesów" +"Wybierz kolumny, które będą widoczne na zakładce Procesy Menedżera Procesów." #: taskmgr.rc:521 msgid "&Image Name" @@ -13133,7 +13134,7 @@ msgstr "Błąd konfiguracji" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Wielkość bufora ekranu musi być większa niż wielkość bufora okna." +msgstr "Wielkość bufora ekranu musi być większa niż wielkość bufora okna" #: wineconsole.rc:34 msgid "Each character is %1!u! pixels wide on %2!u! pixels high" @@ -13439,7 +13440,7 @@ msgstr "Wprowadzanie ustawień czcionki" #: winefile.rc:90 msgid "Error while selecting new font." -msgstr "Błąd przy wybieraniu czcionki" +msgstr "Błąd przy wybieraniu czcionki." #: winefile.rc:95 msgid "Wine File Manager"

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Ukrainian translation.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 47db52ced19c1c01465fdca7408a37340cba7b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47db52ced19c1c01465fdca74… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:13 2012 +0100 po: Fix trailing full stops errors in the Ukrainian translation. --- po/uk.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4ad03d4..9e0ccad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1978,11 +1978,11 @@ msgstr "Підписання CRL" #: crypt32.rc:229 msgid "Encipher Only" -msgstr "Лише зашифр." +msgstr "Лише зашифр" #: crypt32.rc:230 msgid "Decipher Only" -msgstr "Лише розшифр." +msgstr "Лише розшифр" #: crypt32.rc:231 msgid "SSL Client Authentication" @@ -8344,7 +8344,7 @@ msgstr "Дата сертифікату недійсна." #: wininet.rc:28 msgid "The name on the certificate does not match the site." -msgstr "Ім'я сертифікату не збігається з сайтом" +msgstr "Ім'я сертифікату не збігається з сайтом." #: wininet.rc:29 msgid "" @@ -8419,7 +8419,7 @@ msgid "" msgstr "" "Вказаний формат не підтримується, або його неможливо перетворити. " "Скористайтеся функцією Capabilities, щоб одержати список форматів, які " -"підтримуються" +"підтримуються." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -13048,7 +13048,7 @@ msgstr "" #: wineconsole.rc:69 msgid "Quick edit" -msgstr "Швидке редагув." +msgstr "Швидке редагув" #: wineconsole.rc:70 msgid "&enable"

1 0

Jörg Höhle : mmdevapi/tests: Perform renderer padding & position tests.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: fde979b8b5f5aa36e65d2ebda3987a03fdbe3596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde979b8b5f5aa36e65d2ebda… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 8 16:38:47 2012 +0100 mmdevapi/tests: Perform renderer padding & position tests. --- dlls/mmdevapi/tests/render.c | 464 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 435 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fde979b8b5f5aa36e65d2…

1 0

Jacek Caban : ieframe: Make get_typeinfo implementation thread safe and more generic.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 770f864af492cf84b1e4d7427b1b04538dfaf754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770f864af492cf84b1e4d7427… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:36:29 2012 +0100 ieframe: Make get_typeinfo implementation thread safe and more generic. --- dlls/ieframe/ieframe.h | 12 +++++++- dlls/ieframe/ieframe_main.c | 70 +++++++++++++++++++++++++++++++++--------- dlls/ieframe/webbrowser.c | 6 ++-- 3 files changed, 69 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 2953841..ac3e34d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -283,7 +283,17 @@ void released_obj(void) DECLSPEC_HIDDEN; void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; -HRESULT get_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +#define TID_LIST \ + XIID(IWebBrowser2) + +typedef enum { +#define XIID(iface) iface ## _tid, +TID_LIST +#undef XIID + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index cb810cc..cbdff92 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -54,31 +54,72 @@ const char *debugstr_variant(const VARIANT *v) } } -static ITypeInfo *wb_typeinfo = NULL; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; -HRESULT get_typeinfo(ITypeInfo **typeinfo) +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +TID_LIST +#undef XIID +}; + +static HRESULT load_typelib(void) { - ITypeLib *typelib; HRESULT hres; + ITypeLib *tl; - if(wb_typeinfo) { - *typeinfo = wb_typeinfo; - return S_OK; - } - - hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &typelib); + hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres; } - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IWebBrowser2, &wb_typeinfo); - ITypeLib_Release(typelib); - - *typeinfo = wb_typeinfo; + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); return hres; } +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) + hres = load_typelib(); + if(!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + } + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -186,8 +227,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: unregister_iewindow_class(); - if(wb_typeinfo) - ITypeInfo_Release(wb_typeinfo); + release_typelib(); } return TRUE; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 4846207..033cda8 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -200,7 +200,7 @@ static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, L TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres; @@ -220,7 +220,7 @@ static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres; @@ -239,7 +239,7 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - hres = get_typeinfo(&typeinfo); + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); if(FAILED(hres)) return hres;

1 0