February 2014 - Wine-commits

Hans Leidekker : msi: Use an INSTALLSTATE variable to track install state of classes and extensions.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: f0d663fb4db56a20cee43e6074c9a9e51c05d58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d663fb4db56a20cee43e607… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:01:41 2014 +0100 msi: Use an INSTALLSTATE variable to track install state of classes and extensions. --- dlls/msi/classes.c | 27 +++++++++++++-------------- dlls/msi/msipriv.h | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index afc1b1c..4110ad0 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -296,7 +296,7 @@ static MSICLASS *load_class( MSIPACKAGE* package, MSIRECORD *row ) cls->Feature = msi_get_loaded_feature(package, buffer); cls->Attributes = MSI_RecordGetInteger(row,13); - + cls->action = INSTALLSTATE_UNKNOWN; return cls; } @@ -425,7 +425,7 @@ static MSIEXTENSION *load_extension( MSIPACKAGE* package, MSIRECORD *row ) buffer = MSI_RecordGetString(row,5); ext->Feature = msi_get_loaded_feature( package, buffer ); - + ext->action = INSTALLSTATE_UNKNOWN; return ext; } @@ -856,7 +856,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) } TRACE("Registering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = TRUE; + cls->action = INSTALLSTATE_LOCAL; mark_progid_for_install( package, cls->ProgID ); RegCreateKeyW( hkey, cls->clsid, &hkey2 ); @@ -1014,7 +1014,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) } TRACE("Unregistering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = FALSE; + cls->action = INSTALLSTATE_ABSENT; mark_progid_for_uninstall( package, cls->ProgID ); res = RegDeleteTreeW( hkey, cls->clsid ); @@ -1116,13 +1116,12 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { /* check if this progid is to be installed */ - if (progid->Class && progid->Class->Installed) + if (progid->Class && progid->Class->action == INSTALLSTATE_LOCAL) progid->InstallMe = TRUE; if (!progid->InstallMe) { - TRACE("progid %s not scheduled to be installed\n", - debugstr_w(progid->ProgID)); + TRACE("progid %s not scheduled to be installed\n", debugstr_w(progid->ProgID)); continue; } @@ -1152,7 +1151,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { /* check if this progid is to be removed */ - if (progid->Class && !progid->Class->Installed) + if (progid->Class && progid->Class->action != INSTALLSTATE_LOCAL) progid->InstallMe = FALSE; if (progid->InstallMe) @@ -1302,7 +1301,7 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) } TRACE("Registering extension %s (%p)\n", debugstr_w(ext->Extension), ext); - ext->Installed = TRUE; + ext->action = INSTALLSTATE_LOCAL; /* this is only registered if the extension has at least 1 verb * according to MSDN @@ -1408,7 +1407,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) } TRACE("Unregistering extension %s\n", debugstr_w(ext->Extension)); - ext->Installed = FALSE; + ext->action = INSTALLSTATE_ABSENT; if (ext->ProgID && !list_empty( &ext->verbs )) mark_progid_for_uninstall( package, ext->ProgID ); @@ -1478,8 +1477,8 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) * extension or Class */ mt->InstallMe = (mt->InstallMe || - (mt->Class && mt->Class->Installed) || - (mt->Extension && mt->Extension->Installed)); + (mt->Class && mt->Class->action == INSTALLSTATE_LOCAL) || + (mt->Extension && mt->Extension->action == INSTALLSTATE_LOCAL)); if (!mt->InstallMe) { @@ -1532,8 +1531,8 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LPWSTR mime_key; mime->InstallMe = (mime->InstallMe || - (mime->Class && mime->Class->Installed) || - (mime->Extension && mime->Extension->Installed)); + (mime->Class && mime->Class->action == INSTALLSTATE_LOCAL) || + (mime->Extension && mime->Extension->action == INSTALLSTATE_LOCAL)); if (mime->InstallMe) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c585b43..cfa9bae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -614,7 +614,7 @@ typedef struct tagMSICLASS MSIFEATURE *Feature; INT Attributes; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; } MSICLASS; typedef struct tagMSIMIME MSIMIME; @@ -629,7 +629,7 @@ typedef struct tagMSIEXTENSION MSIMIME *Mime; MSIFEATURE *Feature; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; struct list verbs; } MSIEXTENSION;

1 0

Hans Leidekker : msi: Get rid of the InstallMe field in MSIMIME.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 28ecbec88d7378be0f98439ba988bcbc252b0b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ecbec88d7378be0f98439ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:02:30 2014 +0100 msi: Get rid of the InstallMe field in MSIMIME. --- dlls/msi/classes.c | 32 ++++---------------------------- dlls/msi/msipriv.h | 2 -- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 4110ad0..3e096b3 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -737,20 +737,6 @@ static void mark_progid_for_uninstall( MSIPACKAGE *package, MSIPROGID *progid ) } } -static void mark_mime_for_install( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = TRUE; -} - -static void mark_mime_for_uninstall( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = FALSE; -} - static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) { static const WCHAR szRemoteServerName[] = @@ -1309,8 +1295,6 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) if (ext->ProgID && !list_empty( &ext->verbs ) ) mark_progid_for_install( package, ext->ProgID ); - mark_mime_for_install(ext->Mime); - extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) { @@ -1412,8 +1396,6 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) if (ext->ProgID && !list_empty( &ext->verbs )) mark_progid_for_uninstall( package, ext->ProgID ); - mark_mime_for_uninstall( ext->Mime ); - extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) { @@ -1476,11 +1458,8 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) * check if the MIME is to be installed. Either as requested by an * extension or Class */ - mt->InstallMe = (mt->InstallMe || - (mt->Class && mt->Class->action == INSTALLSTATE_LOCAL) || - (mt->Extension && mt->Extension->action == INSTALLSTATE_LOCAL)); - - if (!mt->InstallMe) + if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && + mt->Extension->action != INSTALLSTATE_LOCAL) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1530,11 +1509,8 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LONG res; LPWSTR mime_key; - mime->InstallMe = (mime->InstallMe || - (mime->Class && mime->Class->action == INSTALLSTATE_LOCAL) || - (mime->Extension && mime->Extension->action == INSTALLSTATE_LOCAL)); - - if (mime->InstallMe) + if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && + mime->Extension->action != INSTALLSTATE_ABSENT) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cfa9bae..b664766 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -664,8 +664,6 @@ struct tagMSIMIME LPWSTR suffix; LPWSTR clsid; MSICLASS *Class; - /* not in the table, set during installation */ - BOOL InstallMe; }; enum SCRIPTS

1 0

Hans Leidekker : msi: Correctly [un] register progids when associated class and extensions change state.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: a547027b0199ffa96165b75012d23c4ab64f3b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a547027b0199ffa96165b7501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:03:48 2014 +0100 msi: Correctly [un]register progids when associated class and extensions change state. --- dlls/msi/classes.c | 124 +++++++++++++++++++++++------------------------ dlls/msi/msipriv.h | 1 - dlls/msi/tests/action.c | 30 +++++++++--- 3 files changed, 86 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a547027b0199ffa96165b…

1 0

Hans Leidekker : winspool: Add stub implementations of UploadPrinterDriverPackageA/W.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: ec082c3102776f1f6a0e5a9a755bddb3d00a4982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec082c3102776f1f6a0e5a9a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 13:26:25 2014 +0100 winspool: Add stub implementations of UploadPrinterDriverPackageA/W. --- dlls/winspool.drv/info.c | 22 ++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 8 ++++++++ 3 files changed, 32 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e554f94..e33b257 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8569,3 +8569,25 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) } return ret; } + +/***************************************************************************** + * UploadPrinterDriverPackageA [WINSPOOL.@] + */ +HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR env, + DWORD flags, HWND hwnd, LPSTR dst, PULONG dstlen ) +{ + FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env), + flags, hwnd, dst, dstlen); + return E_NOTIMPL; +} + +/***************************************************************************** + * UploadPrinterDriverPackageW [WINSPOOL.@] + */ +HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWSTR env, + DWORD flags, HWND hwnd, LPWSTR dst, PULONG dstlen ) +{ + FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env), + flags, hwnd, dst, dstlen); + return E_NOTIMPL; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index e83faec..b0d30b8 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -176,6 +176,8 @@ @ stdcall StartDocPrinterA(long long ptr) @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) +@ stdcall UploadPrinterDriverPackageA(str str str long long ptr ptr) +@ stdcall UploadPrinterDriverPackageW(wstr wstr wstr long long ptr ptr) @ stub WaitForPrinterChange @ stdcall WritePrinter(long ptr long ptr) @ stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) diff --git a/include/winspool.h b/include/winspool.h index 4648ec4..42097fb 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -297,6 +297,10 @@ extern "C" { #define DSPRINT_REPUBLISH 0x00000008 #define DSPRINT_PENDING 0x80000000 +#define UPDP_SILENT_UPLOAD 0x00000001 +#define UPDP_UPLOAD_ALWAYS 0x00000002 +#define UPDP_CHECK_DRIVERSTORE 0x00000004 + /* ##################################### */ /* TYPES */ @@ -1801,6 +1805,10 @@ LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); #define StartDocDlg WINELIB_NAME_AW(StartDocDlg) +HRESULT WINAPI UploadPrinterDriverPackageA(LPCSTR,LPCSTR,LPCSTR,DWORD,HWND,LPSTR,PULONG); +HRESULT WINAPI UploadPrinterDriverPackageW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,HWND,LPWSTR,PULONG); +#define UploadPrinterDriverPackage WINELIB_NAME_AW(UploadPrinterDriverPackage) + BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus);

1 0

Frédéric Delanoy : notepad: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: dc8b11e6f4fc74230ed39981b12089184fa15102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8b11e6f4fc74230ed39981b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 15:33:26 2014 +0100 notepad: Use BOOL type where appropriate. --- programs/notepad/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 235981f..5c465ca 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -616,8 +616,8 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; - int opt_print=0; - + BOOL opt_print = FALSE; + /* skip white space */ while (*cmdline == ' ') cmdline++; @@ -644,7 +644,7 @@ static void HandleCommandLine(LPWSTR cmdline) { case 'p': case 'P': - opt_print=1; + opt_print = TRUE; break; } }

1 0

Frédéric Delanoy : start: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: c60e81b7c9ea937ae36c33ba7313487030c81555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60e81b7c9ea937ae36c33ba7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 15:33:27 2014 +0100 start: Use BOOL type where appropriate. --- programs/start/start.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index a27aad7..7bf8ea8 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -181,8 +181,8 @@ int wmain (int argc, WCHAR *argv[]) DWORD creation_flags; WCHAR *args = NULL; int i; - int unix_mode = 0; - int progid_open = 0; + BOOL unix_mode = FALSE; + BOOL progid_open = FALSE; WCHAR *title = NULL; WCHAR *dos_filename = NULL; WCHAR *parent_directory = NULL; @@ -313,10 +313,10 @@ int wmain (int argc, WCHAR *argv[]) /* Wine extensions */ else if (is_option(argv[i], unixW)) { - unix_mode = 1; + unix_mode = TRUE; } else if (is_option(argv[i], progIDOpenW)) { - progid_open = 1; + progid_open = TRUE; } else {

1 0

Piotr Caban : user32: Check WS_CHILD style in IsChild function.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 367577c0d67c6cbca3d35c6ad119cbf7502c991d URL: http://source.winehq.org/git/wine.git/?a=commit;h=367577c0d67c6cbca3d35c6ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 15:40:00 2014 +0100 user32: Check WS_CHILD style in IsChild function. --- dlls/user32/tests/win.c | 13 +++++++++++++ dlls/user32/win.c | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3c63c8a..d693172 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3675,6 +3675,19 @@ static void test_SetParent(void) ok(SetParent(sibling, parent) != 0, "SetParent should not fail\n"); ok(GetMenu(sibling) == hMenu, "SetParent should not remove menu\n"); + ok(SetParent(parent, desktop) != 0, "SetParent should not fail\n"); + ok(SetParent(child4, child3) != 0, "SetParent should not fail\n"); + ok(SetParent(child3, child2) != 0, "SetParent should not fail\n"); + ok(SetParent(child2, child1) != 0, "SetParent should not fail\n"); + ok(!IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4); + SetWindowLongW(child4, GWL_STYLE, WS_CHILD); + ok(IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4); + ok(IsChild(child2, child4), "wrong parent/child %p/%p\n", child2, child4); + ok(!IsChild(child1, child4), "wrong parent/child %p/%p\n", child1, child4); + SetWindowLongW(child2, GWL_STYLE, WS_CHILD); + ok(IsChild(child1, child4), "wrong parent/child %p/%p\n", child1, child4); + ok(IsChild(parent, child4), "wrong parent/child %p/%p\n", parent, child4); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d60427f..29f2365 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3043,14 +3043,22 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) */ BOOL WINAPI IsChild( HWND parent, HWND child ) { - HWND *list = list_window_parents( child ); + HWND *list; int i; - BOOL ret; + BOOL ret = FALSE; - if (!list) return FALSE; + if (!(GetWindowLongW( child, GWL_STYLE ) & WS_CHILD)) return FALSE; + if (!(list = list_window_parents( child ))) return FALSE; parent = WIN_GetFullHandle( parent ); - for (i = 0; list[i]; i++) if (list[i] == parent) break; - ret = list[i] && list[i+1]; + for (i = 0; list[i]; i++) + { + if (list[i] == parent) + { + ret = list[i] && list[i+1]; + break; + } + if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_CHILD)) break; + } HeapFree( GetProcessHeap(), 0, list ); return ret; }

1 0

Jacek Caban : urlmon: Fixed url.c tests on IE11.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: f88b51731f90242f808788740cc8e7ca3101e928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88b51731f90242f808788740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 16:36:10 2014 +0100 urlmon: Fixed url.c tests on IE11. --- dlls/urlmon/tests/url.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 98e5187..1b32f34 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ @@ -88,7 +89,6 @@ DEFINE_EXPECT(QueryInterface_IHttpNegotiate); DEFINE_EXPECT(QueryInterface_IBindStatusCallback); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackEx); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackHolder); -DEFINE_EXPECT(QueryInterface_IInternetBindInfo); DEFINE_EXPECT(QueryInterface_IAuthenticate); DEFINE_EXPECT(QueryInterface_IInternetProtocol); DEFINE_EXPECT(QueryInterface_IWindowForBindingUI); @@ -694,11 +694,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, static const WCHAR wszMimes[] = {'*','/','*',0}; - SET_EXPECT(QueryInterface_IInternetBindInfo); SET_EXPECT(QueryService_IInternetBindInfo); hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_USER_AGENT, &ua, 1, &fetched); - CLEAR_CALLED(QueryInterface_IInternetBindInfo); /* IE <8 */ CLEAR_CALLED(QueryService_IInternetBindInfo); /* IE <8 */ ok(hres == E_NOINTERFACE, @@ -1437,6 +1435,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return E_NOINTERFACE; } + if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { + trace("QueryService(IID_undocumentedIE11)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1543,7 +1547,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF return S_OK; }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { /* TODO */ - CHECK_EXPECT2(QueryInterface_IInternetBindInfo); }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { CHECK_EXPECT2(QueryInterface_IWindowForBindingUI); return E_NOINTERFACE; @@ -1558,6 +1561,10 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF trace("QI(IID_undocumentedIE10)\n"); *ppv = NULL; return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { + trace("QI(IID_undocumentedIE11)\n"); + *ppv = NULL; + return E_NOINTERFACE; }else { ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); } @@ -2950,7 +2957,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - SET_EXPECT(QueryInterface_IInternetBindInfo); SET_EXPECT(QueryService_IInternetBindInfo); if(!abort_start) SET_EXPECT(QueryInterface_IHttpNegotiate); @@ -3082,7 +3088,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST || test_protocol == WINETEST_SYNC_TEST) { @@ -3094,7 +3100,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - CLEAR_CALLED(QueryInterface_IInternetBindInfo); CLEAR_CALLED(QueryService_IInternetBindInfo); if(!abort_start) CHECK_CALLED(QueryInterface_IHttpNegotiate); @@ -3335,7 +3340,7 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) CHECK_CALLED(Obj_OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CHECK_CALLED(Terminate); @@ -3415,10 +3420,9 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IInternetProtocol); - if(!emulate_protocol) { - SET_EXPECT(QueryInterface_IServiceProvider); + SET_EXPECT(QueryInterface_IServiceProvider); + if(!emulate_protocol) SET_EXPECT(QueryService_IInternetProtocol); - } SET_EXPECT(OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) @@ -3458,11 +3462,13 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) if(!emulate_protocol) { CHECK_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(QueryService_IInternetProtocol); + }else { + CLEAR_CALLED(QueryInterface_IServiceProvider); } CHECK_CALLED(OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); CHECK_CALLED(UnlockRequest); }else { @@ -3715,7 +3721,7 @@ static void test_ReportResult(HRESULT exhres) CHECK_CALLED(QueryInterface_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); ok(unk == NULL, "unk=%p\n", unk);

1 0

Jacek Caban : wmp: Added version info resources.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 28d3d7a02671afb530533d63978093e7c5be4dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d3d7a02671afb530533d639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 16:36:21 2014 +0100 wmp: Added version info resources. --- dlls/wmp/rsrc.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index cc6c199..ced1a64 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -22,3 +22,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine Media Player" +#define WINE_FILENAME_STR "wmp.dll" +#define WINE_FILEVERSION 12,0,7601,16982 +#define WINE_FILEVERSION_STR "12.0.7601.16982" +#define WINE_PRODUCTVERSION 12,0,7601,16982 +#define WINE_PRODUCTVERSION_STR "12.0.7601.16982" + +#include "wine/wine_common_ver.rc"

1 0

Francois Gouget : ddraw/tests: Simplify the 'NT4 testbot' special case a bit.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: af0bf54bd0b9e7f1f9d93054116ffb7c2cb2e8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0bf54bd0b9e7f1f9d930541… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 27 02:13:01 2014 +0100 ddraw/tests: Simplify the 'NT4 testbot' special case a bit. --- dlls/ddraw/tests/ddraw1.c | 10 ++++------ dlls/ddraw/tests/ddraw2.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 66a2662..3f8d2bd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2316,15 +2316,14 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); IDirectDrawSurface_Release(primary); IDirectDraw_Release(ddraw); goto done; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; @@ -2593,15 +2592,14 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping test.\n"); IDirectDraw_Release(ddraw1); DestroyWindow(window); return; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); h = GetSystemMetrics(SM_CYSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2a69a2f..3aca6e2 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2527,15 +2527,14 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); IDirectDrawSurface_Release(primary); IDirectDraw2_Release(ddraw); goto done; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; @@ -2893,15 +2892,14 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping test.\n"); IDirectDraw2_Release(ddraw1); DestroyWindow(window); return; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); h = GetSystemMetrics(SM_CYSCREEN);

1 0