August 2010 - Wine-commits - list.winehq.org

David Hedberg : shell32/tests: Some additional tests for IShellBrowser.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 008099f618de6157f2686adb7adfed981a90109d URL: http://source.winehq.org/git/wine.git/?a=commit;h=008099f618de6157f2686adb7… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:22 2010 +0200 shell32/tests: Some additional tests for IShellBrowser. --- dlls/shell32/tests/ebrowser.c | 94 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 788d644..d8f1677 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -184,9 +184,11 @@ static void test_SB_misc(void) { IExplorerBrowser *peb; IShellBrowser *psb; + IUnknown *punk; HRESULT hr; HWND retHwnd; - LONG lres; + LRESULT lres; + LONG ref; ebrowser_instantiate(&peb); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -227,9 +229,95 @@ static void test_SB_misc(void) hr = IShellBrowser_SetMenuSB(psb, NULL, NULL, NULL); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + /***** Before EB::Initialize *****/ + + /* ::GetWindow */ + retHwnd = (HWND)0xDEADBEEF; + hr = IShellBrowser_GetWindow(psb, &retHwnd); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + + todo_wine + { + + /* ::SendControlMsg */ + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_TOOLBAR, TB_CHECKBUTTON, + FCIDM_TB_SMALLICON, TRUE, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SendControlMsg(psb, FCW_TREE, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SendControlMsg(psb, FCW_PROGRESS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + /* ::QueryActiveShellView */ + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + + /* Initialize ExplorerBrowser */ + ebrowser_initialize(peb); + + /***** After EB::Initialize *****/ + + /* ::GetWindow */ + hr = IShellBrowser_GetWindow(psb, &retHwnd); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(GetParent(retHwnd) == hwnd, "The HWND returned is not our child.\n"); + + todo_wine + { + /* ::SendControlMsg */ + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_TOOLBAR, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, 1234, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + /* Returns S_OK */ + hr = IShellBrowser_SetStatusTextSB(psb, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_ContextSensitiveHelp(psb, FALSE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_EnableModelessSB(psb, TRUE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SetToolbarItems(psb, NULL, 1, 1); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + IShellBrowser_Release(psb); - lres = IExplorerBrowser_Release(peb); - ok(lres == 0, "Got %d\n", lres); + IExplorerBrowser_Destroy(peb); + ref = IExplorerBrowser_Release(peb); + ok(ref == 0, "Got %d\n", ref); } static void test_initialization(void)

1 0

David Hedberg : shell32/tests: Add some tests related to the shellview created by ExplorerBrowser.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: ab63bc0515d5cc4a9ee65df045c4cb64c9caafac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab63bc0515d5cc4a9ee65df04… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:23 2010 +0200 shell32/tests: Add some tests related to the shellview created by ExplorerBrowser. --- dlls/shell32/tests/ebrowser.c | 84 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index d8f1677..8fa8b9a 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -56,6 +56,13 @@ static HRESULT ebrowser_initialize(IExplorerBrowser *peb) return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); } +static HRESULT ebrowser_browse_to_desktop(IExplorerBrowser *peb) +{ + LPITEMIDLIST pidl_desktop; + SHGetSpecialFolderLocation (hwnd, CSIDL_DESKTOP, &pidl_desktop); + return IExplorerBrowser_BrowseToIDList(peb, pidl_desktop, 0); +} + /* Process some messages */ static void process_msgs(void) { @@ -316,6 +323,26 @@ static void test_SB_misc(void) IShellBrowser_Release(psb); IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); + + /* Browse to the desktop. */ + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); + + process_msgs(); + hr = ebrowser_browse_to_desktop(peb); + ok(hr == S_OK, "got (0x%08x)\n", hr); + process_msgs(); + + /****** After Browsing *****/ + + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + IShellBrowser_Release(psb); + IExplorerBrowser_Destroy(peb); ref = IExplorerBrowser_Release(peb); ok(ref == 0, "Got %d\n", ref); } @@ -884,6 +911,62 @@ static void test_navigation(void) ILFree(pidl_child); } +static void test_GetCurrentView(void) +{ + IExplorerBrowser *peb; + IUnknown *punk; + HRESULT hr; + + /* GetCurrentView */ + ebrowser_instantiate(&peb); + + if(0) + { + /* Crashes under Windows 7 */ + hr = IExplorerBrowser_GetCurrentView(peb, NULL, NULL); + } + hr = IExplorerBrowser_GetCurrentView(peb, NULL, (void**)&punk); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + +#define test_gcv(iid, exp) \ + do { \ + hr = IExplorerBrowser_GetCurrentView(peb, &iid, (void**)&punk); \ + ok(hr == exp, "(%s:)Expected (0x%08x), got: (0x%08x)\n", \ + #iid ,exp, hr); \ + if(SUCCEEDED(hr)) IUnknown_Release(punk); \ + } while(0) + + test_gcv(IID_IUnknown, E_FAIL); + test_gcv(IID_IUnknown, E_FAIL); + test_gcv(IID_IShellView, E_FAIL); + test_gcv(IID_IShellView2, E_FAIL); + test_gcv(IID_IFolderView, E_FAIL); + test_gcv(IID_IPersistFolder, E_FAIL); + test_gcv(IID_IPersistFolder2, E_FAIL); + test_gcv(IID_ICommDlgBrowser, E_FAIL); + test_gcv(IID_ICommDlgBrowser2, E_FAIL); + test_gcv(IID_ICommDlgBrowser3, E_FAIL); + + ebrowser_initialize(peb); + ebrowser_browse_to_desktop(peb); + + test_gcv(IID_IUnknown, S_OK); + test_gcv(IID_IUnknown, S_OK); + test_gcv(IID_IShellView, S_OK); + test_gcv(IID_IShellView2, S_OK); + test_gcv(IID_IFolderView, S_OK); + todo_wine test_gcv(IID_IPersistFolder, S_OK); + test_gcv(IID_IPersistFolder2, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser2, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser3, E_NOINTERFACE); + +#undef test_gcv + + IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -933,6 +1016,7 @@ START_TEST(ebrowser) test_basics(); test_Advise(); test_navigation(); + test_GetCurrentView(); DestroyWindow(hwnd); OleUninitialize();

1 0

David Hedberg : shell32/tests: Add some event tests to ExplorerBrowser tests.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b2a8de3de65a0a716414b84e9e6538fb1f55c08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8de3de65a0a716414b84e9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:24 2010 +0200 shell32/tests: Add some event tests to ExplorerBrowser tests. --- dlls/shell32/tests/ebrowser.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 8fa8b9a..60472a4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -631,6 +631,11 @@ static void test_Advise(void) ok(ebev.ref == 10, "Got %d\n", ebev.ref); + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 10, "Got %d\n", ebev.completed); + /* Remove a bunch somewhere in the middle */ for(i = 4; i < 8; i++) { @@ -638,6 +643,11 @@ static void test_Advise(void) ok(hr == S_OK, "got (0x%08x)\n", hr); } + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 6, "Got %d\n", ebev.completed); + if(0) { /* Using unadvise with a previously unadvised cookie results @@ -657,6 +667,11 @@ static void test_Advise(void) ok(ebev.ref == 0, "Got %d\n", ebev.ref); + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 0, "Got %d\n", ebev.completed); + /* ::Destroy implies ::Unadvise. */ hr = IExplorerBrowser_Advise(peb, pebe, &cookies[0]); ok(hr == S_OK, "Got 0x%08x\n", hr);

1 0

Jeff Cook : winealsa.drv: Only filllines_no_master with micelem when micelem is found.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: e699184e480cc2044a66b264f576e4c3c87bf9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e699184e480cc2044a66b264f… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Mon Aug 23 18:53:50 2010 -0600 winealsa.drv: Only filllines_no_master with micelem when micelem is found. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 9a2cf85..ffa0292 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -575,7 +575,7 @@ static void ALSA_MixerInit(void) if (mastelem) filllines(&mixdev[mixnum], mastelem, captelem, capcontrols); - else + else if (micelem) filllines_no_master(&mixdev[mixnum], micelem, 1); fillcontrols(&mixdev[mixnum]);

1 0

Amine Khaldi : mpr: Fix Bulgarian translation.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 7bc214bb2d8abd8dea270b1106162a2c79637a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc214bb2d8abd8dea270b110… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Tue Aug 24 13:45:53 2010 +0100 mpr: Fix Bulgarian translation. --- dlls/mpr/mpr_Bg.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/mpr_Bg.rc b/dlls/mpr/mpr_Bg.rc index 7b0597a..a3f15a6 100644 --- a/dlls/mpr/mpr_Bg.rc +++ b/dlls/mpr/mpr_Bg.rc @@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg" /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "��", -1, 40, 66, 50, 10 LTEXT "��", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD,

1 0

Alexandre Julliard : winebuild: Add support for specifying thiscall calling convention.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b116040771d85595f50e3b0eba526fcb3a98c96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b116040771d85595f50e3b0eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 15:20:00 2010 +0200 winebuild: Add support for specifying thiscall calling convention. --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 1 + tools/winebuild/parser.c | 13 +++++++++++++ tools/winebuild/spec32.c | 2 ++ tools/winebuild/winebuild.man.in | 5 +++++ 5 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 85b8427..ef91961 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -47,6 +47,7 @@ typedef enum TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ + TYPE_THISCALL, /* thiscall function (Win32 on i386) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a221a9d..6a77a3f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -457,6 +457,7 @@ static void check_undefined_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_CDECL: case TYPE_VARARGS: + case TYPE_THISCALL: if (link_ext_symbols) { odp->flags |= FLAG_EXT_LINK; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index f48471c..459bf97 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -56,6 +56,7 @@ static const char * const TypeNames[TYPE_NBTYPES] = "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ + "thiscall", /* TYPE_THISCALL */ "extern" /* TYPE_EXTERN */ }; @@ -235,6 +236,11 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) error( "'stdcall' not supported for Win16\n" ); return 0; } + if (!is_win32 && odp->type == TYPE_THISCALL) + { + error( "'thiscall' not supported for Win16\n" ); + return 0; + } if (is_win32 && odp->type == TYPE_PASCAL) { error( "'pascal' not supported for Win32\n" ); @@ -325,6 +331,12 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } + if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL && !(odp->flags & FLAG_FORWARD)) + { + char *link_name = strmake( "__thiscall_%s", odp->link_name ); + free( odp->link_name ); + odp->link_name = link_name; + } return 1; } @@ -524,6 +536,7 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3152660..cf0b76e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -246,6 +246,7 @@ void output_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: if (odp->flags & FLAG_FORWARD) { output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); @@ -816,6 +817,7 @@ void output_def_file( DLLSPEC *spec, int include_private ) /* fall through */ case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: /* try to reduce output */ if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 5ea9465..fb554f7 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -325,6 +325,11 @@ for a Win16 or Win32 function using the C calling convention .B varargs for a Win16 or Win32 function using the C calling convention with a variable number of arguments +.TP +.B thiscall +for a Win32 function using the +.I thiscall +calling convention (first parameter in %ecx register on i386) .RE .PP .I args

1 0

Alexandre Julliard : msvcrt: Use the thiscall type on appropriate entry points.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b21e28ca116d43757c923bebc46674ed7679455d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21e28ca116d43757c923bebc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:24:01 2010 +0200 msvcrt: Use the thiscall type on appropriate entry points. --- dlls/msvcirt/msvcirt.spec | 34 +++++++++--------- dlls/msvcr100/msvcr100.spec | 64 +++++++++++++++++----------------- dlls/msvcr70/msvcr70.spec | 80 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 64 +++++++++++++++++----------------- dlls/msvcr80/msvcr80.spec | 60 ++++++++++++++++---------------- dlls/msvcr90/msvcr90.spec | 60 ++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 82 +++++++++++++++++++++--------------------- dlls/msvcrt40/msvcrt40.spec | 72 +++++++++++++++++++------------------- dlls/msvcrtd/msvcrtd.spec | 72 +++++++++++++++++++------------------- 9 files changed, 294 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b21e28ca116d43757c923…

1 0

Alexandre Julliard : msvcp90: Use the thiscall type on appropriate entry points.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: c6423058db9b4b1c44d7a7d48a5356365d6ed673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6423058db9b4b1c44d7a7d48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:24:18 2010 +0200 msvcp90: Use the thiscall type on appropriate entry points. --- dlls/msvcp80/msvcp80.spec | 92 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.spec | 92 ++++++++++++++++++++++---------------------- 2 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6423058db9b4b1c44d7a…

1 0

Alexandre Julliard : msvcrt: Use a __thiscall macro where appropriate to make the calling convention clearer .
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 14072676a60488413ccea6fe801bf9c97f20e9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14072676a60488413ccea6fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:31:25 2010 +0200 msvcrt: Use a __thiscall macro where appropriate to make the calling convention clearer. --- dlls/msvcirt/msvcirt.c | 16 +++++---- dlls/msvcp90/exception.c | 44 +++++++++++++------------- dlls/msvcp90/memory.c | 72 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/string.c | 20 ++++++------ dlls/msvcrt/cpp.c | 76 +++++++++++++++++++++++---------------------- 6 files changed, 118 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14072676a60488413ccea…

1 0

Alexandre Julliard : winapi: Add support for the thiscall keyword.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: f756821df3dd332705018e81bac4e41129f1525a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f756821df3dd332705018e81b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:34:35 2010 +0200 winapi: Add support for the thiscall keyword. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index dcd9268..928476d 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -281,7 +281,7 @@ sub parse_spec_file($$) { my $ordinal; my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ - (cdecl|pascal|stdcall|varargs)\s+ + (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2;

1 0