January 2011 - Wine-commits

Greg Geldorp : gdi32/tests: Allow ANSI_CHARSET for some tests.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 33a5cdbf795f4e3cfa14fa76c6c54e36cfd70c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a5cdbf795f4e3cfa14fa76c… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 12 14:11:43 2011 +0100 gdi32/tests: Allow ANSI_CHARSET for some tests. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 28bdcc2..4230ebc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2706,7 +2706,7 @@ todo_wine /* Wine uses Arial for all substitutions */ !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "Got %s\n", buf); cs = GetTextCharset(hdc); - ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs); + ok(cs == expected_cs || cs == ANSI_CHARSET, "expected %d, got %d\n", expected_cs, cs); DeleteObject(SelectObject(hdc, hfont)); memset(&lf, 0, sizeof(lf)); @@ -2771,7 +2771,7 @@ todo_wine /* Wine uses Arial for all substitutions */ !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "got %s for font %s\n", buf, font_subst[i].name); cs = GetTextCharset(hdc); - ok(cs == expected_cs, "expected %d, got %d for font %s\n", expected_cs, cs, font_subst[i].name); + ok(cs == expected_cs || cs == ANSI_CHARSET, "expected %d, got %d for font %s\n", expected_cs, cs, font_subst[i].name); DeleteObject(SelectObject(hdc, hfont)); }

1 0

Greg Geldorp : d3d8/tests: Skip tests if not running in the foreground.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: c1736fed2d3d6d90745ede2f77eac8dd2c0bec2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1736fed2d3d6d90745ede2f7… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 12 14:12:27 2011 +0100 d3d8/tests: Skip tests if not running in the foreground. --- dlls/d3d8/tests/device.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ef040c1..e4aabf4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1541,6 +1541,7 @@ struct wndproc_thread_param HWND dummy_window; HANDLE window_created; HANDLE test_finished; + BOOL running_in_foreground; }; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) @@ -1584,6 +1585,7 @@ static DWORD WINAPI wndproc_thread(void *param) p->dummy_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + p->running_in_foreground = SetForegroundWindow(p->dummy_window); ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); @@ -1667,9 +1669,14 @@ static void test_wndproc(void) tmp = GetFocus(); ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); - tmp = GetForegroundWindow(); - ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", - thread_params.dummy_window, tmp); + if (thread_params.running_in_foreground) + { + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); + } + else + skip("Not running in foreground, skip foreground window test\n"); flush_events(); @@ -1806,9 +1813,14 @@ static void test_wndproc_windowed(void) tmp = GetFocus(); ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); - tmp = GetForegroundWindow(); - ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", - thread_params.dummy_window, tmp); + if (thread_params.running_in_foreground) + { + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); + } + else + skip("Not running in foreground, skip foreground window test\n"); filter_messages = focus_window;

1 0

Greg Geldorp : d3d9/tests: Skip tests if not running in the foreground.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 5c9ce61e9bfb647c3c2de329eab793f024c6a997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ce61e9bfb647c3c2de329e… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 12 14:13:47 2011 +0100 d3d9/tests: Skip tests if not running in the foreground. --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 671afbf..41d1446 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2385,6 +2385,7 @@ struct wndproc_thread_param HWND dummy_window; HANDLE window_created; HANDLE test_finished; + BOOL running_in_foreground; }; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) @@ -2428,6 +2429,7 @@ static DWORD WINAPI wndproc_thread(void *param) p->dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + p->running_in_foreground = SetForegroundWindow(p->dummy_window); ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); @@ -2508,9 +2510,14 @@ static void test_wndproc(void) tmp = GetFocus(); ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); - tmp = GetForegroundWindow(); - ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", - thread_params.dummy_window, tmp); + if (thread_params.running_in_foreground) + { + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); + } + else + skip("Not running in foreground, skip foreground window test\n"); flush_events(); @@ -2647,9 +2654,14 @@ static void test_wndproc_windowed(void) tmp = GetFocus(); ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp); - tmp = GetForegroundWindow(); - ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", - thread_params.dummy_window, tmp); + if (thread_params.running_in_foreground) + { + tmp = GetForegroundWindow(); + ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", + thread_params.dummy_window, tmp); + } + else + skip("Not running in foreground, skip foreground window test\n"); filter_messages = focus_window;

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: ba3f6be371adf5ae9fe1f2dcc0085519a0f41261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3f6be371adf5ae9fe1f2dcc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 11 20:02:23 2011 +0100 po: Update German translation. --- po/de.po | 138 ++++++++++++------------------------------------------------- 1 files changed, 27 insertions(+), 111 deletions(-) diff --git a/po/de.po b/po/de.po index 768bcc4..16b7896 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2011-01-11 19:58+0100\n" +"Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -22,22 +22,12 @@ msgid "Separator" msgstr "Trennzeichen" #: comctl32.rc:44 crypt32.rc:198 progman.rc:83 -#, fuzzy msgid "None" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Keine\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Keiner" +msgstr "Kein" #: comctl32.rc:28 wordpad.rc:169 -#, fuzzy msgid "Close" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Schließen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Schließen" +msgstr "Schließen" #: comctl32.rc:33 msgid "Today:" @@ -868,44 +858,40 @@ msgid "Signature CA" msgstr "Zertifikationsautorität der Signatur" #: cryptdlg.rc:27 -#, fuzzy msgid "Certificate Policy" msgstr "Zertifikatsrichtlinien" #: cryptdlg.rc:28 -#, fuzzy msgid "Policy Identifier: " -msgstr "Autoritätsschlüsselkennung" +msgstr "Autoritätsschlüsselkennung: " #: cryptdlg.rc:29 msgid "Policy Qualifier Info" -msgstr "" +msgstr "Richtlinien Qualifizierungs Information" #: cryptdlg.rc:30 msgid "Policy Qualifier Id=" -msgstr "" +msgstr "Richtlinien Qualifizierungs-ID=" #: cryptdlg.rc:33 msgid "Qualifier" -msgstr "" +msgstr "Qualifizierung" #: cryptdlg.rc:34 msgid "Notice Reference" -msgstr "" +msgstr "Benachrichtigungsbezug" #: cryptdlg.rc:35 -#, fuzzy msgid "Organization=" -msgstr "Organisation" +msgstr "Organisation=" #: cryptdlg.rc:36 -#, fuzzy msgid "Notice Number=" msgstr "Serienummer des Zertifikats=" #: cryptdlg.rc:37 msgid "Notice Text=" -msgstr "" +msgstr "Benachrichtigungstext=" #: devenum.rc:32 msgid "Default DirectSound" @@ -932,13 +918,8 @@ msgid "I&ndex" msgstr "I&ndex" #: hhctrl.rc:29 notepad.rc:52 -#, fuzzy msgid "&Search" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Suche\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Suchen" +msgstr "&Suchen" #: hhctrl.rc:30 msgid "Favor&ites" @@ -953,13 +934,8 @@ msgid "Hide" msgstr "Verstecken" #: hhctrl.rc:37 shdoclc.rc:170 shdoclc.rc:194 -#, fuzzy msgid "Stop" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Stopp\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Halt" +msgstr "Stopp" #: hhctrl.rc:38 msgid "Refresh" @@ -978,22 +954,12 @@ msgid "Sync" msgstr "Synchronisieren" #: hhctrl.rc:42 wordpad.rc:162 -#, fuzzy msgid "Print" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Drucken\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Drucken" +msgstr "Drucken" #: hhctrl.rc:43 wordpad.rc:155 -#, fuzzy msgid "Options" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Einstellungen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Optionen" +msgstr "Einstellungen" #: hhctrl.rc:44 msgid "Forward" @@ -1057,7 +1023,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak Video Codec" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -1320,13 +1286,8 @@ msgid "Off" msgstr "Aus" #: shdoclc.rc:36 winhlp32.rc:47 winhlp32.rc:83 -#, fuzzy msgid "Default" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Standard\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Default" +msgstr "Standard" #: shdoclc.rc:38 winhlp32.rc:101 msgid "&Back" @@ -1358,13 +1319,8 @@ msgstr "Alles &auswählen" #: shdoclc.rc:47 shdoclc.rc:80 shdoclc.rc:94 shdoclc.rc:136 shdoclc.rc:164 #: shdoclc.rc:189 wineconsole.rc:30 wordpad.rc:103 -#, fuzzy msgid "&Paste" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Ein&fügen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Einfügen" +msgstr "E&infügen" #: shdoclc.rc:49 msgid "Create Shor&tcut" @@ -1391,13 +1347,8 @@ msgid "&Refresh" msgstr "A&ktualisieren" #: shdoclc.rc:59 clock.rc:28 wineconsole.rc:27 -#, fuzzy msgid "&Properties" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Einstellungen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Eigenschaften" +msgstr "&Eigenschaften" #: shdoclc.rc:62 msgid "Image" @@ -1522,26 +1473,16 @@ msgid "Paste" msgstr "Ein&fügen" #: shdoclc.rc:122 winhlp32.rc:31 -#, fuzzy msgid "&Print" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Drucken\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Thema &drucken" +msgstr "&Drucken" #: shdoclc.rc:126 msgid "Anchor" msgstr "Anker" #: shdoclc.rc:128 view.rc:30 winhlp32.rc:29 -#, fuzzy msgid "&Open" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Öffnen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Ö&ffnen..." +msgstr "Ö&ffnen" #: shdoclc.rc:129 msgid "Open in &New Window" @@ -2593,13 +2534,8 @@ msgid "Digi&tal" msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winefile.rc:97 wordpad.rc:81 -#, fuzzy msgid "&Font..." -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Schrift&art...\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Schriftarten..." +msgstr "Schrift&art..." #: clock.rc:34 msgid "&Without Titlebar" @@ -3552,23 +3488,13 @@ msgid "&Search next\tF3" msgstr "&Weitersuchen\tF3" #: notepad.rc:55 wordpad.rc:52 -#, fuzzy msgid "&Replace...\tCtrl+H" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Ersetzen...\tStrg+H\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Erset&zen...\tStrg+H" +msgstr "Erset&zen...\tStrg+H" #: notepad.rc:57 progman.rc:52 taskmgr.rc:87 winefile.rc:130 winhlp32.rc:60 #: wordpad.rc:91 -#, fuzzy msgid "&Help" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Hilfe\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&?" +msgstr "&Hilfe" #: notepad.rc:59 progman.rc:54 msgid "&Search..." @@ -4136,13 +4062,8 @@ msgid "&Show Kernel Times" msgstr "K&ernelzeiten anzeigen" #: taskmgr.rc:80 taskmgr.rc:97 taskmgr.rc:124 winefile.rc:121 -#, fuzzy msgid "Tile &Horizontally" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Übereinander\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Untereinander" +msgstr "&Übereinander" #: taskmgr.rc:81 taskmgr.rc:98 taskmgr.rc:125 msgid "Tile &Vertically" @@ -4971,13 +4892,8 @@ msgid "Customize Tool&bar..." msgstr "Symbolleiste &definieren..." #: winefile.rc:100 wordpad.rc:68 -#, fuzzy msgid "&Toolbar" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Sy&mbolleiste\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Symbolleiste" +msgstr "&Symbolleiste" #: winefile.rc:101 msgid "&Drivebar" @@ -5395,7 +5311,7 @@ msgstr "Auf&zählungszeichen" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..." -msgstr "&Absatz..." +msgstr "A&bsatz..." #: wordpad.rc:84 msgid "&Tabs..."

1 0

André Hentschel : winedump: Fix MZ Header detection.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 13b0452c45f096649a4113bcc378b6111e1bc435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b0452c45f096649a4113bcc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 11 20:29:43 2011 +0100 winedump: Fix MZ Header detection. --- tools/winedump/pe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 63001ed..c1f6eb8 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1461,10 +1461,10 @@ enum FileSig get_kind_exec(void) if (*pdw == IMAGE_NT_SIGNATURE) return SIG_PE; if (*(const WORD *)pdw == IMAGE_OS2_SIGNATURE) return SIG_NE; if (*(const WORD *)pdw == IMAGE_VXD_SIGNATURE) return SIG_LE; - return SIG_DOS; } + return SIG_DOS; } - return 0; + return SIG_UNKNOWN; } void pe_dump(void)

1 0

Michael Stefaniuc : avifil32: COM cleanup for acmstream.c.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 1f8e505dc2814a3ea551b094b546d71173a1ea84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8e505dc2814a3ea551b094b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 11:19:49 2011 +0100 avifil32: COM cleanup for acmstream.c. --- dlls/avifil32/acmstream.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 7794f54..5ff84d5 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -70,7 +70,7 @@ static const struct IAVIStreamVtbl iacmst = { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - const IAVIStreamVtbl *lpVtbl; + IAVIStream IAVIStream_iface; LONG ref; /* IAVIStream stuff */ @@ -117,19 +117,24 @@ HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv) if (pstream == NULL) return AVIERR_MEMORY; - pstream->lpVtbl = &iacmst; + pstream->IAVIStream_iface.lpVtbl = &iacmst; - hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, pstream); return hr; } +static inline IAVIStreamImpl *impl_from_IAVIStream(IAVIStream *iface) +{ + return CONTAINING_RECORD(iface, IAVIStreamImpl, IAVIStream_iface); +} + static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); @@ -146,7 +151,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -160,7 +165,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -209,7 +214,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, LPARAM lParam2) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); @@ -262,7 +267,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%p,%d)\n", iface, psi, size); @@ -289,7 +294,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, LONG flags) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); @@ -317,7 +322,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG *formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); @@ -352,7 +357,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); HRESULT hr; @@ -399,7 +404,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start, LONG buffersize, LPLONG bytesread, LPLONG samplesread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); HRESULT hr; DWORD size; @@ -520,7 +525,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, LPLONG sampwritten, LPLONG byteswritten) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); HRESULT hr; ULONG size; @@ -613,7 +618,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, LONG samples) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d)\n", iface, start, samples); @@ -647,7 +652,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, LPVOID lp, LPLONG lpread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); @@ -659,7 +664,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc, LPVOID lp, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);

1 0

Michael Stefaniuc : avifil32: Avoid the forward declaration of the IAVIStream methods.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: c567d1e4619d8486a7b37140b26905ba685dddde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c567d1e4619d8486a7b37140b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 11:21:56 2011 +0100 avifil32: Avoid the forward declaration of the IAVIStream methods. --- dlls/avifil32/acmstream.c | 177 ++++++++++++++++++++------------------------- 1 files changed, 79 insertions(+), 98 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 5ff84d5..50e868b 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -36,38 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI ACMStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI ACMStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI ACMStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI ACMStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI ACMStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI ACMStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI ACMStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI ACMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iacmst = { - ACMStream_fnQueryInterface, - ACMStream_fnAddRef, - ACMStream_fnRelease, - ACMStream_fnCreate, - ACMStream_fnInfo, - ACMStream_fnFindSample, - ACMStream_fnReadFormat, - ACMStream_fnSetFormat, - ACMStream_fnRead, - ACMStream_fnWrite, - ACMStream_fnDelete, - ACMStream_fnReadData, - ACMStream_fnWriteData, - ACMStream_fnSetInfo -}; - typedef struct _IAVIStreamImpl { /* IUnknown stuff */ IAVIStream IAVIStream_iface; @@ -102,28 +70,63 @@ typedef struct _IAVIStreamImpl { &__bytes, ACM_STREAMSIZEF_DESTINATION); \ *(a) = __bytes / This->lpInFormat->nBlockAlign; } while(0) -static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This); - -HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv) +static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This) { - IAVIStreamImpl *pstream; - HRESULT hr; + HRESULT hr; - assert(riid != NULL && ppv != NULL); + /* pre-conditions */ + assert(This != NULL); + assert(This->pStream != NULL); - *ppv = NULL; + if (This->has != NULL) + return AVIERR_OK; - pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); - if (pstream == NULL) - return AVIERR_MEMORY; + if (This->lpInFormat == NULL) { + /* decode or encode the data from pStream */ + hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); + if (FAILED(hr)) + return hr; + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, This->cbInFormat); + if (This->lpInFormat == NULL) + return AVIERR_MEMORY; - pstream->IAVIStream_iface.lpVtbl = &iacmst; + hr = IAVIStream_ReadFormat(This->pStream, This->sInfo.dwStart, + This->lpInFormat, &This->cbInFormat); + if (FAILED(hr)) + return hr; - hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pstream); + if (This->lpOutFormat == NULL) { + /* we must decode to default format */ + This->cbOutFormat = sizeof(PCMWAVEFORMAT); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); + if (This->lpOutFormat == NULL) + return AVIERR_MEMORY; - return hr; + This->lpOutFormat->wFormatTag = WAVE_FORMAT_PCM; + if (acmFormatSuggest(NULL, This->lpInFormat, This->lpOutFormat, + This->cbOutFormat, ACM_FORMATSUGGESTF_WFORMATTAG) != S_OK) + return AVIERR_NOCOMPRESSOR; + } + } else if (This->lpOutFormat == NULL) + return AVIERR_ERROR; /* To what should I encode? */ + + if (acmStreamOpen(&This->has, NULL, This->lpInFormat, This->lpOutFormat, + NULL, 0, 0, ACM_STREAMOPENF_NONREALTIME) != S_OK) + return AVIERR_NOCOMPRESSOR; + + /* update AVISTREAMINFO structure */ + This->sInfo.dwSampleSize = This->lpOutFormat->nBlockAlign; + This->sInfo.dwScale = This->lpOutFormat->nBlockAlign; + This->sInfo.dwRate = This->lpOutFormat->nAvgBytesPerSec; + This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; + SetRectEmpty(&This->sInfo.rcFrame); + + /* convert positions and sizes to output format */ + CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); + CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); + CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); + + return AVIERR_OK; } static inline IAVIStreamImpl *impl_from_IAVIStream(IAVIStream *iface) @@ -681,63 +684,41 @@ static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream *iface, return E_FAIL; } -/***********************************************************************/ +static const struct IAVIStreamVtbl iacmst = { + ACMStream_fnQueryInterface, + ACMStream_fnAddRef, + ACMStream_fnRelease, + ACMStream_fnCreate, + ACMStream_fnInfo, + ACMStream_fnFindSample, + ACMStream_fnReadFormat, + ACMStream_fnSetFormat, + ACMStream_fnRead, + ACMStream_fnWrite, + ACMStream_fnDelete, + ACMStream_fnReadData, + ACMStream_fnWriteData, + ACMStream_fnSetInfo +}; -static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This) +HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv) { - HRESULT hr; - - /* pre-conditions */ - assert(This != NULL); - assert(This->pStream != NULL); - - if (This->has != NULL) - return AVIERR_OK; - - if (This->lpInFormat == NULL) { - /* decode or encode the data from pStream */ - hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); - if (FAILED(hr)) - return hr; - This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, This->cbInFormat); - if (This->lpInFormat == NULL) - return AVIERR_MEMORY; - - hr = IAVIStream_ReadFormat(This->pStream, This->sInfo.dwStart, - This->lpInFormat, &This->cbInFormat); - if (FAILED(hr)) - return hr; + IAVIStreamImpl *pstream; + HRESULT hr; - if (This->lpOutFormat == NULL) { - /* we must decode to default format */ - This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); - if (This->lpOutFormat == NULL) - return AVIERR_MEMORY; + assert(riid != NULL && ppv != NULL); - This->lpOutFormat->wFormatTag = WAVE_FORMAT_PCM; - if (acmFormatSuggest(NULL, This->lpInFormat, This->lpOutFormat, - This->cbOutFormat, ACM_FORMATSUGGESTF_WFORMATTAG) != S_OK) - return AVIERR_NOCOMPRESSOR; - } - } else if (This->lpOutFormat == NULL) - return AVIERR_ERROR; /* To what should I encode? */ + *ppv = NULL; - if (acmStreamOpen(&This->has, NULL, This->lpInFormat, This->lpOutFormat, - NULL, 0, 0, ACM_STREAMOPENF_NONREALTIME) != S_OK) - return AVIERR_NOCOMPRESSOR; + pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); + if (pstream == NULL) + return AVIERR_MEMORY; - /* update AVISTREAMINFO structure */ - This->sInfo.dwSampleSize = This->lpOutFormat->nBlockAlign; - This->sInfo.dwScale = This->lpOutFormat->nBlockAlign; - This->sInfo.dwRate = This->lpOutFormat->nAvgBytesPerSec; - This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; - SetRectEmpty(&This->sInfo.rcFrame); + pstream->IAVIStream_iface.lpVtbl = &iacmst; - /* convert positions and sizes to output format */ - CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); - CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); - CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, pstream); - return AVIERR_OK; + return hr; }

1 0

Michael Stefaniuc : windowscodecs: Use ifaces instead of vtbl pointers in BmpDecoder.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 2785e905bc568d79e56e7505eb724f8f8ed2172d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2785e905bc568d79e56e7505e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 00:49:53 2011 +0100 windowscodecs: Use ifaces instead of vtbl pointers in BmpDecoder. --- dlls/windowscodecs/bmpdecode.c | 59 +++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index bd0ace1..6da6a3c 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -62,8 +62,8 @@ typedef struct { typedef HRESULT (*ReadDataFunc)(BmpDecoder* This); struct BmpDecoder { - const IWICBitmapDecoderVtbl *lpVtbl; - const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + IWICBitmapDecoder IWICBitmapDecoder_iface; + IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; LONG ref; BOOL initialized; IStream *stream; @@ -81,9 +81,14 @@ struct BmpDecoder { int icoframe; /* If TRUE, this is a frame of a .ico file. */ }; -static inline BmpDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) +static inline BmpDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { - return CONTAINING_RECORD(iface, BmpDecoder, lpFrameVtbl); + return CONTAINING_RECORD(iface, BmpDecoder, IWICBitmapDecoder_iface); +} + +static inline BmpDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, BmpDecoder, IWICBitmapFrameDecode_iface); } static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, @@ -111,22 +116,22 @@ static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface static ULONG WINAPI BmpFrameDecode_AddRef(IWICBitmapFrameDecode *iface) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); } static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); } static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) @@ -146,7 +151,7 @@ static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p)\n", iface, pPixelFormat); memcpy(pPixelFormat, This->pixelformat, sizeof(GUID)); @@ -177,7 +182,7 @@ static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, doubl static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); return BmpHeader_GetResolution(&This->bih, pDpiX, pDpiY); @@ -187,7 +192,7 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { HRESULT hr; - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); int count; WICColor *wiccolors=NULL; RGBTRIPLE *bgrcolors=NULL; @@ -299,7 +304,7 @@ end: static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - BmpDecoder *This = impl_from_frame(iface); + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); HRESULT hr=S_OK; UINT width, height; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); @@ -403,7 +408,7 @@ static HRESULT BmpFrameDecode_ReadRGB8(BmpDecoder* This) HRESULT hr; UINT width, height; - hr = IWICBitmapFrameDecode_GetSize((IWICBitmapFrameDecode*)&This->lpFrameVtbl, &width, &height); + hr = IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height); if (SUCCEEDED(hr)) { @@ -954,7 +959,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -975,7 +980,7 @@ static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) { - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -985,7 +990,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) { - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -1006,7 +1011,7 @@ static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre DWORD *pdwCapability) { HRESULT hr; - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); EnterCriticalSection(&This->lock); hr = BmpDecoder_ReadHeaders(This, pIStream); @@ -1025,7 +1030,7 @@ static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p WICDecodeOptions cacheOptions) { HRESULT hr; - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); EnterCriticalSection(&This->lock); hr = BmpDecoder_ReadHeaders(This, pIStream); @@ -1112,13 +1117,13 @@ static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - BmpDecoder *This = (BmpDecoder*)iface; + BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); if (index != 0) return E_INVALIDARG; if (!This->stream) return WINCODEC_ERR_WRONGSTATE; - *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; IWICBitmapDecoder_AddRef(iface); return S_OK; @@ -1148,8 +1153,8 @@ static HRESULT BmpDecoder_Create(int packed, int icoframe, BmpDecoder **ppDecode This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BmpDecoder_Vtbl; - This->lpFrameVtbl = &BmpDecoder_FrameVtbl; + This->IWICBitmapDecoder_iface.lpVtbl = &BmpDecoder_Vtbl; + This->IWICBitmapFrameDecode_iface.lpVtbl = &BmpDecoder_FrameVtbl; This->ref = 1; This->initialized = FALSE; This->stream = NULL; @@ -1178,8 +1183,8 @@ static HRESULT BmpDecoder_Construct(int packed, int icoframe, IUnknown *pUnkOute ret = BmpDecoder_Create(packed, icoframe, &This); if (FAILED(ret)) return ret; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; } @@ -1201,7 +1206,7 @@ HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder) void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder) { - *ppDecoder = (IWICBitmapDecoder*)This; + *ppDecoder = &This->IWICBitmapDecoder_iface; } /* Return the offset where the mask of an icon might be, or 0 for failure. */ @@ -1213,7 +1218,7 @@ void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown) { /* RGB or BITFIELDS data */ ULONG width, height, bytesperrow, datasize; - IWICBitmapFrameDecode_GetSize((IWICBitmapFrameDecode*)&This->lpFrameVtbl, &width, &height); + IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height); bytesperrow = (((width * This->bitsperpixel)+31)/32)*4; datasize = bytesperrow * height; *mask_offset = This->image_offset + datasize;

1 0

Michael Stefaniuc : windowscodecs/tests: COM cleanup for converter.c.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: eaf394a9ac4cd2bdf1e6484a723abf5f85026104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf394a9ac4cd2bdf1e6484a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 00:51:41 2011 +0100 windowscodecs/tests: COM cleanup for converter.c. --- dlls/windowscodecs/tests/converter.c | 76 ++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 408a6ca..a720b4b 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -20,6 +20,7 @@ #include <math.h> #define COBJMACROS +#define CONST_VTABLE #include "windef.h" #include "objbase.h" @@ -37,11 +38,16 @@ typedef struct bitmap_data { } bitmap_data; typedef struct BitmapTestSrc { - const IWICBitmapSourceVtbl *lpVtbl; + IWICBitmapSource IWICBitmapSource_iface; LONG ref; const bitmap_data *data; } BitmapTestSrc; +static inline BitmapTestSrc *impl_from_IWICBitmapSource(IWICBitmapSource *iface) +{ + return CONTAINING_RECORD(iface, BitmapTestSrc, IWICBitmapSource_iface); +} + static HRESULT WINAPI BitmapTestSrc_QueryInterface(IWICBitmapSource *iface, REFIID iid, void **ppv) { @@ -59,14 +65,14 @@ static HRESULT WINAPI BitmapTestSrc_QueryInterface(IWICBitmapSource *iface, REFI static ULONG WINAPI BitmapTestSrc_AddRef(IWICBitmapSource *iface) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); ULONG ref = InterlockedIncrement(&This->ref); return ref; } static ULONG WINAPI BitmapTestSrc_Release(IWICBitmapSource *iface) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); ULONG ref = InterlockedDecrement(&This->ref); return ref; } @@ -74,7 +80,7 @@ static ULONG WINAPI BitmapTestSrc_Release(IWICBitmapSource *iface) static HRESULT WINAPI BitmapTestSrc_GetSize(IWICBitmapSource *iface, UINT *puiWidth, UINT *puiHeight) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); *puiWidth = This->data->width; *puiHeight = This->data->height; return S_OK; @@ -83,7 +89,7 @@ static HRESULT WINAPI BitmapTestSrc_GetSize(IWICBitmapSource *iface, static HRESULT WINAPI BitmapTestSrc_GetPixelFormat(IWICBitmapSource *iface, WICPixelFormatGUID *pPixelFormat) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); memcpy(pPixelFormat, This->data->format, sizeof(GUID)); return S_OK; } @@ -91,7 +97,7 @@ static HRESULT WINAPI BitmapTestSrc_GetPixelFormat(IWICBitmapSource *iface, static HRESULT WINAPI BitmapTestSrc_GetResolution(IWICBitmapSource *iface, double *pDpiX, double *pDpiY) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); *pDpiX = This->data->xres; *pDpiY = This->data->yres; return S_OK; @@ -106,7 +112,7 @@ static HRESULT WINAPI BitmapTestSrc_CopyPalette(IWICBitmapSource *iface, static HRESULT WINAPI BitmapTestSrc_CopyPixels(IWICBitmapSource *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - BitmapTestSrc *This = (BitmapTestSrc*)iface; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); UINT bytesperrow; UINT srcstride; UINT row_offset; @@ -171,26 +177,22 @@ static const IWICBitmapSourceVtbl BitmapTestSrc_Vtbl = { BitmapTestSrc_CopyPixels }; -static void CreateTestBitmap(const bitmap_data *data, IWICBitmapSource **bitmap) +static void CreateTestBitmap(const bitmap_data *data, BitmapTestSrc **This) { - BitmapTestSrc *This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapTestSrc)); + *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (This) + if (*This) { - This->lpVtbl = &BitmapTestSrc_Vtbl; - This->ref = 1; - This->data = data; - *bitmap = (IWICBitmapSource*)This; + (*This)->IWICBitmapSource_iface.lpVtbl = &BitmapTestSrc_Vtbl; + (*This)->ref = 1; + (*This)->data = data; } - else - *bitmap = NULL; } -static void DeleteTestBitmap(IWICBitmapSource *bitmap) +static void DeleteTestBitmap(BitmapTestSrc *This) { - BitmapTestSrc *This = (BitmapTestSrc*)bitmap; - ok(This->lpVtbl == &BitmapTestSrc_Vtbl, "test bitmap %p deleted with incorrect vtable\n", bitmap); - ok(This->ref == 1, "test bitmap %p deleted with %i references instead of 1\n", bitmap, This->ref); + ok(This->IWICBitmapSource_iface.lpVtbl == &BitmapTestSrc_Vtbl, "test bitmap %p deleted with incorrect vtable\n", This); + ok(This->ref == 1, "test bitmap %p deleted with %i references instead of 1\n", This, This->ref); HeapFree(GetProcessHeap(), 0, This); } @@ -289,12 +291,13 @@ static const struct bitmap_data testdata_32bppBGRA = { static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { - IWICBitmapSource *src_bitmap, *dst_bitmap; + BitmapTestSrc *src_obj; + IWICBitmapSource *dst_bitmap; HRESULT hr; - CreateTestBitmap(src, &src_bitmap); + CreateTestBitmap(src, &src_obj); - hr = WICConvertBitmapSource(dst->format, src_bitmap, &dst_bitmap); + hr = WICConvertBitmapSource(dst->format, &src_obj->IWICBitmapSource_iface, &dst_bitmap); if (todo) todo_wine ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); else @@ -307,31 +310,32 @@ static void test_conversion(const struct bitmap_data *src, const struct bitmap_d IWICBitmapSource_Release(dst_bitmap); } - DeleteTestBitmap(src_bitmap); + DeleteTestBitmap(src_obj); } static void test_invalid_conversion(void) { - IWICBitmapSource *src_bitmap, *dst_bitmap; + BitmapTestSrc *src_obj; + IWICBitmapSource *dst_bitmap; HRESULT hr; - CreateTestBitmap(&testdata_32bppBGRA, &src_bitmap); + CreateTestBitmap(&testdata_32bppBGRA, &src_obj); /* convert to a non-pixel-format GUID */ - hr = WICConvertBitmapSource(&GUID_VendorMicrosoft, src_bitmap, &dst_bitmap); + hr = WICConvertBitmapSource(&GUID_VendorMicrosoft, &src_obj->IWICBitmapSource_iface, &dst_bitmap); ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "WICConvertBitmapSource returned %x\n", hr); - DeleteTestBitmap(src_bitmap); + DeleteTestBitmap(src_obj); } static void test_default_converter(void) { - IWICBitmapSource *src_bitmap; + BitmapTestSrc *src_obj; IWICFormatConverter *converter; BOOL can_convert=1; HRESULT hr; - CreateTestBitmap(&testdata_32bppBGRA, &src_bitmap); + CreateTestBitmap(&testdata_32bppBGRA, &src_obj); hr = CoCreateInstance(&CLSID_WICDefaultFormatConverter, NULL, CLSCTX_INPROC_SERVER, &IID_IWICFormatConverter, (void**)&converter); @@ -343,7 +347,7 @@ static void test_default_converter(void) ok(SUCCEEDED(hr), "CanConvert returned %x\n", hr); ok(can_convert, "expected TRUE, got %i\n", can_convert); - hr = IWICFormatConverter_Initialize(converter, src_bitmap, + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, &GUID_WICPixelFormat32bppBGR, WICBitmapDitherTypeNone, NULL, 0.0, WICBitmapPaletteTypeCustom); ok(SUCCEEDED(hr), "Initialize returned %x\n", hr); @@ -354,7 +358,7 @@ static void test_default_converter(void) IWICFormatConverter_Release(converter); } - DeleteTestBitmap(src_bitmap); + DeleteTestBitmap(src_obj); } static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, @@ -362,7 +366,7 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod { HRESULT hr; IWICBitmapEncoder *encoder; - IWICBitmapSource *src_bitmap; + BitmapTestSrc *src_obj; HGLOBAL hglobal; IStream *stream; IWICBitmapFrameEncode *frameencode; @@ -371,7 +375,7 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; - CreateTestBitmap(src, &src_bitmap); + CreateTestBitmap(src, &src_obj); hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); @@ -406,7 +410,7 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod hr = IWICBitmapFrameEncode_SetSize(frameencode, src->width, src->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_WriteSource(frameencode, src_bitmap, NULL); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); hr = IWICBitmapFrameEncode_Commit(frameencode); @@ -450,7 +454,7 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod IWICBitmapEncoder_Release(encoder); } - DeleteTestBitmap(src_bitmap); + DeleteTestBitmap(src_obj); } START_TEST(converter)

1 0

Juan Lang : rsaenh/tests: Add tests for CRYPT_IPSEC_HMAC_KEY.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 597a2f501a790487e4b2b438866cefeda795a4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=597a2f501a790487e4b2b4388… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 11 15:50:27 2011 -0800 rsaenh/tests: Add tests for CRYPT_IPSEC_HMAC_KEY. --- dlls/rsaenh/tests/rsaenh.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 7892f1a..844747c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2151,6 +2151,116 @@ static void test_import_export(void) CryptDestroyKey(hPrivKey); } + +static void test_import_hmac(void) +{ + /* Test cases from RFC 2202, section 3 */ + static const struct rfc2202_test_case { + const char *key; + DWORD key_len; + const char *data; + const DWORD data_len; + const char *digest; + } cases[] = { + { "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" + "\x0b\x0b\x0b\x0b", 20, + "Hi There", 8, + "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e" + "\xf1\x46\xbe\x00" }, + { "Jefe", 4, + "what do ya want for nothing?", 28, + "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c" + "\x25\x9a\x7c\x79" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa", 20, + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd", 50, + "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f" + "\x63\xf1\x75\xd3" }, + { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" + "\x11\x12\x13\x14\x15\x16\x17\x18\x19", 25, + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd", 50, + "\x4c\x90\x07\xF4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c" + "\x2d\x72\x35\xda" }, + { "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c" + "\x0c\x0c\x0c\x0c", 20, + "Test With Truncation", 20, + "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32" + "\x4a\x9a\x5a\x04" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key - Hash Key First", 54, + "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55" + "\xed\x40\x21\x12" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key and Larger " + "Than One Block-Size Data", 73, + "\xe8\xe9\x9D\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08" + "\xbb\xff\x1a\x91" } + }; + DWORD i; + + for (i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + { + const struct rfc2202_test_case *test_case = &cases[i]; + DWORD size = sizeof(BLOBHEADER) + sizeof(DWORD) + test_case->key_len; + BYTE *blob = HeapAlloc(GetProcessHeap(), 0, size); + + if (blob) + { + BLOBHEADER *header = (BLOBHEADER *)blob; + DWORD *key_len = (DWORD *)(header + 1); + BYTE *key_bytes = (BYTE *)(key_len + 1); + BOOL result; + HCRYPTKEY key; + + header->bType = PLAINTEXTKEYBLOB; + header->bVersion = CUR_BLOB_VERSION; + header->reserved = 0; + header->aiKeyAlg = CALG_RC2; + *key_len = test_case->key_len; + memcpy(key_bytes, test_case->key, *key_len); + result = CryptImportKey(hProv, blob, size, 0, CRYPT_IPSEC_HMAC_KEY, &key); + todo_wine + ok(result || broken(GetLastError() == NTE_BAD_FLAGS /* Win2k */), "CryptImportKey failed on test case %d: %08x\n", i, GetLastError()); + if (result) + { + HCRYPTHASH hash; + HMAC_INFO hmac_info = { CALG_SHA1, 0 }; + BYTE digest[20]; + DWORD digest_size; + + result = CryptCreateHash(hProv, CALG_HMAC, key, 0, &hash); + ok(result, "CryptCreateHash failed on test case %d: %08x\n", i, GetLastError()); + result = CryptSetHashParam(hash, HP_HMAC_INFO, (BYTE *)&hmac_info, 0); + ok(result, "CryptSetHashParam failed on test case %d: %08x\n", i, GetLastError()); + result = CryptHashData(hash, (const BYTE *)test_case->data, test_case->data_len, 0); + ok(result, "CryptHashData failed on test case %d: %08x\n", i, GetLastError()); + digest_size = sizeof(digest); + result = CryptGetHashParam(hash, HP_HASHVAL, digest, &digest_size, 0); + ok(result, "CryptGetHashParam failed on test case %d: %08x\n", i, GetLastError()); + ok(!memcmp(digest, test_case->digest, sizeof(digest)), "Unexpected valued on test case %d\n", i); + CryptDestroyHash(hash); + CryptDestroyKey(key); + } + HeapFree(GetProcessHeap(), 0, blob); + } + } +} static void test_schannel_provider(void) { @@ -2856,6 +2966,7 @@ START_TEST(rsaenh) test_verify_signature(); test_rsa_encrypt(); test_import_export(); + test_import_hmac(); test_enum_container(); clean_up_base_environment(); test_key_permissions();

1 0