wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Huw Davies : wineps: Add a helper to perform duplex lookup by name.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: e6398a554483f454a23e21c85d6760af96cbdd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6398a554483f454a23e21c85… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 16 13:15:18 2012 +0100 wineps: Add a helper to perform duplex lookup by name. --- dlls/wineps.drv/ppd.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 42969df..dc598e8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -481,6 +481,19 @@ static PAGESIZE *get_pagesize( PPD *ppd, char *name, BOOL create ) return page; } +static DUPLEX *get_duplex( PPD *ppd, const char *name ) +{ + DUPLEX *duplex; + + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + { + if (!strcmp( duplex->Name, name )) + return duplex; + } + + return NULL; +} + /********************************************************************** * * PSDRV_PPDGetWord @@ -896,13 +909,13 @@ PPD *PSDRV_ParsePPD(char *fname) list_add_tail( &ppd->Duplexes, &duplex->entry ); } - else if(!strcmp("*DefaultDuplex", tuple.key)) { - if(default_duplex) { - WARN("Already set default duplex\n"); - } else { + else if (!strcmp("*DefaultDuplex", tuple.key)) + { + if (!default_duplex) + { default_duplex = tuple.value; tuple.value = NULL; - } + } } HeapFree(PSDRV_Heap, 0, tuple.key); @@ -946,24 +959,17 @@ PPD *PSDRV_ParsePPD(char *fname) ppd->DefaultDuplex = NULL; if (default_duplex) - { - DUPLEX *duplex; - LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) - { - if (!strcmp(duplex->Name, default_duplex)) - { - ppd->DefaultDuplex = duplex; - TRACE("DefaultDuplex: %s\n", duplex->Name); - break; - } - } - HeapFree(PSDRV_Heap, 0, default_duplex); - } + ppd->DefaultDuplex = get_duplex( ppd, default_duplex ); + if (!ppd->DefaultDuplex) { - ppd->DefaultDuplex = LIST_ENTRY( list_head( &ppd->Duplexes ), DUPLEX, entry ); + struct list *head = list_head( &ppd->Duplexes ); + if (head) ppd->DefaultDuplex = LIST_ENTRY( head, DUPLEX, entry ); TRACE("Setting DefaultDuplex to first in list\n"); } + TRACE( "DefaultDuplex: %s\n", ppd->DefaultDuplex ? ppd->DefaultDuplex->Name : "<not set>" ); + + HeapFree( PSDRV_Heap, 0, default_duplex ); {

1 0

Huw Davies : wineps: Use the get_pagesize helper to look up the default pagesize.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: cd770d907adf1f301fb3947631d62d96f815951b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd770d907adf1f301fb394763… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 16 13:15:17 2012 +0100 wineps: Use the get_pagesize helper to look up the default pagesize. --- dlls/wineps.drv/ppd.c | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 5620885..42969df 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -459,14 +459,12 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple) } /********************************************************************* + * get_pagesize * - * PSDRV_PPDGetPageSizeInfo - * - * Searches ppd PageSize list to return entry matching name or creates new + * Searches ppd PageSize list to return entry matching name or optionally creates new * entry which is appended to the list if name is not found. - * */ -static PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) +static PAGESIZE *get_pagesize( PPD *ppd, char *name, BOOL create ) { PAGESIZE *page; @@ -476,6 +474,8 @@ static PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) return page; } + if (!create) return NULL; + page = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*page) ); list_add_tail(&ppd->PageSizes, &page->entry); return page; @@ -711,7 +711,7 @@ PPD *PSDRV_ParsePPD(char *fname) } else if(!strcmp("*PageSize", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { int i; @@ -747,17 +747,17 @@ PPD *PSDRV_ParsePPD(char *fname) } } - else if(!strcmp("*DefaultPageSize", tuple.key)) { - if(default_pagesize) { - WARN("Already set default pagesize\n"); - } else { + else if(!strcmp("*DefaultPageSize", tuple.key)) + { + if (!default_pagesize) + { default_pagesize = tuple.value; tuple.value = NULL; - } + } } else if(!strcmp("*ImageableArea", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { page->Name = tuple.option; @@ -779,9 +779,8 @@ PPD *PSDRV_ParsePPD(char *fname) #undef PIA } - else if(!strcmp("*PaperDimension", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { page->Name = tuple.option; @@ -932,20 +931,18 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultPageSize = NULL; - if(default_pagesize) { - LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { - if(!strcmp(page->Name, default_pagesize)) { - ppd->DefaultPageSize = page; - TRACE("DefaultPageSize: %s\n", page->Name); - break; - } - } - HeapFree(PSDRV_Heap, 0, default_pagesize); - } - if(!ppd->DefaultPageSize) { - ppd->DefaultPageSize = LIST_ENTRY(list_head(&ppd->PageSizes), PAGESIZE, entry); + if (default_pagesize) + ppd->DefaultPageSize = get_pagesize( ppd, default_pagesize, FALSE ); + + if (!ppd->DefaultPageSize) + { + struct list *head = list_head( &ppd->PageSizes ); + if (head) ppd->DefaultPageSize = LIST_ENTRY( head, PAGESIZE, entry ); TRACE("Setting DefaultPageSize to first in list\n"); } + TRACE( "DefaultPageSize: %s\n", ppd->DefaultPageSize ? ppd->DefaultPageSize->Name : "<not set>" ); + + HeapFree( PSDRV_Heap, 0, default_pagesize ); ppd->DefaultDuplex = NULL; if (default_duplex)

1 0

Jacek Caban : ieframe: Added GetExternal tests.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: eb29e30188baf925a473ad75b770fa80838212fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb29e30188baf925a473ad75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 16 13:21:12 2012 +0200 ieframe: Added GetExternal tests. --- dlls/ieframe/tests/webbrowser.c | 75 +++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4b2404a..12d2bba 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -140,6 +140,7 @@ DEFINE_EXPECT(OnInPlaceDeactivate); DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(ControlSite_TranslateAccelerator); DEFINE_EXPECT(OnFocus); +DEFINE_EXPECT(GetExternal); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -149,7 +150,7 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http; +static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; @@ -1571,8 +1572,9 @@ static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetExternal); + *ppDispatch = NULL; + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, @@ -1708,7 +1710,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &InPlaceSite; else if(IsEqualGUID(&IID_IDocHostUIHandler, riid) || IsEqualGUID(&IID_IDocHostUIHandler2, riid)) - *ppv = &DocHostUIHandler; + *ppv = use_container_dochostui ? &DocHostUIHandler : NULL; else if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &Dispatch; else if(IsEqualGUID(&IID_IServiceProvider, riid)) @@ -2550,12 +2552,15 @@ static void test_Navigate2(IUnknown *unk, const char *nav_url) SET_EXPECT(EnableModeless_FALSE); SET_EXPECT(Invoke_STATUSTEXTCHANGE); SET_EXPECT(SetStatusText); - SET_EXPECT(GetHostInfo); + if(use_container_dochostui) + SET_EXPECT(GetHostInfo); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); SET_EXPECT(Invoke_AMBIENT_USERAGENT); SET_EXPECT(Invoke_AMBIENT_PALETTE); - SET_EXPECT(GetOptionKeyPath); - SET_EXPECT(GetOverridesKeyPath); + if(use_container_dochostui) { + SET_EXPECT(GetOptionKeyPath); + SET_EXPECT(GetOverridesKeyPath); + } if (use_container_olecmd) SET_EXPECT(QueryStatus_SETPROGRESSTEXT); if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSMAX); if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSPOS); @@ -2579,12 +2584,15 @@ static void test_Navigate2(IUnknown *unk, const char *nav_url) CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(Invoke_STATUSTEXTCHANGE); CHECK_CALLED(SetStatusText); - CHECK_CALLED(GetHostInfo); + if(use_container_dochostui) + CHECK_CALLED(GetHostInfo); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* Not called by IE9 */ - CLEAR_CALLED(GetOptionKeyPath); - CHECK_CALLED(GetOverridesKeyPath); + if(use_container_dochostui) { + CLEAR_CALLED(GetOptionKeyPath); + CHECK_CALLED(GetOverridesKeyPath); + } if (use_container_olecmd) todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -3001,6 +3009,41 @@ static void test_UIActivate(IUnknown *unk, BOOL activate) IDispatch_Release(disp); } +static void test_external(IUnknown *unk) +{ + IDocHostUIHandler2 *dochost; + IOleClientSite *client; + IDispatch *disp; + HRESULT hres; + + client = get_dochost(unk); + + hres = IOleClientSite_QueryInterface(client, &IID_IDocHostUIHandler2, (void**)&dochost); + ok(hres == S_OK, "Could not get IDocHostUIHandler2 iface: %08x\n", hres); + IOleClientSite_Release(client); + + if(use_container_dochostui) + SET_EXPECT(GetExternal); + disp = (void*)0xdeadbeef; + hres = IDocHostUIHandler2_GetExternal(dochost, &disp); + if(use_container_dochostui) { + CHECK_CALLED(GetExternal); + ok(hres == S_FALSE, "GetExternal failed: %08x\n", hres); + ok(!disp, "disp = %p\n", disp); + }else { + IShellUIHelper *uihelper; + + ok(hres == S_OK, "GetExternal failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IShellUIHelper, (void**)&uihelper); + ok(hres == S_OK, "Could not get IShellUIHelper iface: %08x\n", hres); + IShellUIHelper_Release(uihelper); + } + + IDocHostUIHandler2_Release(dochost); +} + static void test_TranslateAccelerator(IUnknown *unk) { IOleClientSite *doc_clientsite; @@ -3240,6 +3283,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) is_downloading = FALSE; is_first_load = TRUE; use_container_olecmd = TRUE; + use_container_dochostui = TRUE; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); @@ -3303,6 +3347,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_dochost_qs(unk); } + test_external(unk); + if(do_close) test_Close(wb, do_download); else @@ -3329,7 +3375,6 @@ 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); @@ -3342,7 +3387,7 @@ static void test_WebBrowserV1(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } -static void test_WebBrowser_NoContainerOlecmd(void) +static void test_WebBrowser_slim_container(void) { IUnknown *unk = NULL; HRESULT hres; @@ -3351,6 +3396,7 @@ static void test_WebBrowser_NoContainerOlecmd(void) is_downloading = FALSE; is_first_load = TRUE; use_container_olecmd = FALSE; + use_container_dochostui = FALSE; /* Setup stage */ if (FAILED(create_WebBrowser(&unk))) @@ -3367,6 +3413,7 @@ static void test_WebBrowser_NoContainerOlecmd(void) /* Tests of interest */ test_QueryStatusWB(wb, FALSE, TRUE); test_ExecWB(wb, FALSE, TRUE); + test_external(unk); /* Cleanup stage */ IWebBrowser2_Release(wb); @@ -3391,7 +3438,7 @@ static BOOL is_ie_hardened(void) type != REG_DWORD) { ie_harden = 0; } - RegCloseKey(zone_map); + RegCloseKey(zone_map); } return ie_harden != 0; @@ -3417,7 +3464,7 @@ START_TEST(webbrowser) trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); - test_WebBrowser_NoContainerOlecmd(); + test_WebBrowser_slim_container(); trace("Testing WebBrowserV1...\n"); test_WebBrowserV1();

1 0

Jacek Caban : ieframe: Added default action implementation for IDocHostUIHandler::GetExternal.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 8b4b8798359ad4b4dd9aa77696591014dc331380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4b8798359ad4b4dd9aa7769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 16 13:21:02 2012 +0200 ieframe: Added default action implementation for IDocHostUIHandler::GetExternal. --- dlls/ieframe/Makefile.in | 1 + dlls/ieframe/dochost.c | 16 ++- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/shelluihelper.c | 378 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 395 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b4b8798359ad4b4dd9aa…

1 0

Michael Stefaniuc : mstask: Actually run a test and fix the expected behaviour.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: f70181113f72bc2ed02d1cb6117a2a958d3a04e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70181113f72bc2ed02d1cb61… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 11:28:37 2012 +0200 mstask: Actually run a test and fix the expected behaviour. --- dlls/mstask/task_trigger.c | 2 -- dlls/mstask/tests/task_trigger.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 307a605..448cf08 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -138,8 +138,6 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval && pTrigger->MinutesInterval > 0) return E_INVALIDARG; - if (pTrigger->MinutesDuration > 0 && pTrigger->MinutesInterval == 0) - return E_INVALIDARG; tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration; tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index c64e1c5..0b64211 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -303,7 +303,8 @@ static void test_SetTrigger_GetTrigger(void) ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 0; - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); + ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 0;

1 0

Michael Stefaniuc : quartz/tests: Remove misplaced ok() call.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: b69811f5ee67a2e6c1f83a922c17ebaec71a9792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69811f5ee67a2e6c1f83a922… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:42:59 2012 +0200 quartz/tests: Remove misplaced ok() call. --- dlls/quartz/tests/avisplitter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 59e277e..250c631 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -303,7 +303,6 @@ static void test_threads(void) */ while (IEnumPins_Next(enumpins, 1, &avipin, NULL) == S_OK) { - ok(hr == S_OK, "hr: %08x\n", hr); IPin_QueryDirection(avipin, &dir); if (dir == PINDIR_OUTPUT) {

1 0

Michael Stefaniuc : msxml3/tests: Check the correct return value.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: e86063d68603ba7c787ec84f422d05bf3d5f3f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86063d68603ba7c787ec84f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:40:14 2012 +0200 msxml3/tests: Check the correct return value. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2aa2906..d4ff6a2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2656,7 +2656,7 @@ if (0) /* baseName */ str = (BSTR)0xdeadbeef; - IXMLDOMComment_get_baseName(node_comment, &str); + r = IXMLDOMComment_get_baseName(node_comment, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok(str == NULL, "Expected NULL\n");

1 0

Michael Stefaniuc : shlwapi/tests: Remove useless ok() call on the "out" variable.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 24a01dfef8cafd358e8f5f7647515dbf75d73a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a01dfef8cafd358e8f5f764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:38:59 2012 +0200 shlwapi/tests: Remove useless ok() call on the "out" variable. --- dlls/shlwapi/tests/ordinal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5d2fa0a..e787daa 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1538,7 +1538,6 @@ static void test_SHPropertyBag_ReadLONG(void) ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, NULL); ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); - ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out); ok(rc == DISP_E_BADVARTYPE || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out);

1 0

Michael Stefaniuc : user32/tests: Remove duplicated ok() call.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: ca64393e990b3f265dd32532b517104d09d2141e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca64393e990b3f265dd32532b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:37:33 2012 +0200 user32/tests: Remove duplicated ok() call. --- dlls/user32/tests/dde.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 195de70..3ad48f0 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2460,7 +2460,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", test_topic, str, msg_index); ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); - ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n");

1 0

Hans Leidekker : fusion: Make sure the assembly exists in IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 0f82f72468dccc5655a39b733929012a08677af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82f72468dccc5655a39b733… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:08:02 2012 +0200 fusion: Make sure the assembly exists in IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/asmcache.c | 13 +++++++++---- dlls/fusion/tests/asmcache.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index e6a2a65..c6f7ca9 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -308,11 +308,16 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface if (FAILED(hr)) goto done; - hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); - if (hr == S_FALSE) + for (;;) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - goto done; + hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); + if (hr != S_OK) + { + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + goto done; + } + hr = IAssemblyName_IsEqual(asmname, next, ASM_CMPF_IL_ALL); + if (hr == S_OK) break; } if (!pAsmInfo) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 141e442..890bd9c 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1011,6 +1011,11 @@ static void test_QueryAssemblyInfo(void) '_','M','S','I','L','\\','w','i','n','e','\\', '1','.','0','.','0','.','0','_','_','2','d','0','3','6','1','7','b', '1','c','3','1','e','2','f','5','\\',0}; + static const WCHAR wine2[] = { + 'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','1',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', + '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); @@ -1363,6 +1368,24 @@ static void test_QueryAssemblyInfo(void) "Assembly path was changed\n"); ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "wine,version=1.0.0.1,publicKeyToken=2d03617b1c31e2f5,culture=neutral" */ + INIT_ASM_INFO(); + lstrcpyW(name, wine2); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, + name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); + ok(info.uliAssemblySizeInKB.u.HighPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); + ok(info.uliAssemblySizeInKB.u.LowPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "wine, Culture=neutral" */ INIT_ASM_INFO(); lstrcpyW(name, wine); @@ -1394,24 +1417,18 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, badculture); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); - ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(info.uliAssemblySizeInKB.u.LowPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); - todo_wine - { - ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), - "Assembly path was changed\n"); - ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); - } + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); /* display name is "wine, PublicKeyTokens=2d03617b1c31e2f5" */ INIT_ASM_INFO();

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012