wine-commits June 2014

4 participants
378 discussions

Bruno Jesus : winmm: Fix a memory leak in mciSendStringW (valgrind).

by Alexandre Julliard

Module: wine Branch: master Commit: c3a362a4c44dea29d1f59fc5805b9be385df75ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a362a4c44dea29d1f59fc58… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:53:19 2014 -0300 winmm: Fix a memory leak in mciSendStringW (valgrind). --- dlls/winmm/mci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 5c91045..10e2b40 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1316,7 +1316,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, UINT uRetLen, HWND hwndCallback) { - LPWSTR verb, dev, args; + LPWSTR verb, dev, args, devType = NULL; LPWINE_MCIDRIVER wmd = 0; MCIDEVICEID uDevID, auto_open = 0; DWORD dwFlags = 0, dwRet = 0; @@ -1360,7 +1360,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { - LPWSTR devType, tmp; + LPWSTR tmp; WCHAR buf[128]; /* case dev == 'new' has to be handled */ @@ -1426,7 +1426,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_LoadMciDriver(devType, &wmd); if (dwRet == MCIERR_DEVICE_NOT_INSTALLED) dwRet = MCIERR_INVALID_DEVICE_NAME; - HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev))) @@ -1596,6 +1595,7 @@ errCleanUp: } if (wMsg == MCI_OPEN && LOWORD(dwRet) && wmd) MCI_UnLoadMciDriver(wmd); + HeapFree(GetProcessHeap(), 0, devType); HeapFree(GetProcessHeap(), 0, verb); return dwRet; }

9 years, 11 months

Bruno Jesus : user32/tests: Fix a memory leak (valgrind).

by Alexandre Julliard

Module: wine Branch: master Commit: d90d2ab558fc81aee64a29b3f566bab4aa4c8f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90d2ab558fc81aee64a29b3f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:35:13 2014 -0300 user32/tests: Fix a memory leak (valgrind). --- dlls/user32/tests/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 9540f3d..54d7963 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1699,6 +1699,7 @@ static void test_GetCursorFrameInfo(void) ret = DestroyCursor(h1); ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, hotspot); cleanup: if(bmpOld) SelectObject(hdc, bmpOld); if(bmp) DeleteObject(bmp);

9 years, 11 months

Piotr Caban : user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow.

by Alexandre Julliard

Module: wine Branch: master Commit: 7257b62bd1b95438c651716b48bf3d7438eb235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7257b62bd1b95438c651716b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 28 12:57:47 2014 +0200 user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow. --- dlls/user32/tests/win.c | 5 +++++ dlls/user32/winpos.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cffceb3..cbcd6b6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3766,6 +3766,11 @@ static void test_SetParent(void) ok(bret, "SetForegroundWindow() failed\n"); check_active_state(popup, popup, popup); + ShowWindow(parent, SW_SHOW); + SetActiveWindow(popup); + ok(DestroyWindow(popup), "DestroyWindow() failed\n"); + check_active_state(parent, parent, parent); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 57fefe3..0a70942 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1536,7 +1536,19 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) for (;;) { if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; - if (can_activate_window( hwndTo )) break; + if (can_activate_window( hwndTo )) goto done; + } + + hwndTo = GetTopWindow( 0 ); + for (;;) + { + if (hwndTo == hwnd) + { + hwndTo = 0; + break; + } + if (can_activate_window( hwndTo )) goto done; + if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; } done:

9 years, 11 months

Nikolay Sivov : shell32: Update to FolderItem2.

by Alexandre Julliard

Module: wine Branch: master Commit: c318cda8d17c2c7751c954b0ef9ada2db3d33904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c318cda8d17c2c7751c954b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 24 18:23:52 2014 +0400 shell32: Update to FolderItem2. --- dlls/shell32/shelldispatch.c | 93 +++++++++++++++++++++++++----------------- include/shldisp.idl | 12 ++++++ 2 files changed, 67 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c318cda8d17c2c7751c95…

9 years, 11 months

Huw Davies : gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap.

by Alexandre Julliard

Module: wine Branch: master Commit: 0987e77089880680ae9deb01f3b550bce43f0ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987e77089880680ae9deb01f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 23 11:33:54 2014 +0100 gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap. --- dlls/gdi32/tests/font.c | 40 ++++++++++++---------------------------- dlls/gdi32/tests/wine_test.sfd | 39 +++++++++++++++++++-------------------- dlls/gdi32/tests/wine_test.ttf | Bin 1760 -> 1776 bytes 3 files changed, 31 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0e75088..e978166 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3255,42 +3255,20 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last, DWOR int i; cmap_format_4 *cmap = (cmap_format_4*)ptr; USHORT seg_count = GET_BE_WORD(cmap->seg_countx2) / 2; - USHORT const *glyph_ids = cmap->end_count + 4 * seg_count + 1; *first = 0x10000; for(i = 0; i < seg_count; i++) { - DWORD code, index; cmap_format_4_seg seg; get_seg4(cmap, i, &seg); - for(code = seg.start_count; code <= seg.end_count; code++) - { - if(seg.id_range_offset == 0) - index = (seg.id_delta + code) & 0xffff; - else - { - index = seg.id_range_offset / 2 - + code - seg.start_count - + i - seg_count; - /* some fonts have broken last segment */ - if ((char *)(glyph_ids + index + 1) < (char *)ptr + limit) - index = GET_BE_WORD(glyph_ids[index]); - else - { - trace("segment %04x/%04x index %04x points to nowhere\n", - seg.start_count, seg.end_count, index); - index = 0; - } - if(index) index += seg.id_delta; - } - if(*first == 0x10000) - *last = *first = code; - else if(index) - *last = code; - } + if(seg.start_count > 0xfffe) break; + + if(*first == 0x10000) *first = seg.start_count; + + *last = min(seg.end_count, 0xfffe); } if(*first == 0x10000) return FALSE; @@ -3560,7 +3538,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) else { expect_first_W = cmap_first; - expect_last_W = min(cmap_last, os2_last_char); + expect_last_W = cmap_last; if(os2_first_char <= 1) expect_break_W = os2_first_char + 2; else if(os2_first_char > 0xff) @@ -5064,6 +5042,7 @@ static void test_GetGlyphOutline_metric_clipping(void) HFONT hfont, hfont_prev; GLYPHMETRICS gm; TEXTMETRICA tm; + TEXTMETRICW tmW; DWORD ret; memset(&lf, 0, sizeof(lf)); @@ -5092,6 +5071,11 @@ static void test_GetGlyphOutline_metric_clipping(void) "Glyph bottom(%d) exceeds descent(%d)\n", gm.gmptGlyphOrigin.y - gm.gmBlackBoxY, -tm.tmDescent); + /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ + GetTextMetricsW(hdc, &tmW); +todo_wine + ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); + SelectObject(hdc, hfont_prev); DeleteObject(hfont); ReleaseDC(NULL, hdc); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 4c19377..c985b43 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -12,15 +12,13 @@ Ascent: 1638 Descent: 410 sfntRevision: 0x00010000 LayerCount: 2 -Layer: 0 1 "Back" 1 -Layer: 1 1 "Fore" 0 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 XUID: [1021 905 592216984 1247726] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 -CreationTime: 1288336343 -ModificationTime: 1366465321 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -92,6 +90,7 @@ BeginChars: 65539 7 StartChar: .notdef Encoding: 65536 -1 0 +AltUni2: 00fffe.ffffffff.0 00fffd.ffffffff.0 00fffc.ffffffff.0 00fffb.ffffffff.0 Width: 748 Flags: W TtInstrs: @@ -212,14 +211,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -459 1258 m 29,0,-1 - 462 1639 l 5,1,-1 - 389 1638 l 5,2,-1 - 492 1815 l 5,3,-1 - 609 1638.5 l 5,4,-1 - 531 1637.5 l 5,5,-1 - 523 1258 l 5,6,-1 - 459 1258 l 29,0,-1 +459 1258 m 25,0,-1 + 462 1639 l 1,1,-1 + 389 1638 l 1,2,-1 + 492 1815 l 1,3,-1 + 609 1638.5 l 1,4,-1 + 531 1637.5 l 1,5,-1 + 523 1258 l 1,6,-1 + 459 1258 l 25,0,-1 EndSplineSet EndChar @@ -231,14 +230,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -461 -30.7998 m 29,0,-1 - 464 -411.8 l 5,1,-1 - 391 -410.8 l 5,2,-1 - 494 -587.8 l 5,3,-1 - 611 -411.3 l 5,4,-1 - 533 -410.3 l 5,5,-1 - 525 -30.7998 l 5,6,-1 - 461 -30.7998 l 29,0,-1 +461 -30.7998 m 25,0,-1 + 464 -411.8 l 1,1,-1 + 391 -410.8 l 1,2,-1 + 494 -587.8 l 1,3,-1 + 611 -411.3 l 1,4,-1 + 533 -410.3 l 1,5,-1 + 525 -30.7998 l 1,6,-1 + 461 -30.7998 l 25,0,-1 EndSplineSet EndChar EndChars diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index 0868802..1562a32 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

9 years, 11 months

Jacek Caban : mshtml: Added function object default value getter implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: 62624922528d640cb1a86a699960233c562b316d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62624922528d640cb1a86a699… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 2 15:45:13 2014 +0200 mshtml: Added function object default value getter implementation. --- dlls/mshtml/dispex.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 3 +++ dlls/mshtml/tests/script.c | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d68a132..a81bf7c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -717,6 +717,37 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_UNEXPECTED; hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; + case DISPATCH_PROPERTYGET: { + unsigned name_len; + WCHAR *ptr; + BSTR str; + + static const WCHAR func_prefixW[] = + {'\n','f','u','n','c','t','i','o','n',' '}; + static const WCHAR func_suffixW[] = + {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + + /* FIXME: This probably should be more generic. Also we should try to get IID_IActiveScriptSite and SID_GetCaller. */ + if(!caller) + return E_ACCESSDENIED; + + name_len = SysStringLen(This->info->name); + ptr = str = SysAllocStringLen(NULL, name_len + (sizeof(func_prefixW)+sizeof(func_suffixW))/sizeof(WCHAR)); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, func_prefixW, sizeof(func_prefixW)); + ptr += sizeof(func_prefixW)/sizeof(WCHAR); + + memcpy(ptr, This->info->name, name_len*sizeof(WCHAR)); + ptr += name_len; + + memcpy(ptr, func_suffixW, sizeof(func_suffixW)); + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; + } default: FIXME("Unimplemented flags %x\n", flags); hres = E_NOTIMPL; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index bfa98c0..b47de42 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -165,6 +165,9 @@ function test_override_functions() { var tmp = div.addBehavior(); ok(tmp === "test", "div.addBehavior() = " + tmp); + + tmp = String(div.attachEvent); + ok(tmp == "\nfunction attachEvent() {\n [native code]\n}\n", "String(div.attachEvent) = " + tmp); } function test_forin() { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index df52a75..5e9ca60 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -132,6 +132,8 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller_secmgr); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); DEFINE_EXPECT(external_success); DEFINE_EXPECT(QS_VariantConversion); +DEFINE_EXPECT(QS_IActiveScriptSite); +DEFINE_EXPECT(QS_GetCaller); DEFINE_EXPECT(ChangeType); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -162,6 +164,9 @@ static HRESULT ax_getopt_hres = S_OK, ax_setopt_dispex_hres = S_OK; static HRESULT ax_setopt_disp_caller_hres = S_OK, ax_setopt_disp_data_hres = S_OK; static BOOL skip_loadobject_tests; +static IActiveScriptSite *site; +static SCRIPTSTATE state; + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -332,6 +337,19 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return S_OK; } + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + CHECK_EXPECT(QS_IActiveScriptSite); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + return IActiveScriptSite_QueryInterface(site, riid, ppv); + } + + if(IsEqualGUID(guidService, &SID_GetCaller)) { + CHECK_EXPECT(QS_GetCaller); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1280,9 +1298,6 @@ static void load_doc(IHTMLDocument2 *doc, const char *str) IHTMLElement_Release(body); } -static IActiveScriptSite *site; -static SCRIPTSTATE state; - static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1902,6 +1917,22 @@ static void test_func(IDispatchEx *obj) hres = dispex_propput(obj, id, 0, &var, NULL); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); + hres = dispex_propget(dispex, DISPID_VALUE, &var, NULL); + ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08x, expected E_ACCESSDENIED\n", hres); + if(SUCCEEDED(hres)) + VariantClear(&var); + + SET_EXPECT(QS_IActiveScriptSite); + SET_EXPECT(QS_GetCaller); + hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); + ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "\nfunction toString() {\n [native code]\n}\n"), + "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + todo_wine CHECK_CALLED(QS_IActiveScriptSite); + todo_wine CHECK_CALLED(QS_GetCaller); + IDispatchEx_Release(dispex); }

9 years, 11 months

Nikolay Sivov : include: Added IImageList2 definition.

by Alexandre Julliard

Module: wine Branch: master Commit: bc4ceca951bab517acc124963683f08ef085a8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4ceca951bab517acc124963… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 9 08:45:01 2014 +0400 include: Added IImageList2 definition. --- include/commoncontrols.idl | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index 6e00837..8cfcb56 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -66,9 +66,7 @@ cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, const UINT ILIF_ALPHA = 1; [ - object, - uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), - helpstring("Image List"), + uuid(46eb5926-582e-4017-9fdf-e8998daa0950), local ] interface IImageList : IUnknown @@ -200,15 +198,44 @@ interface IImageList : IUnknown } [ - uuid(BCADA15B-B428-420c-8D28-023590924C9F) + uuid(192b9d83-50fc-457b-90a0-2b82a8b5dae1), + local +] +interface IImageList2 : IImageList +{ + typedef struct tagIMAGELISTSTATS + { + DWORD cbSize; + INT cAlloc; + INT cUsed; + INT cStandby; + } IMAGELISTSTATS; + + HRESULT Resize(INT x_size, INT y_size); + HRESULT GetOriginalSize([in] INT image, [in] DWORD flags, [out] INT *cx, [out] INT *cy); + HRESULT SetOriginalSize([in] INT image, [in] INT cx, [in] INT cy); + HRESULT SetCallback([in, unique] IUnknown *callback); + HRESULT GetCallback([in] REFIID riid, [out, iid_is(riid)] void** ppv); + HRESULT ForceImagePresent([in] INT image, DWORD flags); + HRESULT DiscardImages([in] INT first_image, [in] INT last_image, [in] DWORD flags); + HRESULT PreloadImages([in] IMAGELISTDRAWPARAMS *params); + HRESULT GetStatistics([in, out] IMAGELISTSTATS *stats); + HRESULT Initialize([in] INT cx, [in] INT cy, [in] UINT flags, [in] INT initial, [in] INT grow); + HRESULT Replace2([in] INT i, [in] HBITMAP image, [in, unique] HBITMAP mask, [in, unique] IUnknown *unk, [in] DWORD flags); + HRESULT ReplaceFromImageList([in] INT i, [in] IImageList *imagelist, [in] INT src, [in, unique] IUnknown *unk, [in] DWORD flags); +} + +[ + uuid(bcada15B-b428-420c-8d28-023590924c9f) ] library CommonControlObjects { [ - uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + uuid(7c476ba2-02b1-48f4-8048-b24619ddc058) ] coclass ImageList { interface IImageList; + interface IImageList2; } }

9 years, 11 months

Nikolay Sivov : include: Add more error codes.

by Alexandre Julliard

Module: wine Branch: master Commit: 056a8f1d2362240d9db6889895e0f500636e2e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056a8f1d2362240d9db688989… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:10:06 2014 +0400 include: Add more error codes. --- include/winbase.h | 1 - include/winerror.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index 29ff218..7432983 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1045,7 +1045,6 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define WAIT_ABANDONED STATUS_ABANDONED_WAIT_0 #define WAIT_ABANDONED_0 STATUS_ABANDONED_WAIT_0 #define WAIT_IO_COMPLETION STATUS_USER_APC -#define WAIT_TIMEOUT STATUS_TIMEOUT #define STILL_ACTIVE STATUS_PENDING #define FILE_BEGIN 0 diff --git a/include/winerror.h b/include/winerror.h index 9d988fb..3c3a53b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -239,6 +239,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MAX_THRDS_REACHED 164 #define ERROR_LOCK_FAILED 167 #define ERROR_BUSY 170 +#define ERROR_DEVICE_SUPPORT_IN_PROGRESS 171 #define ERROR_CANCEL_VIOLATION 173 #define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174 #define ERROR_INVALID_SEGMENT_NUMBER 180 @@ -272,6 +273,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_TOO_MANY_MODULES 214 #define ERROR_NESTING_NOT_ALLOWED 215 #define ERROR_EXE_MACHINE_TYPE_MISMATCH 216 +#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217 +#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218 +#define ERROR_FILE_CHECKED_OUT 220 +#define ERROR_CHECKOUT_REQUIRED 221 +#define ERROR_BAD_FILE_TYPE 222 +#define ERROR_FILE_TOO_LARGE 223 +#define ERROR_FORMS_AUTH_REQUIRED 224 +#define ERROR_VIRUS_INFECTED 225 +#define ERROR_VIRUS_DELETED 226 +#define ERROR_PIPE_LOCAL 229 #define ERROR_BAD_PIPE 230 #define ERROR_PIPE_BUSY 231 #define ERROR_NO_DATA 232 @@ -280,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 +#define WAIT_TIMEOUT 258 #define ERROR_NO_MORE_ITEMS 259 #define ERROR_CANNOT_COPY 266 #define ERROR_DIRECTORY 267 @@ -294,8 +306,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_OPLOCK_NOT_GRANTED 300 #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 +#define ERROR_DELETE_PENDING 303 +#define ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING 304 +#define ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME 305 +#define ERROR_SECURITY_STREAM_IS_INCONSISTENT 306 +#define ERROR_INVALID_LOCK_RANGE 307 +#define ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT 308 +#define ERROR_NOTIFICATION_GUID_ALREADY_DEFINED 309 +#define ERROR_INVALID_EXCEPTION_HANDLER 310 +#define ERROR_DUPLICATE_PRIVILEGES 311 +#define ERROR_NO_RANGES_PROCESSED 312 +#define ERROR_NOT_ALLOWED_ON_SYSTEM_FILE 313 +#define ERROR_DISK_RESOURCES_EXHAUSTED 314 +#define ERROR_INVALID_TOKEN 315 +#define ERROR_DEVICE_FEATURE_NOT_SUPPORTED 316 #define ERROR_MR_MID_NOT_FOUND 317 #define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_UNDEFINED_SCOPE 319 +#define ERROR_INVALID_CAP 320 +#define ERROR_DEVICE_UNREACHABLE 321 +#define ERROR_DEVICE_NO_RESOURCES 322 +#define ERROR_DATA_CHECKSUM_ERROR 323 +#define ERROR_INTERMIXED_KERNEL_EA_OPERATION 324 +#define ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED 326 +#define ERROR_OFFSET_ALIGNMENT_VIOLATION 327 +#define ERROR_INVALID_FIELD_IN_PARAMETER_LIST 328 +#define ERROR_OPERATION_IN_PROGRESS 329 +#define ERROR_BAD_DEVICE_PATH 330 +#define ERROR_TOO_MANY_DESCRIPTORS 331 +#define ERROR_SCRUB_DATA_DISABLED 332 +#define ERROR_NOT_REDUNDANT_STORAGE 333 +#define ERROR_RESIDENT_FILE_NOT_SUPPORTED 334 +#define ERROR_COMPRESSED_FILE_NOT_SUPPORTED 335 +#define ERROR_DIRECTORY_NOT_SUPPORTED 336 +#define ERROR_NOT_READ_FROM_COPY 337 +#define ERROR_FT_WRITE_FAILURE 338 +#define ERROR_FT_DI_SCAN_REQUIRED 339 +#define ERROR_INVALID_KERNEL_INFO_VERSION 340 +#define ERROR_INVALID_PEP_INFO_VERSION 341 #define ERROR_FAIL_NOACTION_REBOOT 350 #define ERROR_FAIL_SHUTDOWN 351 #define ERROR_FAIL_RESTART 352 @@ -463,7 +511,15 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_FIRMWARE_UPDATED 728 #define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 #define ERROR_WAKE_SYSTEM 730 +#define ERROR_WAIT_1 731 +#define ERROR_WAIT_2 732 +#define ERROR_WAIT_3 733 +#define ERROR_WAIT_63 734 #define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ABANDONED_WAIT_63 736 +#define ERROR_USER_APC 737 +#define ERROR_KERNEL_APC 738 +#define ERROR_ALERTED 739 #define ERROR_ELEVATION_REQUIRED 740 #define ERROR_REPARSE 741 #define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 @@ -515,6 +571,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 #define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 +#define ERROR_NO_ACE_CONDITION 804 +#define ERROR_INVALID_ACE_CONDITION 805 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

9 years, 11 months

Michael Müller : server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist.

by Alexandre Julliard

Module: wine Branch: master Commit: 9602fa7a9317f1bf856fe441dd0aeb7d0cbfa9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9602fa7a9317f1bf856fe441d… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:44:36 2014 +0200 server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist. --- dlls/kernel32/tests/pipe.c | 6 ++++++ server/named_pipe.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b192f96..f7c7531 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -60,6 +60,12 @@ static void test_CreateNamedPipe(int pipemode) trace("test_CreateNamedPipe starting in byte mode\n"); else trace("test_CreateNamedPipe starting in message mode\n"); + + /* Wait for non existing pipe */ + ret = WaitNamedPipeA(PIPENAME, 2000); + ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* Bad parameter checks */ hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, /* nMaxInstances */ 1, diff --git a/server/named_pipe.c b/server/named_pipe.c index 4c85104..4b23ba2 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -900,7 +900,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR); if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE ))) { - set_error( STATUS_PIPE_NOT_AVAILABLE ); + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return 0; } if (!(server = find_available_server( pipe )))

9 years, 11 months

Austin English : user32: Fix a comment.

by Alexandre Julliard

Module: wine Branch: master Commit: 2227abbc2cf4c89e28ab95ec3381650cb90f7951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2227abbc2cf4c89e28ab95ec3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 29 16:16:07 2014 -0700 user32: Fix a comment. --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7f91b8b..0889dac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -519,7 +519,7 @@ static void test_inputdesktop(void) ret = CloseDesktop(input_desk); ok(ret, "CloseDesktop failed!\n"); - /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); memset(name, 0, sizeof(name));

9 years, 11 months

Jump to page:

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 June 2014