September 2009 - Wine-Commits

Alexandre Julliard : configure: Add a . exe extension to the tools dependencies when building on Windows.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: b860c4aab0da47ce8f6baeba083099f03a3d203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b860c4aab0da47ce8f6baeba0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 22:36:13 2009 +0200 configure: Add a .exe extension to the tools dependencies when building on Windows. --- Make.rules.in | 18 +++++++++--------- Makefile.in | 2 +- configure | 3 +++ configure.ac | 1 + libs/wine/Makefile.in | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7220245..4386723 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -32,6 +32,7 @@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ LIBEXT = @LIBEXT@ DLLEXT = @DLLEXT@ +TOOLSEXT = @TOOLSEXT@ IMPLIBEXT = @IMPLIBEXT@ LDSHARED = @LDSHARED@ DLLTOOL = @DLLTOOL@ @@ -65,16 +66,15 @@ WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild -MAKEDEP = $(TOOLSDIR)/tools/makedep -MAKECTESTS = $(TOOLSDIR)/tools/make_ctests -WRC = $(TOOLSDIR)/tools/wrc/wrc -WMC = $(TOOLSDIR)/tools/wmc/wmc -WIDL = $(TOOLSDIR)/tools/widl/widl +WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) +MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) +MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT) +WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) +WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) +WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) -RELPATH = $(TOOLSDIR)/tools/relpath -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt -FNT2FON = $(TOOLSDIR)/tools/fnt2fon +RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT) +SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) RC = $(WRC) RC16 = $(WRC) RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) diff --git a/Makefile.in b/Makefile.in index 690b003..2d2d8b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,7 +119,7 @@ RECURSE_TARGETS = \ depend $(RECURSE_TARGETS): $(MAKEDEP) $(MAKEDEP): include/config.h - @cd $(TOOLSDIR)/tools && $(MAKE) makedep + @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) # Test rules diff --git a/configure b/configure index 052154b..d8db56d 100755 --- a/configure +++ b/configure @@ -612,6 +612,7 @@ EXTRA_BINARIES MAIN_BINARY SOCKETLIBS CRTLIBS +TOOLSEXT LDPATH BUILTINFLAG EXTRACFLAGS @@ -11971,6 +11972,8 @@ LDPATH="" case $build_os in cygwin*|mingw32*) + TOOLSEXT=".exe" + LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"" ;; darwin*|macosx*) diff --git a/configure.ac b/configure.ac index 1563876..5c753c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1593,6 +1593,7 @@ dnl **** Platform-specific checks **** AC_SUBST(LDPATH,"") case $build_os in cygwin*|mingw32*) + AC_SUBST(TOOLSEXT,".exe") LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"" ;; darwin*|macosx*) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5af1f94..4be8301 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -182,6 +182,6 @@ clean:: $(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c $(RELPATH): - @cd $(TOOLSDIR)/tools && $(MAKE) relpath + @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : msvcrt: Fix the strtol/strtoul definitions.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 835928720b0bc38a4f362a363997240b0fbf0bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=835928720b0bc38a4f362a363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 22:34:50 2009 +0200 msvcrt: Fix the strtol/strtoul definitions. --- dlls/msvcrt/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index aacf114..a5f9a19 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -255,7 +255,7 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, /****************************************************************** * strtol (MSVCRT.@) */ -long int MSVCRT_strtol(const char* nptr, char** end, int base) +MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) { /* wrapper to forward libc error code to msvcrt's error codes */ long ret; @@ -289,7 +289,7 @@ long int MSVCRT_strtol(const char* nptr, char** end, int base) /****************************************************************** * strtoul (MSVCRT.@) */ -unsigned long int MSVCRT_strtoul(const char* nptr, char** end, int base) +MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) { /* wrapper to forward libc error code to msvcrt's error codes */ unsigned long ret;

1 0

Paul Vriens : user32/tests: Run tests again on Win95.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 84153c09cba5ca9a98b1549bdbca2ee8248faa07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84153c09cba5ca9a98b1549bd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 1 16:09:27 2009 +0200 user32/tests: Run tests again on Win95. --- dlls/user32/tests/input.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0dd3f7e..1d2741e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -970,7 +970,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; reset_key_status(); - SendInput(1, (INPUT*)inputs, sizeof(INPUT)); + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -992,7 +992,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; reset_key_status(); - SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + pSendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1018,7 +1018,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1045,7 +1045,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg);

1 0

Alexandre Julliard : server: Disable large files for procfs on Solaris.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: a30778b34a12fc917300c7a0a98914f0f7e607fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30778b34a12fc917300c7a0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 17:39:51 2009 +0200 server: Disable large files for procfs on Solaris. --- server/procfs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/procfs.c b/server/procfs.c index 3b74e14..f7d9073 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -39,6 +39,9 @@ #ifdef USE_PROCFS +/* procfs doesn't support large files */ +# undef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 32 #include <procfs.h> static int open_proc_as( struct process *process, int flags )

1 0

Jan de Mooij : comctl32/propsheet: Update position of hidden buttons too.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 2f8e5da90f819b0fba565b96ac06263463d06296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8e5da90f819b0fba565b96a… Author: Jan de Mooij <jandemooij(a)gmail.com> Date: Mon Aug 31 14:09:00 2009 +0200 comctl32/propsheet: Update position of hidden buttons too. --- dlls/comctl32/propsheet.c | 31 +++++++------------ dlls/comctl32/tests/propsheet.c | 62 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e767444..4759d4c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -904,7 +904,7 @@ static BOOL PROPSHEET_AdjustButtons(HWND hwndParent, const PropSheetInfo* psInfo */ hwndButton = GetDlgItem(hwndParent, IDCANCEL); - x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 1)); + x += padding.x + buttonWidth; SetWindowPos(hwndButton, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -914,34 +914,25 @@ static BOOL PROPSHEET_AdjustButtons(HWND hwndParent, const PropSheetInfo* psInfo */ hwndButton = GetDlgItem(hwndParent, IDC_APPLY_BUTTON); - if (psInfo->hasApply) - { - if (psInfo->hasHelp) - x = rcSheet.right - ((padding.x + buttonWidth) * 2); - else - x = rcSheet.right - (padding.x + buttonWidth); - - SetWindowPos(hwndButton, 0, x, y, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); - - EnableWindow(hwndButton, FALSE); - } + if(psInfo->hasApply) + x += padding.x + buttonWidth; else ShowWindow(hwndButton, SW_HIDE); + SetWindowPos(hwndButton, 0, x, y, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + EnableWindow(hwndButton, FALSE); + /* * Position Help button. */ hwndButton = GetDlgItem(hwndParent, IDHELP); - if (psInfo->hasHelp) - { - x = rcSheet.right - (padding.x + buttonWidth); + x += padding.x + buttonWidth; + SetWindowPos(hwndButton, 0, x, y, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); - SetWindowPos(hwndButton, 0, x, y, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); - } - else + if(!psInfo->hasHelp) ShowWindow(hwndButton, SW_HIDE); return TRUE; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index cf5c201..0eebe33 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1,6 +1,7 @@ /* Unit test suite for property sheet control. * * Copyright 2006 Huw Davies + * Copyright 2009 Jan de Mooij * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +29,8 @@ static HWND parent; static LONG active_page = -1; +#define IDC_APPLY_BUTTON 12321 + static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) @@ -341,6 +344,64 @@ static void test_wiznavigation(void) DestroyWindow(hdlg); } +static void test_buttons(void) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg; + HWND button; + RECT rc; + int prevRight, top; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + U(psp).pszTemplate = "prop_page1"; + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)PropertySheetA(&psh); + + /* OK button */ + button = GetDlgItem(hdlg, IDOK); + GetWindowRect(button, &rc); + prevRight = rc.right; + top = rc.top; + + /* Cancel button */ + button = GetDlgItem(hdlg, IDCANCEL); + GetWindowRect(button, &rc); + ok(rc.top == top, "Cancel button should have same top as OK button\n"); + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + prevRight = rc.right; + + button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); + GetWindowRect(button, &rc); + ok(rc.top == top, "Apply button should have same top as OK button\n"); + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + prevRight = rc.right; + + button = GetDlgItem(hdlg, IDHELP); + GetWindowRect(button, &rc); + ok(rc.top == top, "Help button should have same top as OK button\n"); + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + + DestroyWindow(hdlg); +} START_TEST(propsheet) { @@ -348,4 +409,5 @@ START_TEST(propsheet) test_nopage(); test_disableowner(); test_wiznavigation(); + test_buttons(); }

1 0

Vladimir Pankratov : setupapi: Add stub for SetupDiGetClassImageIndex.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: e94d30ed6edfe9e06546f278434d8d2bf49ac6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d30ed6edfe9e06546f2784… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Sep 1 14:48:12 2009 +0500 setupapi: Add stub for SetupDiGetClassImageIndex. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2cc20d0..fd77b50 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -322,7 +322,7 @@ @ stdcall SetupDiGetClassDevsExA(ptr str ptr long ptr str ptr) @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) @ stdcall SetupDiGetClassDevsW(ptr ptr long long) -@ stub SetupDiGetClassImageIndex +@ stdcall SetupDiGetClassImageIndex(ptr ptr ptr) @ stdcall SetupDiGetClassImageList(ptr) @ stub SetupDiGetClassImageListExA @ stub SetupDiGetClassImageListExW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 438a7fc..7ba85b6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -259,6 +259,15 @@ BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) } /*********************************************************************** + * SetupDiGetClassImageList (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData, const GUID *class, PINT index) +{ + FIXME("%p %p %p\n", ClassImageListData, class, index); + return FALSE; +} + +/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Sergey Khodych : user32/tests: Fix a typo.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: aa8129a338b698715035ec5bb20a43c026112fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8129a338b698715035ec5bb… Author: Sergey Khodych <khodych(a)gmail.com> Date: Fri Aug 28 02:32:44 2009 +0300 user32/tests: Fix a typo. --- dlls/user32/tests/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index f10b798..5ca012e 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2105,7 +2105,7 @@ static void zero_dm_messages(void) ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ - "got %d\n", wmgetdefid, dm_messages.wm_nextdlgctl) + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) {

1 0

Huw Davies : msdaps: Implement IDBDataSourceAdmin_CreateDataSource proxy and stub.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: e2ec1f56309a322dbea920bb4eee647146f2fbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ec1f56309a322dbea920bb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 1 10:09:37 2009 +0100 msdaps: Implement IDBDataSourceAdmin_CreateDataSource proxy and stub. --- dlls/msdaps/usrmarshal.c | 48 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b113667..94a5ec5 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -229,9 +229,37 @@ HRESULT CALLBACK IDBDataSourceAdmin_CreateDataSource_Proxy(IDBDataSourceAdmin* T DBPROPSET rgPropertySets[], IUnknown *pUnkOuter, REFIID riid, IUnknown **ppDBSession) { - FIXME("(%p, %d, %p, %p, %s, %p): stub\n", This, cPropertySets, rgPropertySets, pUnkOuter, + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + IErrorInfo *error; + DBPROPSTATUS *status; + + TRACE("(%p, %d, %p, %p, %s, %p)\n", This, cPropertySets, rgPropertySets, pUnkOuter, debugstr_guid(riid), ppDBSession); - return E_NOTIMPL; + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + total_props += rgPropertySets[prop_set].cProperties; + + if(total_props == 0) return S_OK; + + status = CoTaskMemAlloc(total_props * sizeof(*status)); + if(!status) return E_OUTOFMEMORY; + + hr = IDBDataSourceAdmin_RemoteCreateDataSource_Proxy(This, cPropertySets, rgPropertySets, pUnkOuter, + riid, ppDBSession, total_props, status, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + total_props = 0; + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropertySets[prop_set].rgProperties[prop].dwStatus = status[total_props++]; + + CoTaskMemFree(status); + return hr; } HRESULT __RPC_STUB IDBDataSourceAdmin_CreateDataSource_Stub(IDBDataSourceAdmin* This, ULONG cPropertySets, @@ -239,9 +267,21 @@ HRESULT __RPC_STUB IDBDataSourceAdmin_CreateDataSource_Stub(IDBDataSourceAdmin* REFIID riid, IUnknown **ppDBSession, ULONG cTotalProps, DBPROPSTATUS *rgPropStatus, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %d, %p, %p, %s, %p, %d, %p, %p): stub\n", This, cPropertySets, rgPropertySets, pUnkOuter, + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + + TRACE("(%p, %d, %p, %p, %s, %p, %d, %p, %p)\n", This, cPropertySets, rgPropertySets, pUnkOuter, debugstr_guid(riid), ppDBSession, cTotalProps, rgPropStatus, ppErrorInfoRem); - return E_NOTIMPL; + + *ppErrorInfoRem = NULL; + hr = IDBDataSourceAdmin_CreateDataSource(This, cPropertySets, rgPropertySets, pUnkOuter, riid, ppDBSession); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropStatus[total_props++] = rgPropertySets[prop_set].rgProperties[prop].dwStatus; + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_DestroyDataSource_Proxy(IDBDataSourceAdmin* This)

1 0

Jacek Caban : jscript: Added String.lastIndexOf implementation.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 8988156255a4173b328c3a956b2857011fd390a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8988156255a4173b328c3a956… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 13:27:08 2009 +0200 jscript: Added String.lastIndexOf implementation. --- dlls/jscript/string.c | 84 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 20 +++++++++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3b0ad59..4311aee 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -562,11 +562,91 @@ static HRESULT String_italics(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, italicstagW); } +/* ECMA-262 3rd Edition 15.5.4.8 */ static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR search_str, val_str = NULL; + DWORD length, pos, search_len; + const WCHAR *str; + INT ret = -1; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; + }else { + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = -1; + } + SysFreeString(val_str); + return S_OK; + } + + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &search_str); + if(FAILED(hres)) { + SysFreeString(val_str); + return hres; + } + + search_len = SysStringLen(search_str); + + if(arg_cnt(dp) >= 2) { + VARIANT ival; + + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &ival); + if(SUCCEEDED(hres)) { + if(V_VT(&ival) == VT_I4) + pos = V_VT(&ival) > 0 ? V_I4(&ival) : 0; + else + pos = V_R8(&ival) > 0.0 ? length : 0; + if(pos > length) + pos = length; + } + }else { + pos = length; + } + + if(SUCCEEDED(hres) && length >= search_len) { + const WCHAR *ptr; + + for(ptr = str+min(pos, length-search_len); ptr >= str; ptr--) { + if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) { + ret = ptr-str; + break; + } + } + } + + SysFreeString(search_str); + SysFreeString(val_str); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = ret; + } + return S_OK; } static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d5d7fb3..cff7114 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -114,6 +114,7 @@ ok(str.toString() === "test", "str.toString() = " + str.toString()); var strObj = new Object(); strObj.toString = function() { return "abcd" }; strObj.substr = String.prototype.substr; +strObj.lastIndexOf = String.prototype.lastIndexOf; tmp = "value " + str; ok(tmp === "value test", "'value ' + str = " + tmp); @@ -294,6 +295,25 @@ ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf(); ok(tmp == -1, "indexOf = " + tmp); +tmp = "abcd".lastIndexOf("bc",1); +ok(tmp === 1, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("bc",2); +ok(tmp === 1, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("bc"); +ok(tmp === 1, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("ac"); +ok(tmp === -1, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("d",10); +ok(tmp === 3, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("bc",0,"test"); +ok(tmp === -1, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf(); +ok(tmp === -1, "lastIndexOf = " + tmp); +tmp = "aaaa".lastIndexOf("a",2); +ok(tmp == 2, "lastIndexOf = " + tmp); +tmp = strObj.lastIndexOf("b"); +ok(tmp === 1, "lastIndexOf = " + tmp); + tmp = "".toLowerCase(); ok(tmp === "", "''.toLowerCase() = " + tmp); tmp = "test".toLowerCase();

1 0

Jacek Caban : jscript: Code clean up.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 81fc9ade37436728a0f76d5b4b6940745c794cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fc9ade37436728a0f76d5b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 13:26:34 2009 +0200 jscript: Code clean up. --- dlls/jscript/array.c | 2 +- dlls/jscript/function.c | 5 ++--- dlls/jscript/string.c | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 04f3dde..1c2b95a 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -315,7 +315,7 @@ static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(arg_cnt(dp)) { BSTR sep; - hres = to_string(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &sep); + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &sep); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index a1d0987..772c29a 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -70,12 +70,11 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, HRESULT hres; V_VT(&var_empty) = VT_EMPTY; - cargs = dp->cArgs - dp->cNamedArgs; + cargs = arg_cnt(dp); for(param = function->parameters; param; param = param->next) { hres = jsdisp_propput_name(var_disp, param->identifier, lcid, - i < cargs ? dp->rgvarg + dp->cArgs-1 - i : &var_empty, - ei, caller); + i < cargs ? get_arg(dp,i) : &var_empty, ei, caller); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 2350f56..3b0ad59 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1066,7 +1066,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } if(arg_cnt(dp)) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres; @@ -1089,7 +1089,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } if(arg_cnt(dp) >= 2) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres; @@ -1325,7 +1325,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } if(arg_cnt(dp) >= 1) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres; @@ -1343,7 +1343,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } if(arg_cnt(dp) >= 2) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres; @@ -1412,7 +1412,7 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } if(arg_cnt(dp) >= 1) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres; @@ -1430,7 +1430,7 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } if(arg_cnt(dp) >= 2) { - hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) { SysFreeString(val_str); return hres;

1 0