March 2012 - Wine-Commits - list.winehq.org

Piotr Caban : urlmon: Make name spaces comparison case insensitive.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 59c9b1070cb896264178366bbb9dd3e531aab7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c9b1070cb896264178366bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 15 12:08:18 2012 +0100 urlmon: Make name spaces comparison case insensitive. --- dlls/urlmon/session.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 17e0ddc..5da194b 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -64,7 +64,7 @@ static name_space *find_name_space(LPCWSTR protocol) name_space *iter; LIST_FOR_EACH_ENTRY(iter, &name_space_list, name_space, entry) { - if(!strcmpW(iter->protocol, protocol)) + if(!strcmpiW(iter->protocol, protocol)) return iter; } @@ -148,7 +148,7 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) EnterCriticalSection(&session_cs); LIST_FOR_EACH_ENTRY(iter, &name_space_list, name_space, entry) { - if(iter->cf == cf && !strcmpW(iter->protocol, protocol)) { + if(iter->cf == cf && !strcmpiW(iter->protocol, protocol)) { list_remove(&iter->entry); LeaveCriticalSection(&session_cs);

1 0

Vincent Povirk : gdiplus: Test SetSurroundColors with fewer colors than points on the path.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 7a9f6abd85b48396d76ab52aa714737f653d4821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9f6abd85b48396d76ab52aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 14:56:55 2012 -0600 gdiplus: Test SetSurroundColors with fewer colors than points on the path. --- dlls/gdiplus/tests/brush.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 68b8881..44bb760 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -866,6 +866,16 @@ static void test_gradientsurroundcolorcount(void) todo_wine expect(0x0000ff00, color[1]); expect(0xdeadbeef, color[2]); + count = 1; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + expect(1, count); + + count = 0; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(InvalidParameter, status); + expect(0, count); + GdipDeleteBrush((GpBrush*)grad); status = GdipCreatePathGradient(getbounds_ptf, 3, WrapModeClamp, &grad);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 49962cd45d864d3bfe72a182066cc720a941db17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49962cd45d864d3bfe72a1820… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 14 22:58:01 2012 +0100 po: Update French translation. --- po/fr.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3a4cbaf..c2c6984 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: 2012-02-11 21:10+0100\n" +"PO-Revision-Date: 2012-03-14 22:57+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2194,17 +2194,13 @@ msgstr "" "confiance :" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "" -"Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)" +"Standard de syntaxe de message cryptographique/Messages PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Échange d'informations personnelles - PKCS #12 (.pfx, .p12)" +msgstr "Échange d'informations personnelles/PKCS #12 (*.pfx ; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2350,23 +2346,17 @@ msgid "Select the format you want to use:" msgstr "Sélectionnez le format à utiliser :" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" msgstr "Binaire codé &DER X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Binaire codé Ba&se64 X.509 (.cer) :" +msgstr "Binaire codé Ba&se64 X.509 (*.cer) :" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)" +"Standard de syntaxe de message &cryptographique/Messages PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2374,10 +2364,8 @@ msgstr "" "&Inclure tous les certificats dans le chemin de certification si possible" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Échange d'informations &Personnelles - PKCS #12 (.pfx)" +msgstr "Échange d'informations &personnelles/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12843,9 +12831,8 @@ msgid "Select an executable file" msgstr "Sélectionnez un fichier exécutable" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "&Détection automatique" +msgstr "Autodétection" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Piotr Caban : urlmon: Stop binding when OnDataAvailable fails.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 6dfa25d0cd1258f08d2162e5abbdef4a66f0a8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfa25d0cd1258f08d2162e5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 15 12:08:05 2012 +0100 urlmon: Stop binding when OnDataAvailable fails. --- dlls/urlmon/binding.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 159dca4..58aed20 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1095,8 +1095,19 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres formatetc.tymed = stgmed.tymed; formatetc.cfFormat = This->clipboard_format; - IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, + hres = IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &stgmed); + if(hres != S_OK) { + if(This->download_state != END_DOWNLOAD) { + This->download_state = END_DOWNLOAD; + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_ENDDOWNLOADDATA, This->url); + } + + WARN("OnDataAvailable returned %x\n", hres); + stop_binding(This, hres, NULL); + return; + } if(This->download_state == END_DOWNLOAD) stop_binding(This, S_OK, NULL);

1 0

Jacek Caban : ieframe: Added EnumVerbs tests.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 10a584a688f1bb4b1e9995c27b5413d448849258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a584a688f1bb4b1e9995c27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 13:10:56 2012 +0100 ieframe: Added EnumVerbs tests. --- dlls/ieframe/tests/webbrowser.c | 52 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 945be60..41fe00a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1946,6 +1946,54 @@ static void test_ClassInfo(IUnknown *unk) IProvideClassInfo2_Release(class_info); } +static void test_EnumVerbs(IWebBrowser2 *wb) +{ + IEnumOLEVERB *enum_verbs; + IOleObject *oleobj; + OLEVERB verbs[20]; + ULONG fetched; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + + hres = IOleObject_EnumVerbs(oleobj, &enum_verbs); + IOleObject_Release(oleobj); + ok(hres == S_OK, "EnumVerbs failed: %08x\n", hres); + ok(enum_verbs != NULL, "enum_verbs == NULL\n"); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumOLEVERB_Reset(enum_verbs); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IEnumOLEVERB_Skip(enum_verbs, 20); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + IEnumOLEVERB_Release(enum_verbs); +} + static void test_ie_funcs(IUnknown *unk) { IWebBrowser2 *wb; @@ -3201,6 +3249,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_QueryInterface(unk); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk); + test_EnumVerbs(wb); test_LocationURL(unk, ""); test_ConnectionPoint(unk, TRUE); test_ClientSite(unk, &ClientSite, !do_download); @@ -3248,6 +3297,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_GOBACK|DWL_HTTP); } + test_EnumVerbs(wb); test_TranslateAccelerator(unk); test_dochost_qs(unk); @@ -3279,12 +3329,14 @@ static void test_WebBrowserV1(void) hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get WebBrowserV1 instance: %08x\n", hres); + trace("%08x %p\n", hres, wb); test_QueryStatusWB(wb, FALSE, FALSE); test_ExecWB(wb, FALSE, FALSE); test_QueryInterface((IUnknown*)wb); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo((IUnknown*)wb); + test_EnumVerbs(wb); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Vincent Povirk : gdiplus: Use the surround colors in path gradient rendering.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 3cd51c0acf4ddf77d1a6979ee24386b4d24eb3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd51c0acf4ddf77d1a6979ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 15:40:15 2012 -0600 gdiplus: Use the surround colors in path gradient rendering. --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 67361a2..cbaf3ed 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1191,7 +1191,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, REAL min_yf, max_yf, line1_xf, line2_xf; INT min_y, max_y, min_x, max_x; INT x, y; - ARGB outer_color=0xffffffff; + ARGB outer_color; if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) { @@ -1241,6 +1241,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, int start_center_line=0, end_center_line=0; int seen_start=0, seen_end=0, seen_center=0; REAL center_distance; + ARGB start_color, end_color; + REAL dy, dx; type = flat_path->pathdata.Types[i]; @@ -1249,13 +1251,23 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, start_point = flat_path->pathdata.Points[i]; + start_color = fill->surroundcolors[min(i, fill->surroundcolorcount-1)]; + if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath || i+1 >= flat_path->pathdata.Count) + { end_point = flat_path->pathdata.Points[figure_start]; + end_color = fill->surroundcolors[min(figure_start, fill->surroundcolorcount-1)]; + } else if ((flat_path->pathdata.Types[i+1] & PathPointTypePathTypeMask) == PathPointTypeLine) + { end_point = flat_path->pathdata.Points[i+1]; + end_color = fill->surroundcolors[min(i+1, fill->surroundcolorcount-1)]; + } else continue; + outer_color = start_color; + min_yf = center_point.Y; if (min_yf > start_point.Y) min_yf = start_point.Y; if (min_yf > end_point.Y) min_yf = end_point.Y; @@ -1274,9 +1286,12 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, else max_y = (INT)ceil(max_yf); + dy = end_point.Y - start_point.Y; + dx = end_point.X - start_point.X; + /* This is proportional to the distance from start-end line to center point. */ - center_distance = (end_point.Y - start_point.Y) * (start_point.X - center_point.X) + - (end_point.X - start_point.X) * (center_point.Y - start_point.Y); + center_distance = dy * (start_point.X - center_point.X) + + dx * (center_point.Y - start_point.Y); for (y=min_y; y<max_y; y++) { @@ -1327,9 +1342,19 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, for (x=min_x; x<max_x; x++) { + REAL xf = (REAL)x; REAL distance; - distance = (end_point.Y - start_point.Y) * (start_point.X - (REAL)x) + + if (start_color != end_color) + { + REAL blend_amount, pdy, pdx; + pdy = yf - center_point.Y; + pdx = xf - center_point.X; + blend_amount = ( (center_point.Y - start_point.Y) * pdx + (start_point.X - center_point.X) * pdy ) / ( dy * pdx - dx * pdy ); + outer_color = blend_colors(start_color, end_color, blend_amount); + } + + distance = (end_point.Y - start_point.Y) * (start_point.X - xf) + (end_point.X - start_point.X) * (yf - start_point.Y); distance = distance / center_distance;

1 0

Alexander Morozov : ntoskrnl.exe: Fix a typo.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 70dcc417601e2e3e9ae1215690f22f7b1e0b8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70dcc417601e2e3e9ae121569… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Mar 15 20:15:56 2012 +0400 ntoskrnl.exe: Fix a typo. --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6eda074..285541a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -243,8 +243,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) code = reply->code; ioctl = reply->next; device = wine_server_get_ptr( reply->user_ptr ); - client_tid = reply->client_pid; - client_pid = reply->client_tid; + client_tid = reply->client_tid; + client_pid = reply->client_pid; in_size = reply->in_size; out_size = reply->out_size; }

1 0

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: d5a3b47249cd277c6cee0bc98e433f7b4508d7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a3b47249cd277c6cee0bc98… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Wed Mar 14 22:57:42 2012 +0100 po: Update Spanish translation. --- po/es.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/es.po b/po/es.po index a5c8192..78b2de0 100644 --- a/po/es.po +++ b/po/es.po @@ -2190,17 +2190,13 @@ msgstr "" "certificado, lista de revocación o lista de confianza:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "" -"Estándar de Sintaxis de Mensajes Criptográficos/Mensajes PKCS #7 (.p7b)" +"Estándar de Sintaxis para Mensajes Criptográficos/Mensajes PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Intercambio de Información Personal/PKCS #12 ((.pfx, .p12)" +msgstr "Intercambio de Información Personal/PKCS #12 (*.pfx; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2344,23 +2340,17 @@ msgid "Select the format you want to use:" msgstr "Seleccione el formato que quiere utilizar:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "X.509 con codificación &DER (.cer)" +msgstr "X.509 con codificación &DER (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X.509 con codificación Ba&se64 (.cer):" +msgstr "X.509 con codificación Ba&se64 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"Estándar de Sintaxis de Mensajes &Criptográficos/Mensaje PKCS #7 (.p7b)" +"Estándar de Sintaxis para Mensajes &Criptográficos/Mensaje PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2368,10 +2358,8 @@ msgstr "" "&Incluir todos los certificados en la ruta de certificación si es posible" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Intercambio de Información &Personal/PKCS #12 (.pfx)" +msgstr "Intercambio de Información &Personal/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12794,9 +12782,8 @@ msgid "Select an executable file" msgstr "Seleccione un fichero ejecutable" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Auto&detectar" +msgstr "Autodetectar" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Christian Costa : strmbase: Allow constructor function to be NULL but display an error saying we don' t implement the CLSID.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 9ee4809dc3dac7a281188ec133b20e79798c003c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4809dc3dac7a281188ec13… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 15 08:17:10 2012 +0100 strmbase: Allow constructor function to be NULL but display an error saying we don't implement the CLSID. --- dlls/strmbase/dllfunc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 44b115e..34e03e6 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -362,7 +362,12 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (i == g_cTemplates) { - FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + ERR("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + else if (!pList->m_lpfnNew) + { + FIXME("%s: class not implemented yet.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Jacek Caban : msxml3: Avoid BAD_CAST in schemasInit.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: f0f5c45b93e0cb190098b1e128ad1c3369b131b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f5c45b93e0cb190098b1e12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 12:33:17 2012 +0100 msxml3: Avoid BAD_CAST in schemasInit. --- dlls/msxml3/schema.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e6af8b2..903f311 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -718,7 +718,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, void schemasInit(void) { int len; - char* buf; + xmlChar* buf; if (!(datatypes_rsrc = FindResourceA(MSXML_hInstance, "DATATYPES", "XML"))) { FIXME("failed to find resource for %s\n", DT_nsURI); @@ -737,7 +737,7 @@ void schemasInit(void) * need a null-terminated string */ while (buf[len] != '>') buf[len--] = 0; - datatypes_src = BAD_CAST buf; + datatypes_src = buf; datatypes_len = len + 1; if (xmlGetExternalEntityLoader() != external_entity_loader)

1 0