July 2009 - Wine-Commits - list.winehq.org

Owen Rudge : appwiz.cpl: Execute installer when Modify clicked.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: bf3574a4e101bb1c1a24b7e115d29e26858526a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3574a4e101bb1c1a24b7e11… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 14 17:24:51 2009 -0300 appwiz.cpl: Execute installer when Modify clicked. --- dlls/appwiz.cpl/appwiz.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1815320..0d9e555 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -489,8 +489,9 @@ static void InstallProgram(HWND hWnd) * Name : UninstallProgram * Description: Executes the specified program's installer. * Parameters : id - the internal ID of the installer to remove + * Parameters : button - ID of button pressed (Modify or Remove) */ -static void UninstallProgram(int id) +static void UninstallProgram(int id, DWORD button) { APPINFO *iter; STARTUPINFOW si; @@ -513,8 +514,9 @@ static void UninstallProgram(int id) memset(&si, 0, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); si.wShowWindow = SW_NORMAL; - res = CreateProcessW(NULL, iter->path, NULL, NULL, FALSE, 0, NULL, - NULL, &si, &info); + + res = CreateProcessW(NULL, (button == IDC_MODIFY) ? iter->path_modify : iter->path, + NULL, NULL, FALSE, 0, NULL, NULL, &si, &info); if (res) { @@ -856,6 +858,7 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar break; case IDC_ADDREMOVE: + case IDC_MODIFY: selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, LVNI_FOCUSED|LVNI_SELECTED); @@ -866,7 +869,7 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar if (SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETITEMW, 0, (LPARAM) &lvItem)) - UninstallProgram(lvItem.lParam); + UninstallProgram(lvItem.lParam, LOWORD(wParam)); } hImageList = ResetApplicationList(FALSE, hWnd, hImageList);

1 0

Owen Rudge : appwiz.cpl: Enable/disable Modify button, and modify title on Remove button, as appropriate.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 812e60476568758f2ffe34f6235bc61480bfd811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812e60476568758f2ffe34f62… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 14 17:24:40 2009 -0300 appwiz.cpl: Enable/disable Modify button, and modify title on Remove button, as appropriate. --- dlls/appwiz.cpl/appwiz.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 5ad4863..1815320 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -73,6 +73,9 @@ typedef struct APPINFO { static struct APPINFO *AppInfo = NULL; static HINSTANCE hInst; +static WCHAR btnRemove[MAX_STRING_LEN]; +static WCHAR btnModifyRemove[MAX_STRING_LEN]; + static const WCHAR openW[] = {'o','p','e','n',0}; /* names of registry keys */ @@ -401,10 +404,42 @@ static inline void EmptyList(void) */ static void UpdateButtons(HWND hWnd) { - BOOL sel = SendMessageW(GetDlgItem(hWnd, IDL_PROGRAMS), LVM_GETSELECTEDCOUNT, 0, 0) != 0; + APPINFO *iter; + LVITEMW lvItem; + DWORD selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, + LVNI_FOCUSED | LVNI_SELECTED); + BOOL enable_modify = FALSE; + + if (selitem != -1) + { + lvItem.iItem = selitem; + lvItem.mask = LVIF_PARAM; + + if (SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETITEMW, 0, (LPARAM) &lvItem)) + { + for (iter = AppInfo; iter; iter = iter->next) + { + if (iter->id == lvItem.lParam) + { + /* Decide whether to display Modify/Remove as one button or two */ + enable_modify = (iter->path_modify != NULL); + + /* Update title as appropriate */ + if (iter->path_modify == NULL) + SetWindowTextW(GetDlgItem(hWnd, IDC_ADDREMOVE), btnModifyRemove); + else + SetWindowTextW(GetDlgItem(hWnd, IDC_ADDREMOVE), btnRemove); + + break; + } + } + } + } - EnableWindow(GetDlgItem(hWnd, IDC_ADDREMOVE), sel); - EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_INFO), sel); + /* Enable/disable other buttons if necessary */ + EnableWindow(GetDlgItem(hWnd, IDC_ADDREMOVE), (selitem != -1)); + EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_INFO), (selitem != -1)); + EnableWindow(GetDlgItem(hWnd, IDC_MODIFY), enable_modify); } /****************************************************************************** @@ -875,6 +910,8 @@ static void StartApplet(HWND hWnd) /* Load the strings we will use */ LoadStringW(hInst, IDS_TAB1_TITLE, tab_title, sizeof(tab_title) / sizeof(tab_title[0])); LoadStringW(hInst, IDS_CPL_TITLE, app_title, sizeof(app_title) / sizeof(app_title[0])); + LoadStringW(hInst, IDS_REMOVE, btnRemove, sizeof(btnRemove) / sizeof(btnRemove[0])); + LoadStringW(hInst, IDS_MODIFY_REMOVE, btnModifyRemove, sizeof(btnModifyRemove) / sizeof(btnModifyRemove[0])); /* Fill out the PROPSHEETPAGE */ psp.dwSize = sizeof (PROPSHEETPAGEW);

1 0

Owen Rudge : appwiz.cpl: Read modification path from registry.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 2f541542991a82fb2d169e6470af0b90f997bf0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f541542991a82fb2d169e647… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 14 17:24:29 2009 -0300 appwiz.cpl: Read modification path from registry. --- dlls/appwiz.cpl/appwiz.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index daf3e82..5ad4863 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -56,6 +56,7 @@ typedef struct APPINFO { LPWSTR title; LPWSTR path; + LPWSTR path_modify; LPWSTR icon; int iconIdx; @@ -85,6 +86,8 @@ static const WCHAR ContactW[] = {'C','o','n','t','a','c','t',0}; static const WCHAR HelpLinkW[] = {'H','e','l','p','L','i','n','k',0}; static const WCHAR HelpTelephoneW[] = {'H','e','l','p','T','e','l','e','p','h', 'o','n','e',0}; +static const WCHAR ModifyPathW[] = {'M','o','d','i','f','y','P','a','t','h',0}; +static const WCHAR NoModifyW[] = {'N','o','M','o','d','i','f','y',0}; static const WCHAR ReadmeW[] = {'R','e','a','d','m','e',0}; static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I', 'n','f','o',0}; @@ -129,6 +132,7 @@ static void FreeAppInfo(APPINFO *info) HeapFree(GetProcessHeap(), 0, info->title); HeapFree(GetProcessHeap(), 0, info->path); + HeapFree(GetProcessHeap(), 0, info->path_modify); HeapFree(GetProcessHeap(), 0, info->icon); HeapFree(GetProcessHeap(), 0, info->publisher); HeapFree(GetProcessHeap(), 0, info->version); @@ -149,6 +153,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) HKEY hkeyUninst, hkeyApp; int i, id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; + DWORD dwNoModify, dwType; WCHAR subKeyName[256]; WCHAR key_app[MAX_STRING_LEN]; WCHAR *p; @@ -273,6 +278,34 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) &displen); } + /* Check if NoModify is set */ + dwType = REG_DWORD; + dwNoModify = 0; + displen = sizeof(DWORD); + + if (RegQueryValueExW(hkeyApp, NoModifyW, NULL, &dwType, (LPBYTE)&dwNoModify, &displen) + != ERROR_SUCCESS) + { + dwNoModify = 0; + } + + /* Some installers incorrectly create a REG_SZ instead of a REG_DWORD - check for + ASCII 49, which equals 1 */ + if (dwType == REG_SZ) + dwNoModify = (dwNoModify == 49) ? 1 : 0; + + /* Fetch the modify path */ + if ((dwNoModify == 0) && (RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, NULL, &displen) + == ERROR_SUCCESS)) + { + iter->path_modify = HeapAlloc(GetProcessHeap(), 0, displen); + + if (!iter->path_modify) + goto err; + + RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, (LPBYTE)iter->path_modify, &displen); + } + /* registry key */ iter->regroot = root; lstrcpyW(iter->regkey, subKeyName);

1 0

Owen Rudge : appwiz.cpl: Replace Add/ Remove button with separate Modify and Remove buttons.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 051e85d39fa8530fdbf2c82bd8771b5781d2d792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=051e85d39fa8530fdbf2c82bd… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 14 17:24:11 2009 -0300 appwiz.cpl: Replace Add/Remove button with separate Modify and Remove buttons. --- dlls/appwiz.cpl/De.rc | 9 +++++++-- dlls/appwiz.cpl/En.rc | 8 ++++++-- dlls/appwiz.cpl/Fr.rc | 8 ++++++-- dlls/appwiz.cpl/Ja.rc | 8 ++++++-- dlls/appwiz.cpl/Ko.rc | 8 ++++++-- dlls/appwiz.cpl/Lt.rc | 8 ++++++-- dlls/appwiz.cpl/Nl.rc | 8 ++++++-- dlls/appwiz.cpl/No.rc | 8 ++++++-- dlls/appwiz.cpl/Pt.rc | 8 ++++++-- dlls/appwiz.cpl/Ro.rc | 8 ++++++-- dlls/appwiz.cpl/Ru.rc | 8 ++++++-- dlls/appwiz.cpl/Si.rc | 8 ++++++-- dlls/appwiz.cpl/Sv.rc | 8 ++++++-- dlls/appwiz.cpl/Zh.rc | 8 ++++++-- dlls/appwiz.cpl/res.h | 3 +++ 15 files changed, 88 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=051e85d39fa8530fdbf2c…

1 0

Nikolay Sivov : comctl32/header: Fix hittesting flags, extend tests a bit.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: ce372ca4dbb2cfd80f4a05b70ca274e402c3ace9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce372ca4dbb2cfd80f4a05b70… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 15 00:11:12 2009 +0400 comctl32/header: Fix hittesting flags, extend tests a bit. --- dlls/comctl32/header.c | 6 ++++-- dlls/comctl32/tests/header.c | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 1ee58cd..7c8f161 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1224,10 +1224,12 @@ HEADER_GetUnicodeFormat (const HEADER_INFO *infoPtr) static LRESULT HEADER_HitTest (const HEADER_INFO *infoPtr, LPHDHITTESTINFO phti) { + UINT outside = HHT_NOWHERE | HHT_ABOVE | HHT_BELOW | HHT_TOLEFT | HHT_TORIGHT; + HEADER_InternalHitTest (infoPtr, &phti->pt, &phti->flags, &phti->iItem); - if (phti->flags == HHT_NOWHERE) - return -1; + if (phti->flags & outside) + return phti->iItem = -1; else return phti->iItem; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index bf3960e..611433e 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -904,6 +904,7 @@ static void test_hdm_hittest(HWND hParent) retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); expect(0, retVal); expect(0, hdHitTestInfo.iItem); + expect(HHT_ONDIVIDER, hdHitTestInfo.flags); pt.x = secondItemRightBoundary - 1; pt.y = bottomBoundary - 1; @@ -911,15 +912,15 @@ static void test_hdm_hittest(HWND hParent) retVal = SendMessage(hChild, HDM_HITTEST, 1, (LPARAM) &hdHitTestInfo); expect(1, retVal); expect(1, hdHitTestInfo.iItem); + expect(HHT_ONDIVIDER, hdHitTestInfo.flags); pt.x = secondItemRightBoundary; pt.y = bottomBoundary + 1; hdHitTestInfo.pt = pt; - todo_wine - { - retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); - expect(-1, retVal); - } + retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); + expect(-1, retVal); + expect(-1, hdHitTestInfo.iItem); + expect(HHT_BELOW, hdHitTestInfo.flags); ok_sequence(sequences, HEADER_SEQ_INDEX, hittest_seq, "hittest sequence testing", FALSE);

1 0

Aric Stewart : devenum: Add Japanese resource.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: af6de9d7a35d2fffebe4b095dcf8036860faa09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6de9d7a35d2fffebe4b095d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 14 13:46:09 2009 -0500 devenum: Add Japanese resource. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index b9ff4a5..60dd59b 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -170,3 +170,12 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL 9 "Numatytasis WaveOut įrenginys" 10 "Numatytasis MidiOut įrenginys" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ + 7 "デフォルト DirectSound" + 8 "DirectSound: %s" + 9 "デフォルト WaveOut デバイス" + 10 "デフォルト MidiOut デバイス" +}

1 0

Aric Stewart : iccvid: Add Japanese resource.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: e9037ebe40a9cd34fd33d897bd1b7916781e78ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9037ebe40a9cd34fd33d897b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 14 13:38:34 2009 -0500 iccvid: Add Japanese resource. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_Ja.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 1a2fd75..6fdf13d 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ iccvid_En.rc \ iccvid_Fr.rc \ iccvid_Hu.rc \ + iccvid_Ja.rc \ iccvid_Ko.rc \ iccvid_Lt.rc \ iccvid_Nl.rc \ diff --git a/dlls/iccvid/iccvid_Ja.rc b/dlls/iccvid/iccvid_Ja.rc new file mode 100644 index 0000000..b845af4 --- /dev/null +++ b/dlls/iccvid/iccvid_Ja.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak ビデオコーデック" + IDS_DESCRIPTION "Cinepak ビデオコーデック" +}

1 0

Aric Stewart : msvidc32: Add Japanese resource.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 0d932a88d4dbcec1d313238ee36d4e473f762d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d932a88d4dbcec1d313238ee… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 14 13:38:23 2009 -0500 msvidc32: Add Japanese resource. --- dlls/msvidc32/Makefile.in | 1 + dlls/msvidc32/msvidc32_Ja.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index faa0f18..3bc63a8 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ msvidc32_En.rc \ msvidc32_Fr.rc \ msvidc32_Hu.rc \ + msvidc32_Ja.rc \ msvidc32_Ko.rc \ msvidc32_Lt.rc \ msvidc32_Nl.rc \ diff --git a/dlls/msvidc32/msvidc32_Ja.rc b/dlls/msvidc32/msvidc32_Ja.rc new file mode 100644 index 0000000..3d09c76 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Ja.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msvidc32_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine ビデオ 1 ビデオコーデック" +}

1 0

Aric Stewart : sane: Add Japanese resource.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 33f8f2b37dab906fe26ecbe13f0237caf0f25a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f8f2b37dab906fe26ecbe13… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 14 13:23:21 2009 -0500 sane: Add Japanese resource. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_Ja.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index e394939..e5c3fd4 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ sane_Es.rc \ sane_Fi.rc \ sane_Fr.rc \ + sane_Ja.rc \ sane_Ko.rc \ sane_Lt.rc \ sane_Nl.rc \ diff --git a/dlls/sane.ds/sane_Ja.rc b/dlls/sane.ds/sane_Ja.rc new file mode 100644 index 0000000..dd610c6 --- /dev/null +++ b/dlls/sane.ds/sane_Ja.rc @@ -0,0 +1,45 @@ +/* + * Japanese resources for Twain + * + * Copyright 2009 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "スキャン中" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "スキャン中... しばらくお待ちください",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Aric Stewart : taskmgr: Update Japanese resource.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 75050bba2560678b96b62e71a7fd0c937a79fc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75050bba2560678b96b62e71a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 14 08:26:13 2009 -0500 taskmgr: Update Japanese resource. --- programs/taskmgr/Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index 43334f2..589575d 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -489,4 +489,5 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "プロセスの優先クラスを通常以下に設定します。" ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスの優先クラスを低に設定します。" + ID_PROCESS_PAGE_DEBUGCHANNELS "デバッグのチャンネルをコントロールします。" END

1 0

Mike Kaplinskiy : ws2/tests: Test AcceptEx with a deferred socket.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 1dd1ea2e171fb1d81c50680903da04da19b5dab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd1ea2e171fb1d81c5068090… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jul 13 21:35:33 2009 -0400 ws2/tests: Test AcceptEx with a deferred socket. --- dlls/ws2_32/tests/sock.c | 127 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index acb2638..672c96e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2539,17 +2539,26 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); } +static int CALLBACK AlwaysDeferConditionFunc(LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS pQos, + LPQOS lpGQOS, LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, + GROUP FAR * g, DWORD_PTR dwCallbackData) +{ + return CF_DEFER; +} + static void test_AcceptEx(void) { SOCKET listener = INVALID_SOCKET; SOCKET acceptor = INVALID_SOCKET; SOCKET connector = INVALID_SOCKET; + SOCKET connector2 = INVALID_SOCKET; struct sockaddr_in bindAddress; int socklen; GUID acceptExGuid = WSAID_ACCEPTEX; - BOOL WINAPI (*pAcceptEx)(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, - DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, - LPOVERLAPPED overlapped); + LPFN_ACCEPTEX pAcceptEx = NULL; + fd_set fds_accept, fds_send; + struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ + int got, conn1, i; DWORD bytesReturned; char buffer[1024]; OVERLAPPED overlapped; @@ -2717,6 +2726,116 @@ static void test_AcceptEx(void) closesocket(acceptor); acceptor = INVALID_SOCKET; + /* Test CF_DEFER & AcceptEx interaction */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + connector2 = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(connector, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(connector2, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + /* Connect socket #1 */ + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0 || + (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + FD_ZERO ( &fds_accept ); + FD_ZERO ( &fds_send ); + + FD_SET ( listener, &fds_accept ); + FD_SET ( connector, &fds_send ); + + buffer[0] = '0'; + got = 0; + conn1 = 0; + + for (i = 0; i < 4000; ++i) + { + wsa_ok ( ( select ( 0, &fds_accept, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, + "select_server (%x): select() failed: %d\n" ); + + /* check for incoming requests */ + if ( FD_ISSET ( listener, &fds_accept ) ) { + got++; + if (got == 1) { + SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); + ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection\n"); + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + } + else if (got == 2) { + /* this should be socket #2 */ + SOCKET tmp = accept(listener, NULL, NULL); + ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); + closesocket(tmp); + } + else { + ok(FALSE, "Got more than 2 connections?\n"); + } + } + if ( conn1 && FD_ISSET ( connector2, &fds_send ) ) { + /* Send data on second socket, and stop */ + send(connector2, "2", 1, 0); + FD_CLR ( connector2, &fds_send ); + + break; + } + if ( FD_ISSET ( connector, &fds_send ) ) { + /* Once #1 is connected, allow #2 to connect */ + conn1 = 1; + + send(connector, "1", 1, 0); + FD_CLR ( connector, &fds_send ); + + iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0 || + (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + FD_SET ( connector2, &fds_send ); + } + } + + ok (got == 2, "Did not get both connections\n"); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + + set_blocking(acceptor, TRUE); + iret = recv( acceptor, buffer, 2, 0); + ok(iret == 1, "Failed to get data, %d\n", iret); + + ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); + + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0); @@ -2756,6 +2875,8 @@ end: closesocket(acceptor); if (connector != INVALID_SOCKET) closesocket(connector); + if (connector2 != INVALID_SOCKET) + closesocket(connector2); } /**************** Main program ***************/

1 0

Eric Pouech : dbghelp: Fixed regressions introduced by growing arrays exponentially instead of linearly .
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: f2b7ec1c2cd22d9a2a6b7e15617f0acba5472727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b7ec1c2cd22d9a2a6b7e156… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jul 14 12:17:22 2009 +0200 dbghelp: Fixed regressions introduced by growing arrays exponentially instead of linearly. --- dlls/dbghelp/minidump.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index a786d29..4108ef4 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -266,18 +266,23 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, dc->modules = HeapReAlloc(GetProcessHeap(), 0, dc->modules, dc->alloc_modules * sizeof(*dc->modules)); } - if (!dc->modules) return FALSE; + if (!dc->modules) + { + dc->alloc_modules = dc->num_modules = 0; + return FALSE; + } if (is_elf || !GetModuleFileNameExW(dc->hProcess, (HMODULE)base, - dc->modules[dc->num_modules - 1].name, - sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR))) - lstrcpynW(dc->modules[dc->num_modules - 1].name, name, - sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR)); - dc->modules[dc->num_modules - 1].base = base; - dc->modules[dc->num_modules - 1].size = size; - dc->modules[dc->num_modules - 1].timestamp = timestamp; - dc->modules[dc->num_modules - 1].checksum = checksum; - dc->modules[dc->num_modules - 1].is_elf = is_elf; + dc->modules[dc->num_modules].name, + sizeof(dc->modules[dc->num_modules].name) / sizeof(WCHAR))) + lstrcpynW(dc->modules[dc->num_modules].name, name, + sizeof(dc->modules[dc->num_modules].name) / sizeof(WCHAR)); + dc->modules[dc->num_modules].base = base; + dc->modules[dc->num_modules].size = size; + dc->modules[dc->num_modules].timestamp = timestamp; + dc->modules[dc->num_modules].checksum = checksum; + dc->modules[dc->num_modules].is_elf = is_elf; + dc->num_modules++; return TRUE; } @@ -402,9 +407,10 @@ static void add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, } if (dc->mem) { - dc->mem[dc->num_mem - 1].base = base; - dc->mem[dc->num_mem - 1].size = size; - dc->mem[dc->num_mem - 1].rva = rva; + dc->mem[dc->num_mem].base = base; + dc->mem[dc->num_mem].size = size; + dc->mem[dc->num_mem].rva = rva; + dc->num_mem++; } else dc->num_mem = dc->alloc_mem = 0; }

1 0

Hans Leidekker : wmiutils: Register interfaces.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 8013e45e4c8d4c25d2f32dcd1d17f1b529fb4339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8013e45e4c8d4c25d2f32dcd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:50 2009 +0200 wmiutils: Register interfaces. --- dlls/wmiutils/Makefile.in | 3 +- dlls/wmiutils/regsvr.c | 424 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 +- tools/wine.inf.in | 1 + 4 files changed, 429 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8013e45e4c8d4c25d2f32…

1 0

Hans Leidekker : wmiutils: Add class factory.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: ceee3ddf472c4ab6908f82583a71f57ad1b8f554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceee3ddf472c4ab6908f82583… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:29 2009 +0200 wmiutils: Add class factory. --- dlls/wmiutils/main.c | 104 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 +- 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index 8e8b005..6dda4bc 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -19,14 +19,98 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "objbase.h" +#include "wbemcli.h" #include "wine/debug.h" +#include "wmiutils_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} wmiutils_cf; + +static inline wmiutils_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (wmiutils_cf *)((char *)iface - FIELD_OFFSET( wmiutils_cf, vtbl )); +} + +static HRESULT WINAPI wmiutils_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wmiutils_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI wmiutils_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + wmiutils_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI wmiutils_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl wmiutils_cf_vtbl = +{ + wmiutils_cf_QueryInterface, + wmiutils_cf_AddRef, + wmiutils_cf_Release, + wmiutils_cf_CreateInstance, + wmiutils_cf_LockServer +}; + +static wmiutils_cf status_code_cf = { &wmiutils_cf_vtbl, WbemStatusCodeText_create }; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { switch(reason) @@ -41,3 +125,23 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) } return TRUE; } + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_WbemStatusCode )) + { + cf = (IClassFactory *)&status_code_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} diff --git a/dlls/wmiutils/wmiutils.spec b/dlls/wmiutils/wmiutils.spec index c5fc87a..c534b4f 100644 --- a/dlls/wmiutils/wmiutils.spec +++ b/dlls/wmiutils/wmiutils.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemStatusCodeText .
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 0520defecc69eff4480a500f509d6a169a2d688f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0520defecc69eff4480a500f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:09 2009 +0200 wmiutils: Add a stub implementation of IWbemStatusCodeText. --- dlls/wmiutils/Makefile.in | 5 +- dlls/wmiutils/statuscode.c | 153 ++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils_private.h | 19 +++++ 3 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 09d1cb4..9e44d7b 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wmiutils.dll -IMPORTS = kernel32 +IMPORTS = oleaut32 kernel32 C_SRCS = \ - main.c + main.c \ + statuscode.c @MAKE_DLL_RULES@ diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c new file mode 100644 index 0000000..dfa3872 --- /dev/null +++ b/dlls/wmiutils/statuscode.c @@ -0,0 +1,153 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "initguid.h" +#include "ole2.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wmiutils_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); + +typedef struct status_code +{ + const IWbemStatusCodeTextVtbl *vtbl; + LONG refs; +} status_code; + +static inline status_code *impl_from_IWbemStatusCodeText( IWbemStatusCodeText *iface ) +{ + return (status_code *)((char *)iface - FIELD_OFFSET( status_code, vtbl )); +} + +static ULONG WINAPI status_code_AddRef( + IWbemStatusCodeText *iface ) +{ + status_code *status_code = impl_from_IWbemStatusCodeText( iface ); + return InterlockedIncrement( &status_code->refs ); +} + +static ULONG WINAPI status_code_Release( + IWbemStatusCodeText *iface ) +{ + status_code *status_code = impl_from_IWbemStatusCodeText( iface ); + LONG refs = InterlockedDecrement( &status_code->refs ); + if (!refs) + { + TRACE("destroying %p\n", status_code); + HeapFree( GetProcessHeap(), 0, status_code ); + } + return refs; +} + +static HRESULT WINAPI status_code_QueryInterface( + IWbemStatusCodeText *iface, + REFIID riid, + void **ppvObject ) +{ + status_code *This = impl_from_IWbemStatusCodeText( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemStatusCodeText ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemStatusCodeText_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI status_code_GetErrorCodeText( + IWbemStatusCodeText *iface, + HRESULT res, + LCID lcid, + LONG flags, + BSTR *text ) +{ + static const WCHAR fmt[] = + {'E','r','r','o','r',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; + WCHAR msg[32]; + + FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + + sprintfW(msg, fmt, res); + *text = SysAllocString(msg); + return WBEM_S_NO_ERROR; +} + +static HRESULT WINAPI status_code_GetFacilityCodeText( + IWbemStatusCodeText *iface, + HRESULT res, + LCID lcid, + LONG flags, + BSTR *text ) +{ + static const WCHAR fmt[] = + {'F','a','c','i','l','i','t','y',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; + WCHAR msg[32]; + + FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + + sprintfW(msg, fmt, res); + *text = SysAllocString(msg); + return WBEM_S_NO_ERROR; +} + +static const struct IWbemStatusCodeTextVtbl status_code_vtbl = +{ + status_code_QueryInterface, + status_code_AddRef, + status_code_Release, + status_code_GetErrorCodeText, + status_code_GetFacilityCodeText +}; + +HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + status_code *sc; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); + if (!sc) return E_OUTOFMEMORY; + + sc->vtbl = &status_code_vtbl; + sc->refs = 1; + + *ppObj = &sc->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h new file mode 100644 index 0000000..23082ce --- /dev/null +++ b/dlls/wmiutils/wmiutils_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *);

1 0

Hans Leidekker : wmiutils: New dll.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: dd1d8cab3aa52da66de61c6f71f480bd75578021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1d8cab3aa52da66de61c6f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:27:46 2009 +0200 wmiutils: New dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/wmiutils/Makefile.in | 13 +++++++++++++ dlls/wmiutils/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 ++++ 5 files changed, 70 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f082f38..029742a 100755 --- a/configure +++ b/configure @@ -28041,6 +28041,14 @@ dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wmi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wmiutils/Makefile" +test "x$enable_wmiutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wmiutils" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wmiutils/Makefile: dlls/wmiutils/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wmiutils/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wnaspi32/Makefile" test "x$enable_wnaspi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ wnaspi32" @@ -29791,6 +29799,7 @@ do "dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;; "dlls/wldap32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/tests/Makefile" ;; "dlls/wmi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmi/Makefile" ;; + "dlls/wmiutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmiutils/Makefile" ;; "dlls/wnaspi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wnaspi32/Makefile" ;; "dlls/wow32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wow32/Makefile" ;; "dlls/ws2_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/Makefile" ;; diff --git a/configure.ac b/configure.ac index b271773..3b805fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2436,6 +2436,7 @@ WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls] WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wldap32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wmiutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in new file mode 100644 index 0000000..09d1cb4 --- /dev/null +++ b/dlls/wmiutils/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wmiutils.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c new file mode 100644 index 0000000..8e8b005 --- /dev/null +++ b/dlls/wmiutils/main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wmiutils/wmiutils.spec b/dlls/wmiutils/wmiutils.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wmiutils/wmiutils.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : wbemprox: Register interfaces.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: a4717d0d4c58cac579d9a32e3cdc62f073464ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4717d0d4c58cac579d9a32e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:27:21 2009 +0200 wbemprox: Register interfaces. --- dlls/wbemprox/Makefile.in | 3 +- dlls/wbemprox/regsvr.c | 424 +++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 +- tools/wine.inf.in | 1 + 4 files changed, 429 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4717d0d4c58cac579d9a…

1 0

Hans Leidekker : wbemprox: Add class factory.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: a73b9d9b02b8b1ca1efe2e575832b8a303ce0120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73b9d9b02b8b1ca1efe2e575… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:26:59 2009 +0200 wbemprox: Add class factory. --- dlls/wbemprox/main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 89812b2..c22f57f 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -21,8 +21,96 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wbemprox_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} wbemprox_cf; + +static inline wbemprox_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (wbemprox_cf *)((char *)iface - FIELD_OFFSET( wbemprox_cf, vtbl )); +} + +static HRESULT WINAPI wbemprox_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wbemprox_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI wbemprox_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + wbemprox_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI wbemprox_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl wbemprox_cf_vtbl = +{ + wbemprox_cf_QueryInterface, + wbemprox_cf_AddRef, + wbemprox_cf_Release, + wbemprox_cf_CreateInstance, + wbemprox_cf_LockServer +}; + +static wbemprox_cf wbem_locator_cf = { &wbemprox_cf_vtbl, WbemLocator_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -40,3 +128,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) + { + cf = (IClassFactory *)&wbem_locator_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} diff --git a/dlls/wbemprox/wbemprox.spec b/dlls/wbemprox/wbemprox.spec index c5fc87a..c534b4f 100644 --- a/dlls/wbemprox/wbemprox.spec +++ b/dlls/wbemprox/wbemprox.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : wbemprox: Add a stub implementation of IWbemLocator.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 2182dd1fa77b54e5912fd484cc75bee93e96f9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2182dd1fa77b54e5912fd484c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:26:38 2009 +0200 wbemprox: Add a stub implementation of IWbemLocator. --- dlls/wbemprox/Makefile.in | 3 +- dlls/wbemprox/wbemlocator.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 19 ++++++ 3 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 58aad37..b178262 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -6,7 +6,8 @@ MODULE = wbemprox.dll IMPORTS = kernel32 C_SRCS = \ - main.c + main.c \ + wbemlocator.c @MAKE_DLL_RULES@ diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c new file mode 100644 index 0000000..ad6a75d --- /dev/null +++ b/dlls/wbemprox/wbemlocator.c @@ -0,0 +1,130 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +typedef struct +{ + const IWbemLocatorVtbl *vtbl; + LONG refs; +} wbem_locator; + +static inline wbem_locator *impl_from_IWbemLocator( IWbemLocator *iface ) +{ + return (wbem_locator *)((char *)iface - FIELD_OFFSET( wbem_locator, vtbl )); +} + +static ULONG WINAPI wbem_locator_AddRef( + IWbemLocator *iface ) +{ + wbem_locator *wl = impl_from_IWbemLocator( iface ); + return InterlockedIncrement( &wl->refs ); +} + +static ULONG WINAPI wbem_locator_Release( + IWbemLocator *iface ) +{ + wbem_locator *wl = impl_from_IWbemLocator( iface ); + LONG refs = InterlockedDecrement( &wl->refs ); + if (!refs) + { + TRACE("destroying %p\n", wl); + HeapFree( GetProcessHeap(), 0, wl ); + } + return refs; +} + +static HRESULT WINAPI wbem_locator_QueryInterface( + IWbemLocator *iface, + REFIID riid, + void **ppvObject ) +{ + wbem_locator *This = impl_from_IWbemLocator( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemLocator ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemLocator_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI wbem_locator_ConnectServer( + IWbemLocator *iface, + const BSTR NetworkResource, + const BSTR User, + const BSTR Password, + const BSTR Locale, + LONG SecurityFlags, + const BSTR Authority, + IWbemContext *pCtx, + IWbemServices **ppNamespace) +{ + FIXME("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), + debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); + return WBEM_E_FAILED; +} + +static const IWbemLocatorVtbl wbem_locator_vtbl = +{ + wbem_locator_QueryInterface, + wbem_locator_AddRef, + wbem_locator_Release, + wbem_locator_ConnectServer +}; + +HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + wbem_locator *wl; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + wl = HeapAlloc( GetProcessHeap(), 0, sizeof(*wl) ); + if (!wl) return E_OUTOFMEMORY; + + wl->vtbl = &wbem_locator_vtbl; + wl->refs = 1; + + *ppObj = &wl->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h new file mode 100644 index 0000000..cf4301d --- /dev/null +++ b/dlls/wbemprox/wbemprox_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +HRESULT WbemLocator_create(IUnknown *, LPVOID *);

1 0

Henri Verbeet : d3d10: Marge parse_fx10_pass() and parse_fx10_pass_index().
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: b4da7ebd3ea261408ea468006ce5c2f25ab44d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4da7ebd3ea261408ea468006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:41 2009 +0200 d3d10: Marge parse_fx10_pass() and parse_fx10_pass_index(). --- dlls/d3d10/effect.c | 85 +++++++++++++++++++------------------------------- 1 files changed, 32 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1a7c7b9..981a45e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -124,43 +124,6 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return hr; } -static HRESULT parse_fx10_pass_index(struct d3d10_effect_pass *p, const char **ptr) -{ - unsigned int i; - - read_dword(ptr, &p->start); - TRACE("Pass starts at offset %#x\n", p->start); - - read_dword(ptr, &p->variable_count); - TRACE("Pass has %u variables\n", p->variable_count); - - skip_dword_unknown(ptr, 1); - - p->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->variable_count * sizeof(*p->variables)); - if (!p->variables) - { - ERR("Failed to allocate variables memory\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < p->variable_count; ++i) - { - struct d3d10_effect_variable *v = &p->variables[i]; - - v->pass = p; - - read_dword(ptr, &v->type); - TRACE("Variable %u is of type %#x\n", i, v->type); - - skip_dword_unknown(ptr, 2); - - read_dword(ptr, &v->idx_offset); - TRACE("Variable %u idx is at offset %#x\n", i, v->idx_offset); - } - - return S_OK; -} - static char *copy_name(const char *ptr) { size_t name_len; @@ -333,32 +296,51 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return hr; } -static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char *data) +static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, const char *data) { HRESULT hr = S_OK; - const char *ptr; - size_t name_len; unsigned int i; + DWORD offset; - ptr = data + p->start; + read_dword(ptr, &offset); + TRACE("Pass name at offset %#x.\n", offset); - name_len = strlen(ptr) + 1; - p->name = HeapAlloc(GetProcessHeap(), 0, name_len); + p->name = copy_name(data + offset); if (!p->name) { - ERR("Failed to allocate name memory\n"); + ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; } + TRACE("Pass name: %s.\n", p->name); - memcpy(p->name, ptr, name_len); - ptr += name_len; + read_dword(ptr, &p->variable_count); + TRACE("Pass has %u variables.\n", p->variable_count); - TRACE("pass name: %s\n", p->name); + skip_dword_unknown(ptr, 1); + + p->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->variable_count * sizeof(*p->variables)); + if (!p->variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } for (i = 0; i < p->variable_count; ++i) { - hr = parse_fx10_variable(&p->variables[i], data); - if (FAILED(hr)) break; + struct d3d10_effect_variable *v = &p->variables[i]; + + v->pass = p; + + read_dword(ptr, &v->type); + TRACE("Variable %u is of type %#x.\n", i, v->type); + + skip_dword_unknown(ptr, 2); + + read_dword(ptr, &v->idx_offset); + TRACE("Variable %u idx is at offset %#x.\n", i, v->idx_offset); + + hr = parse_fx10_variable(v, data); + if (FAILED(hr)) return hr; } return hr; @@ -400,10 +382,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char p->vtbl = &d3d10_effect_pass_vtbl; p->technique = t; - hr = parse_fx10_pass_index(p, ptr); - if (FAILED(hr)) return hr; - - hr = parse_fx10_pass(p, data); + hr = parse_fx10_pass(p, ptr, data); if (FAILED(hr)) return hr; }

1 0

Henri Verbeet : d3d10: Merge parse_fx10_technique() and parse_fx10_technique_index().
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: c481e0a7d447cd0643f789054337e9080409a9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c481e0a7d447cd0643f789054… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:40 2009 +0200 d3d10: Merge parse_fx10_technique() and parse_fx10_technique_index(). --- dlls/d3d10/d3d10_private.h | 1 - dlls/d3d10/effect.c | 82 ++++++++++++++++---------------------------- 2 files changed, 30 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 400ea73..8bf9a8b 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -84,7 +84,6 @@ struct d3d10_effect_technique struct d3d10_effect *effect; char *name; - DWORD start; DWORD pass_count; struct d3d10_effect_pass *passes; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 31ef070..1a7c7b9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -161,40 +161,6 @@ static HRESULT parse_fx10_pass_index(struct d3d10_effect_pass *p, const char **p return S_OK; } -static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, const char **ptr) -{ - HRESULT hr = S_OK; - unsigned int i; - - read_dword(ptr, &t->start); - TRACE("Technique starts at offset %#x\n", t->start); - - read_dword(ptr, &t->pass_count); - TRACE("Technique has %u passes\n", t->pass_count); - - skip_dword_unknown(ptr, 1); - - t->passes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->pass_count * sizeof(*t->passes)); - if (!t->passes) - { - ERR("Failed to allocate passes memory\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < t->pass_count; ++i) - { - struct d3d10_effect_pass *p = &t->passes[i]; - - p->vtbl = &d3d10_effect_pass_vtbl; - p->technique = t; - - hr = parse_fx10_pass_index(p, ptr); - if (FAILED(hr)) break; - } - - return hr; -} - static char *copy_name(const char *ptr) { size_t name_len; @@ -398,35 +364,50 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char *data) return hr; } -static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char *data) +static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char **ptr, const char *data) { - HRESULT hr = S_OK; - const char *ptr; - size_t name_len; unsigned int i; + DWORD offset; - ptr = data + t->start; + read_dword(ptr, &offset); + TRACE("Technique name at offset %#x.\n", offset); - name_len = strlen(ptr) + 1; - t->name = HeapAlloc(GetProcessHeap(), 0, name_len); + t->name = copy_name(data + offset); if (!t->name) { - ERR("Failed to allocate name memory\n"); + ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; } + TRACE("Technique name: %s.\n", t->name); - memcpy(t->name, ptr, name_len); - ptr += name_len; + read_dword(ptr, &t->pass_count); + TRACE("Technique has %u passes\n", t->pass_count); + + skip_dword_unknown(ptr, 1); - TRACE("technique name: %s\n", t->name); + t->passes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->pass_count * sizeof(*t->passes)); + if (!t->passes) + { + ERR("Failed to allocate passes memory\n"); + return E_OUTOFMEMORY; + } for (i = 0; i < t->pass_count; ++i) { - hr = parse_fx10_pass(&t->passes[i], data); - if (FAILED(hr)) break; + struct d3d10_effect_pass *p = &t->passes[i]; + HRESULT hr; + + p->vtbl = &d3d10_effect_pass_vtbl; + p->technique = t; + + hr = parse_fx10_pass_index(p, ptr); + if (FAILED(hr)) return hr; + + hr = parse_fx10_pass(p, data); + if (FAILED(hr)) return hr; } - return hr; + return S_OK; } static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data) @@ -498,10 +479,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d t->vtbl = &d3d10_effect_technique_vtbl; t->effect = e; - hr = parse_fx10_technique_index(t, &ptr); - if (FAILED(hr)) return hr; - - hr = parse_fx10_technique(t, data); + hr = parse_fx10_technique(t, &ptr, data); if (FAILED(hr)) return hr; }

1 0

Henri Verbeet : d3d10: Parse local buffer names.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 34ab5431e810104aae13c847a29cfa6d617bcee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ab5431e810104aae13c847a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:39 2009 +0200 d3d10: Parse local buffer names. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 51 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 40ad33e..400ea73 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -60,6 +60,7 @@ struct d3d10_effect_shader_variable struct d3d10_effect_local_buffer { + char *name; DWORD data_size; DWORD variable_count; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 80fdcb0..31ef070 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -195,6 +195,24 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons return hr; } +static char *copy_name(const char *ptr) +{ + size_t name_len; + char *name; + + name_len = strlen(ptr) + 1; + name = HeapAlloc(GetProcessHeap(), 0, name_len); + if (!name) + { + ERR("Failed to allocate name memory.\n"); + return NULL; + } + + memcpy(name, ptr, name_len); + + return name; +} + static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct d3d10_effect_shader_variable *s = ctx; @@ -411,7 +429,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return hr; } -static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr) +static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data) { unsigned int i; DWORD offset; @@ -419,6 +437,14 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons read_dword(ptr, &offset); TRACE("Local buffer name at offset %#x.\n", offset); + l->name = copy_name(data + offset); + if (!l->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Local buffer name: %s.\n", l->name); + read_dword(ptr, &l->data_size); TRACE("Local buffer data size: %#x.\n", l->data_size); @@ -461,7 +487,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d { struct d3d10_effect_local_buffer *l = &e->local_buffers[i]; - hr = parse_fx10_local_buffer(l, &ptr); + hr = parse_fx10_local_buffer(l, &ptr, data); if (FAILED(hr)) return hr; } @@ -651,6 +677,13 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) } } +static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *l) +{ + TRACE("local buffer %p.\n", l); + + HeapFree(GetProcessHeap(), 0, l->name); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object) @@ -690,16 +723,26 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) if (!refcount) { + unsigned int i; + if (This->techniques) { - unsigned int i; for (i = 0; i < This->technique_count; ++i) { d3d10_effect_technique_destroy(&This->techniques[i]); } HeapFree(GetProcessHeap(), 0, This->techniques); } - HeapFree(GetProcessHeap(), 0, This->local_buffers); + + if (This->local_buffers) + { + for (i = 0; i < This->local_buffer_count; ++i) + { + d3d10_effect_local_buffer_destroy(&This->local_buffers[i]); + } + HeapFree(GetProcessHeap(), 0, This->local_buffers); + } + ID3D10Device_Release(This->device); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d10: Parse local buffers.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 710b57a5aa1d23222462d9b63c267d0111f87637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710b57a5aa1d23222462d9b63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:38 2009 +0200 d3d10: Parse local buffers. --- dlls/d3d10/d3d10_private.h | 10 +++++++- dlls/d3d10/effect.c | 54 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c5a74aa..40ad33e 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -58,6 +58,12 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_local_buffer +{ + DWORD data_size; + DWORD variable_count; +}; + /* ID3D10EffectPass */ struct d3d10_effect_pass { @@ -91,7 +97,7 @@ struct d3d10_effect ID3D10Device *device; DWORD version; - DWORD localbuffers_count; + DWORD local_buffer_count; DWORD localobjects_count; DWORD sharedbuffers_count; DWORD sharedobjects_count; @@ -101,6 +107,8 @@ struct d3d10_effect DWORD blendstate_count; DWORD rasterizerstate_count; DWORD samplerstate_count; + + struct d3d10_effect_local_buffer *local_buffers; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8316db8..80fdcb0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -411,13 +411,44 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return hr; } +static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr) +{ + unsigned int i; + DWORD offset; + + read_dword(ptr, &offset); + TRACE("Local buffer name at offset %#x.\n", offset); + + read_dword(ptr, &l->data_size); + TRACE("Local buffer data size: %#x.\n", l->data_size); + + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &l->variable_count); + TRACE("Local buffer variable count: %#x.\n", l->variable_count); + + skip_dword_unknown(ptr, 2); + + for (i = 0; i < l->variable_count; ++i) + { + skip_dword_unknown(ptr, 7); + } + + return S_OK; +} + static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data + e->index_offset; - HRESULT hr = S_OK; unsigned int i; + HRESULT hr; - skip_dword_unknown(&ptr, 6); + e->local_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->local_buffer_count * sizeof(*e->local_buffers)); + if (!e->local_buffers) + { + ERR("Failed to allocate local buffer memory.\n"); + return E_OUTOFMEMORY; + } e->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->technique_count * sizeof(*e->techniques)); if (!e->techniques) @@ -426,6 +457,14 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } + for (i = 0; i < e->local_buffer_count; ++i) + { + struct d3d10_effect_local_buffer *l = &e->local_buffers[i]; + + hr = parse_fx10_local_buffer(l, &ptr); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -434,13 +473,13 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d t->effect = e; hr = parse_fx10_technique_index(t, &ptr); - if (FAILED(hr)) break; + if (FAILED(hr)) return hr; hr = parse_fx10_technique(t, data); - if (FAILED(hr)) break; + if (FAILED(hr)) return hr; } - return hr; + return S_OK; } static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_size) @@ -452,8 +491,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->version); TRACE("Target: %#x\n", e->version); - read_dword(&ptr, &e->localbuffers_count); - TRACE("Localbuffers count: %u\n", e->localbuffers_count); + read_dword(&ptr, &e->local_buffer_count); + TRACE("Local buffer count: %u.\n", e->local_buffer_count); /* Number of variables in local buffers? */ read_dword(&ptr, &unknown); @@ -660,6 +699,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) } HeapFree(GetProcessHeap(), 0, This->techniques); } + HeapFree(GetProcessHeap(), 0, This->local_buffers); ID3D10Device_Release(This->device); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectMatrixVariable interface.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 74ec910397c4d7905e54d49eabd87702cb4ccf3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ec910397c4d7905e54d49ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:37 2009 +0200 d3d10: Add the ID3D10EffectMatrixVariable interface. --- include/d3d10effect.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 37d4bd1..b9c5c08 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -203,6 +203,49 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectMatrixVariable, 0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0); + +#define INTERFACE ID3D10EffectMatrixVariable +DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectMatrixVariable methods */ + STDMETHOD(SetMatrix)(THIS_ float *data) PURE; + STDMETHOD(GetMatrix)(THIS_ float *data) PURE; + STDMETHOD(SetMatrixArray)(THIS_ float *data, UINT offset, UINT count) PURE; + STDMETHOD(GetMatrixArray)(THIS_ float *data, UINT offset, UINT count) PURE; + STDMETHOD(SetMatrixTranspose)(THIS_ float *data) PURE; + STDMETHOD(GetMatrixTranspose)(THIS_ float *data) PURE; + STDMETHOD(SetMatrixTransposeArray)(THIS_ float *data, UINT offset, UINT count) PURE; + STDMETHOD(GetMatrixTransposeArray)(THIS_ float *data, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Alexandre Julliard : msvcrt: Add an errno mapping for ERROR_SHARING_VIOLATION.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: b5d86403a4b87b3fb4c4ff84803e87cf859aa990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d86403a4b87b3fb4c4ff848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 12:18:15 2009 +0200 msvcrt: Add an errno mapping for ERROR_SHARING_VIOLATION. --- dlls/msvcrt/errno.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6ed6086..413ab39 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -140,6 +140,7 @@ void msvcrt_set_errno(int err) ERR_CASE(ERROR_DRIVE_LOCKED) ERR_CASE(ERROR_NOT_LOCKED) ERR_CASE(ERROR_INVALID_ACCESS) + ERR_CASE(ERROR_SHARING_VIOLATION) ERR_MAPS(ERROR_LOCK_VIOLATION, MSVCRT_EACCES); ERR_CASE(ERROR_FILE_NOT_FOUND) ERR_CASE(ERROR_NO_MORE_FILES)

1 0

Alexandre Julliard : ddraw/tests: Properly release surfaces even if we can' t get the texture object.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 60d389670a3ee69ba3cf2a156da259edbae0d099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d389670a3ee69ba3cf2a156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 11:29:02 2009 +0200 ddraw/tests: Properly release surfaces even if we can't get the texture object. --- dlls/ddraw/tests/dsurface.c | 62 ++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a73c34c..28fc0f5 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1030,36 +1030,38 @@ static void IFaceRefCount(void) /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ ret = IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); - if (ret == E_NOINTERFACE) return; /* win64 */ - ref = getRefcount((IUnknown *) tex); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); - ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); - - IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); - ref = getRefcount((IUnknown *) tex); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); - ref = getRefcount((IUnknown *) tex2); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); - ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); - - IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); - ref = getRefcount((IUnknown *) gamma); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); - - ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); - ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); - - ref = IDirect3DTexture_Release(tex); /* Release the texture */ - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); - ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); - - ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ - todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + if (SUCCEEDED(ret)) + { + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) tex2); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); + ref = getRefcount((IUnknown *) gamma); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + ref = IDirect3DTexture_Release(tex); /* Release the texture */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + } ref = IDirectDrawSurface2_Release(surf2); /* Release one of the 2 surf2 interfaces */ todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref);

1 0

Alexandre Julliard : ddraw/tests: Fix a failing test on 64-bit.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 340f5734bf46d7c39519be416d50edac0a78251f URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f5734bf46d7c39519be416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 11:28:37 2009 +0200 ddraw/tests: Fix a failing test on 64-bit. --- dlls/ddraw/tests/refcount.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index f0496e3..9ad560b 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -358,6 +358,14 @@ static void test_d3d_ifaces(void) ok(ref == 1, "IDirectDraw reference count is %ld\n", ref); hr = IDirectDraw_QueryInterface(DDraw1, &IID_IDirect3D, (void **) &D3D1); + if (hr == E_NOINTERFACE) /* win64 */ + { + IDirectDraw4_Release(DDraw4); + IDirectDraw2_Release(DDraw2); + IDirectDraw_Release(DDraw1); + skip( "no IDirect3D support\n" ); + return; + } ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); ref = getRefcount( (IUnknown *) DDraw4); ok(ref == 1, "IDirectDraw4 reference count is %ld\n", ref);

1 0

Hans Leidekker : include: Add IWbemStatusCodeText and IWbemLocator interfaces.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 9bfd49b5b24e6f4e64712875114af1aa1daf566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfd49b5b24e6f4e647128751… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 13 16:10:07 2009 +0200 include: Add IWbemStatusCodeText and IWbemLocator interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/wbemcli.idl | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 213 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bfd49b5b24e6f4e64712…

1 0

Piotr Caban : jscript: Added Date_getYear implementation.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 55b8952ba2caa10a5242a5392340e5b74589ba66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b8952ba2caa10a5242a5392… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:37:11 2009 +0200 jscript: Added Date_getYear implementation. --- dlls/jscript/date.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 642c9ec..b65f03e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -87,6 +87,7 @@ static const WCHAR setMonthW[] = {'s','e','t','M','o','n','t','h',0}; static const WCHAR setUTCMonthW[] = {'s','e','t','U','T','C','M','o','n','t','h',0}; static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; +static const WCHAR getYearW[] = {'g','e','t','Y','e','a','r',0}; static const WCHAR UTCW[] = {'U','T','C',0}; static const WCHAR parseW[] = {'p','a','r','s','e',0}; @@ -2134,6 +2135,37 @@ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI return S_OK; } +/* ECMA-262 3rd Edition B2.4 */ +static HRESULT Date_getYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DateInstance *date; + DOUBLE t, year; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + + if(isnan(t)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + year = year_from_time(t); + if(retv) + num_set_val(retv, (1900<=year && year<2000)?year-1900:year); + + return S_OK; +} + static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -2160,6 +2192,7 @@ static const builtin_prop_t Date_props[] = { {getUTCMinutesW, Date_getUTCMinutes, PROPF_METHOD}, {getUTCMonthW, Date_getUTCMonth, PROPF_METHOD}, {getUTCSecondsW, Date_getUTCSeconds, PROPF_METHOD}, + {getYearW, Date_getYear, PROPF_METHOD}, {hasOwnPropertyW, Date_hasOwnProperty, PROPF_METHOD}, {isPrototypeOfW, Date_isPrototypeOf, PROPF_METHOD}, {propertyIsEnumerableW, Date_propertyIsEnumerable, PROPF_METHOD},

1 0

Piotr Caban : jscript: Added String_fromCharCode implementation.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: c44056d4b2b34e838a305d29a385c96677d08d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44056d4b2b34e838a305d29a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:58 2009 +0200 jscript: Added String_fromCharCode implementation. --- dlls/jscript/string.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 7 ++++++ 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6aa6302..cf3c5be 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -66,6 +66,7 @@ static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p', static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static const WCHAR fromCharCodeW[] = {'f','r','o','m','C','h','a','r','C','o','d','e',0}; static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -1557,6 +1558,37 @@ static const builtin_info_t String_info = { NULL }; +/* ECMA-262 3rd Edition 15.5.3.2 */ +static HRESULT StringConstr_fromCharCode(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + DWORD i, code; + BSTR ret; + HRESULT hres; + + ret = SysAllocStringLen(NULL, arg_cnt(dp)); + if(!ret) + return E_OUTOFMEMORY; + + for(i=0; i<arg_cnt(dp); i++) { + hres = to_uint32(dispex->ctx, get_arg(dp, i), ei, &code); + if(FAILED(hres)) { + SysFreeString(ret); + return hres; + } + + ret[i] = code; + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + else SysFreeString(ret); + + return S_OK; +} + static HRESULT StringConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -1636,6 +1668,19 @@ static HRESULT string_alloc(script_ctx_t *ctx, BOOL use_constr, StringInstance * return S_OK; } +static const builtin_prop_t StringConstr_props[] = { + {fromCharCodeW, StringConstr_fromCharCode, PROPF_METHOD}, +}; + +static const builtin_info_t StringConstr_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(StringConstr_props)/sizeof(*StringConstr_props), + StringConstr_props, + NULL, + NULL +}; + HRESULT create_string_constr(script_ctx_t *ctx, DispatchEx **ret) { StringInstance *string; @@ -1645,7 +1690,7 @@ HRESULT create_string_constr(script_ctx_t *ctx, DispatchEx **ret) if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, StringConstr_value, NULL, PROPF_CONSTR, &string->dispex, ret); + hres = create_builtin_function(ctx, StringConstr_value, &StringConstr_info, PROPF_CONSTR, &string->dispex, ret); jsdisp_release(&string->dispex); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1e3a6dc..cf70ebc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -405,6 +405,13 @@ ok(tmp === "<SUP>test</SUP>", "'test'.sup() = " + tmp); tmp = "test".sup(3); ok(tmp === "<SUP>test</SUP>", "'test'.sup(3) = " + tmp); +ok(String.fromCharCode() === "", "String.fromCharCode() = " + String.fromCharCode()); +ok(String.fromCharCode(65,"66",67) === "ABC", "String.fromCharCode(65,'66',67) = " + String.fromCharCode(65,"66",67)); +ok(String.fromCharCode(1024*64+65, -1024*64+65) === "AA", + "String.fromCharCode(1024*64+65, -1024*64+65) = " + String.fromCharCode(1024*64+65, -1024*64+65)); +ok(String.fromCharCode(65, NaN, undefined).length === 3, + "String.fromCharCode(65, NaN, undefined).length = " + String.fromCharCode(65, NaN, undefined).length); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Piotr Caban : jscript: Added Array_slice implementation.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 2325e2cdb8fe9b7c7eb5de4f4be4a5f4ad3e5909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2325e2cdb8fe9b7c7eb5de4f4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:43 2009 +0200 jscript: Added Array_slice implementation. --- dlls/jscript/array.c | 77 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 17 ++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e5d6b2d..9b43142 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -421,8 +421,81 @@ static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *arr; + VARIANT v; + DOUBLE range; + DWORD length, start, end, idx; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + FIXME("not Array this\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp)) { + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) + range = V_I4(&v); + else + range = floor(V_R8(&v)); + + if(-range>length || isnan(range)) start = 0; + else if(range < 0) start = range+length; + else if(range <= length) start = range; + else start = length; + } + else start = 0; + + if(arg_cnt(dp)>1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) + range = V_I4(&v); + else + range = floor(V_R8(&v)); + + if(-range>length) end = 0; + else if(range < 0) end = range+length; + else if(range <= length) end = range; + else end = length; + } + else end = length; + + hres = create_array(dispex->ctx, (end>start)?end-start:0, &arr); + if(FAILED(hres)) + return hres; + + for(idx=start; idx<end; idx++) { + hres = jsdisp_propget_idx(dispex, idx, lcid, &v, ei, sp); + if(hres == DISP_E_UNKNOWNNAME) + continue; + + if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(arr, idx-start, lcid, &v, ei, sp); + + if(FAILED(hres)) { + jsdisp_release(arr); + return hres; + } + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(arr); + } + else + jsdisp_release(arr); + + return S_OK; } static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7e3df38..1e3a6dc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -524,6 +524,23 @@ tmp = arr.concat([2]); ok(tmp.length === 3, "tmp.length = " + tmp.length); ok(tmp[1] === undefined, "tmp[1] = " + tmp[1]); +arr = [1,false,'a',null,undefined,'a']; +ok(arr.slice(0,6).toString() === "1,false,a,,,a", "arr.slice(0,6).toString() = " + arr.slice(0,6)); +ok(arr.slice(0,6).length === 6, "arr.slice(0,6).length = " + arr.slice(0,6).length); +ok(arr.slice().toString() === "1,false,a,,,a", "arr.slice().toString() = " + arr.slice()); +ok(arr.slice("abc").toString() === "1,false,a,,,a", "arr.slice(\"abc\").toString() = " + arr.slice("abc")); +ok(arr.slice(3,8).toString() === ",,a", "arr.slice(3,8).toString() = " + arr.slice(3,8)); +ok(arr.slice(3,8).length === 3, "arr.slice(3,8).length = " + arr.slice(3,8).length); +ok(arr.slice(1).toString() === "false,a,,,a", "arr.slice(1).toString() = " + arr.slice(1)); +ok(arr.slice(-2).toString() === ",a", "arr.slice(-2).toString() = " + arr.slice(-2)); +ok(arr.slice(3,1).toString() === "", "arr.slice(3,1).toString() = " + arr.slice(3,1)); +tmp = arr.slice(0,6); +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr[12] = 2; +ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString()); +ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number();

1 0

Piotr Caban : jscript: Added implementation of Array constructor called as a function.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 75cce3cdcdac1c3896c3a3732bf19ce67dfb8a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cce3cdcdac1c3896c3a3732… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:13 2009 +0200 jscript: Added implementation of Array constructor called as a function. --- dlls/jscript/array.c | 1 + dlls/jscript/tests/api.js | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6db4d89..e5d6b2d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -774,6 +774,7 @@ static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISP TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { if(V_I4(arg_var) < 0) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a6895e3..7e3df38 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -501,6 +501,9 @@ arr.length = 3; ok(arr.length === 3, "arr.length = " + arr.length); ok(arr.toString() === "1,,", "arr.toString() = " + arr.toString()); +arr = Array("a","b","c"); +ok(arr.toString() === "a,b,c", "arr.toString() = " + arr.toString()); + ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); ok(arr === arr.valueOf(), "arr !== arr.valueOf");

1 0

Piotr Caban : jscript: Added call_expression_eval implementation for EXPRVAL_VARIANT values.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: b6b520e0ed3a78eb0ca0aec260bd2a785501543d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b520e0ed3a78eb0ca0aec26… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:27 2009 +0200 jscript: Added call_expression_eval implementation for EXPRVAL_VARIANT values. --- dlls/jscript/engine.c | 24 ++++++++++++++++++------ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 00eb087..b744904 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1536,11 +1536,19 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, hres = args_to_param(ctx, expr->argument_list, ei, &dp); if(SUCCEEDED(hres)) { switch(exprval.type) { + case EXPRVAL_VARIANT: + if(V_VT(&exprval.u.var) != VT_DISPATCH) { + FIXME("throw TypeError\n"); + hres = E_NOTIMPL; + break; + } + + hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, + DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); + break; case EXPRVAL_IDREF: - hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, DISPATCH_METHOD, - &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); - if(flags & EXPR_NOVAL) - V_VT(&var) = VT_EMPTY; + hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, + DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); break; default: FIXME("unimplemented type %d\n", exprval.type); @@ -1554,9 +1562,13 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(FAILED(hres)) return hres; - TRACE("= %s\n", debugstr_variant(&var)); ret->type = EXPRVAL_VARIANT; - ret->u.var = var; + if(flags & EXPR_NOVAL) { + V_VT(&ret->u.var) = VT_EMPTY; + }else { + TRACE("= %s\n", debugstr_variant(&var)); + ret->u.var = var; + } return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b865ad5..a9e0459 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -894,4 +894,6 @@ ok(""+str === "valueOf", "''+str = " + str); str.valueOf = function() { return new Date(); } ok(""+str === "test", "''+str = " + str); +ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function (){return 1;})()); + reportSuccess();

1 0

Piotr Caban : jscript: Added Array length setting implementation.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 346619d0933f4b27c344d6b3ac4a626ee5292701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346619d0933f4b27c344d6b3a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 02:06:59 2009 +0200 jscript: Added Array length setting implementation. --- dlls/jscript/array.c | 28 ++++++++++++++++++++++++++++ dlls/jscript/dispex.c | 16 ++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/tests/api.js | 7 +++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 75d3871..6db4d89 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -60,6 +62,32 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM V_VT(retv) = VT_I4; V_I4(retv) = This->length; break; + case DISPATCH_PROPERTYPUT: { + VARIANT num; + DOUBLE len = -1; + DWORD i; + HRESULT hres; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); + if(V_VT(&num) == VT_I4) + len = V_I4(&num); + else + len = floor(V_R8(&num)); + + if(len!=(DWORD)len) { + FIXME("Throw RangeError\n"); + return E_FAIL; + } + + for(i=len; i<This->length; i++) { + hres = jsdisp_delete_idx(dispex, i); + if(FAILED(hres)) + return hres; + } + + This->length = len; + break; + } default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 01f4d49..509fb50 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1010,3 +1010,19 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce return hres; } + +HRESULT jsdisp_delete_idx(DispatchEx *obj, DWORD idx) +{ + static const WCHAR formatW[] = {'%','d',0}; + WCHAR buf[12]; + dispex_prop_t *prop; + HRESULT hres; + + sprintfW(buf, formatW, idx); + + hres = find_prop_name(obj, buf, &prop); + if(FAILED(hres) || !prop) + return hres; + + return delete_prop(prop); +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 258f3d3..a6c34ba 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -132,6 +132,7 @@ HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceP HRESULT jsdisp_propget_name(DispatchEx*,LPCWSTR,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_get_id(DispatchEx*,const WCHAR*,DWORD,DISPID*); +HRESULT jsdisp_delete_idx(DispatchEx*,DWORD); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const builtin_info_t*,DWORD, DispatchEx*,DispatchEx**); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index db03fdb..a6895e3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -494,6 +494,13 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr = ["1", "2", "3"]; +arr.length = 1; +ok(arr.length === 1, "arr.length = " + arr.length); +arr.length = 3; +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "1,,", "arr.toString() = " + arr.toString()); + ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); ok(arr === arr.valueOf(), "arr !== arr.valueOf");

1 0

Roderick Colenbrander : winex11: Use set_xrender_transformation in AlphaBlend.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: eeeb349eee5e25cdf56bda4401a4ef9a621c3a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeeb349eee5e25cdf56bda440… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jul 13 23:33:15 2009 +0200 winex11: Use set_xrender_transformation in AlphaBlend. --- dlls/winex11.drv/xrender.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cacd30e..6d290ba 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1910,18 +1910,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid HeapFree( GetProcessHeap(), 0, rgndata ); } -#ifdef HAVE_XRENDERSETPICTURETRANSFORM - if(!repeat_src && (widthDst != widthSrc || heightDst != heightSrc)) { - double xscale = widthSrc/(double)widthDst; - double yscale = heightSrc/(double)heightDst; - XTransform xform = {{ - { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(0) }, - { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(0) }, - { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } - }}; - pXRenderSetPictureTransform(gdi_display, src_pict, &xform); - } -#endif + /* Make sure we ALWAYS set the transformation matrix even if we don't need to scale. The reason is + * that later on we want to reuse pictures (it can bring a lot of extra performance) and each time + * a different transformation matrix might have been used. */ + set_xrender_transformation(src_pict, widthSrc/(double)widthDst, heightSrc/(double)heightDst, 0, 0); pXRenderComposite(gdi_display, PictOpOver, src_pict, 0, dst_pict, 0, 0, 0, 0, xDst + devDst->dc_rect.left, yDst + devDst->dc_rect.top, widthDst, heightDst);

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: c702da34da98a725898f9bb42436bd5049f1d5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c702da34da98a725898f9bb42… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 13 22:12:01 2009 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/pe_module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7c624c9..a786d29 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -428,7 +428,7 @@ static void writeat(struct dump_context* dc, RVA rva, const void* data, unsigned * writes a new chunk of data to the minidump, increasing the current * rva in dc */ -static void append(struct dump_context* dc, void* data, unsigned size) +static void append(struct dump_context* dc, const void* data, unsigned size) { writeat(dc, dc->rva, data, size); dc->rva += size; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 91c7d80..44a4d6a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -134,7 +134,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, */ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module, - void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, const IMAGE_NT_HEADERS* nth) { BOOL ret = FALSE; const IMAGE_DATA_DIRECTORY* dir; @@ -182,7 +182,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, */ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module, - void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, const IMAGE_NT_HEADERS* nth) { unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports;

1 0

Austin English : shell32: Fix folder names for Dutch locale.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 6d474663c1efd886a49a9074de5c8147d34b0c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d474663c1efd886a49a9074d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 13 11:43:46 2009 -0500 shell32: Fix folder names for Dutch locale. --- dlls/shell32/shell32_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 33a65bc..560c7c7 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -273,9 +273,9 @@ STRINGTABLE IDS_INTERNET_CACHE "Lokale Instellingen\\Tijdelijke Internet Bestanden" IDS_COOKIES "Koekies" IDS_HISTORY "Lokale Instellingen\\Geschiedenis" - IDS_PROGRAM_FILES "Programma Bestanden" + IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mijn Afbeeldingen" - IDS_PROGRAM_FILES_COMMON "Programma Bestanden\\Gemeenschappelijke Bestanden" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Documenten" IDS_ADMINTOOLS "Start Menu\\Programmas\\Administratieve Tools" IDS_COMMON_MUSIC "Documenten\\Mijn Muziek"

1 0

André Hentschel : cmd: Fix German translation.
by Alexandre Julliard July 14, 2009

July 14, 2009

Module: wine Branch: master Commit: 4e223262de04aaf6b275742be7dbabef4efc755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e223262de04aaf6b275742be… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 13 17:24:02 2009 +0200 cmd: Fix German translation. --- programs/cmd/De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 1db2231..01a928a 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -177,9 +177,9 @@ Um eine Umgebungsvariable zu erschaffen oder zu ändern, ist der Syntax nötig:\ \n\ SET <Variable>=<Wert>\n\ \n\ -Wobei <Variable> und <Wert> Zeichenkette sind. Es müssen keine Leerzeichen vor\n\ -dem Gleichheitszeichen sein, noch muss der Variablenname in Anführungszeichen\n\ -eingeschlossen sein.\n\ +Wobei <Variable> und <Wert> Zeichenkette sind. Es dürfen keine Leerzeichen vor\n\ +dem Gleichheitszeichen sein, noch darf der Variablenname in Leerzeichen\n\ +enthalten.\n\ \n\ In Wine werden die Umgebungsvariablen des darunterliegenden Betriebssystems\n\ mit in die Win32 Umgebung eingebunden, deshalb gibt es gewöhnlich mehr Werte\n\

1 0

Alexander Nicolaysen Sørnes : Account creation: Add a note saying password will be e-mailed
by Alexander Nicolaysen Sørnes July 13, 2009

July 13, 2009

Module: appdb Branch: master Commit: 8c5be3a10dac47ad32ac7a086c880640123ad98d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8c5be3a10dac47ad32ac7a08… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 13 16:29:16 2009 +0200 Account creation: Add a note saying password will be e-mailed --- account.php | 1 - include/form_new.php | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/account.php b/account.php index 1ecff46..eaeadf2 100644 --- a/account.php +++ b/account.php @@ -110,7 +110,6 @@ function cmd_do_new() if($iResult == SUCCESS) { mail_appdb($oUser->sEmail, "New account", "Your password is ".$sPassword); - addmsg("Account created! Check your email for your password. (".$aClean['sUserEmail'].")", "green"); util_redirect_and_exit(apidb_fullurl()); } else if($iResult == USER_CREATE_EXISTS) diff --git a/include/form_new.php b/include/form_new.php index 560b4bd..1906225 100644 --- a/include/form_new.php +++ b/include/form_new.php @@ -11,6 +11,7 @@ echo html_frame_start("Create New Application DB Account","400","",0) ?>  +The password will be sent to your e-mail <table border=0 width="100%" cellspacing=0 cellpadding=20> <tr> <td class=color1> E-mail </td>

1 0

Alexander Nicolaysen Sørnes : create_tables: Fix MySQL commands for when the apidb DB is not present
by Alexander Nicolaysen Sørnes July 13, 2009

July 13, 2009

Module: appdb Branch: master Commit: d7bcdc23ec12d5a36a0341875020aaa317eb56dd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d7bcdc23ec12d5a36a034187… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 13 16:18:28 2009 +0200 create_tables: Fix MySQL commands for when the apidb DB is not present --- tables/create_tables | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/create_tables b/tables/create_tables index d41e1bd..e7d53aa 100755 --- a/tables/create_tables +++ b/tables/create_tables @@ -5,7 +5,7 @@ echo NOTE: It is ok for this to fail if the user already exists echo there does not appear to be a way to create a user only echo if they do not exist so we have to live with a potential echo error after we try. -mysql -p -u root apidb < create_user.sql +mysql -p -u root < create_user.sql echo Create the apidb database, and tables cat create_apidb_base.sql appdb_tables.sql \ @@ -13,4 +13,4 @@ cat create_apidb_base.sql appdb_tables.sql \ user_privs.sql app_category.sql \ maintainers.sql buglinks.sql monitors.sql \ error_log.sql distributions.sql testResults.sql \ - | mysql -p -u root apidb + | mysql -p -u root

1 0

Andrew Nguyen : server: Remap the EROFS errno value to STATUS_ACCESS_DENIED .
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 270179a78f214f30a0800add40fa1cb86d11924d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270179a78f214f30a0800add4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jul 12 23:55:43 2009 -0500 server: Remap the EROFS errno value to STATUS_ACCESS_DENIED. --- server/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.c b/server/file.c index dc93b4b..98017b9 100644 --- a/server/file.c +++ b/server/file.c @@ -602,8 +602,8 @@ void file_set_error(void) case ENOSPC: set_error( STATUS_DISK_FULL ); break; case EACCES: case ESRCH: + case EROFS: case EPERM: set_error( STATUS_ACCESS_DENIED ); break; - case EROFS: set_error( STATUS_MEDIA_WRITE_PROTECTED ); break; case EBUSY: set_error( STATUS_FILE_LOCK_CONFLICT ); break; case ENOENT: set_error( STATUS_NO_SUCH_FILE ); break; case EISDIR: set_error( STATUS_FILE_IS_A_DIRECTORY ); break;

1 0

Piotr Caban : jscript: Inherit Function_valueOf from Object.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 42f9608269390c4e49c045f9ae12afe74b80dd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f9608269390c4e49c045f9a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:31 2009 +0200 jscript: Inherit Function_valueOf from Object. --- dlls/jscript/function.c | 72 ++++++++++++++++++++----------------------- dlls/jscript/global.c | 15 ++++++--- dlls/jscript/jscript.h | 5 ++- dlls/jscript/object.c | 18 ++++------- dlls/jscript/tests/api.js | 6 ++- dlls/jscript/tests/lang.js | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42f9608269390c4e49c04…

1 0

Piotr Caban : jscript: Fix String_match implementation.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 91ce0dd6a33edf148bb01675873158df1577caa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ce0dd6a33edf148bb016758… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:21 2009 +0200 jscript: Fix String_match implementation. --- dlls/jscript/string.c | 9 ++++++--- dlls/jscript/tests/regexp.js | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0385a22..6aa6302 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -596,9 +596,12 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); - if(arg_cnt(dp) != 1) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_NULL; + } + + return S_OK; } arg_var = get_arg(dp, 0); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 6809101..3e4db68 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -31,7 +31,7 @@ ok(m["0"] === "ab", "m[0] is not \"ab\""); m = "abcabc".match(/ab/g); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -41,7 +41,7 @@ ok(m === null, "m is not null"); m = "abcabc".match(/Ab/gi); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -64,22 +64,30 @@ ok(m["0"] === "ab", "m[0] is not \"ab\""); m = "abcabc".match(new RegExp("ab","g")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp(/ab/g)); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp("ab","g", "test")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +m = "abcabcg".match("ab", "g"); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 1, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); + +m = "abcabc".match(); +ok(m === null, "m is not null"); + r = "- [test] -".replace(/\[([^\[]+)\]/g, "success"); ok(r === "- success -", "r = " + r + " expected '- success -'");

1 0

Piotr Caban : jscript: Make String_toUpperCase generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: df8195668d7f7366b8ef8a3d97b2ef9ec3fbdfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8195668d7f7366b8ef8a3d9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:10 2009 +0200 jscript: Make String_toUpperCase generic. --- dlls/jscript/string.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b33eb4f..0385a22 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1388,33 +1388,46 @@ static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *string; const WCHAR* str; DWORD length; - BSTR bstr; + BSTR val_str = NULL; + HRESULT hres; TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(retv) { - bstr = SysAllocStringLen(str, length); - if (!bstr) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } - struprW(bstr); + struprW(val_str); V_VT(retv) = VT_BSTR; - V_BSTR(retv) = bstr; + V_BSTR(retv) = val_str; } + else SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_toLowerCase generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: ab8168141be96ba168a347e1244460691ec637bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8168141be96ba168a347e12… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:02 2009 +0200 jscript: Make String_toLowerCase generic. --- dlls/jscript/string.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index dcb0266..b33eb4f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1342,33 +1342,46 @@ static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *string; const WCHAR* str; DWORD length; - BSTR bstr; + BSTR val_str = NULL; + HRESULT hres; TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(retv) { - bstr = SysAllocStringLen(str, length); - if (!bstr) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } - strlwrW(bstr); + strlwrW(val_str); V_VT(retv) = VT_BSTR; - V_BSTR(retv) = bstr; + V_BSTR(retv) = val_str; } + else SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_substring generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 973f3be02c867b12e73204680581b6dccf10472e URL: http://source.winehq.org/git/wine.git/?a=commit;h=973f3be02c867b12e73204680… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:54 2009 +0200 jscript: Make String_substring generic. --- dlls/jscript/string.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 19f3792..dcb0266 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1241,6 +1241,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; + BSTR val_str = NULL; INT start=0, end; DWORD length; VARIANT v; @@ -1248,20 +1249,32 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(arg_cnt(dp) >= 1) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { start = V_I4(&v); @@ -1276,8 +1289,10 @@ 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); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { end = V_I4(&v); @@ -1301,9 +1316,12 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocStringLen(str+start, end-start); - if(!V_BSTR(retv)) + if(!V_BSTR(retv)) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } } + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_split generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 09e1b37fea847fc3dcad464b5c0da173d0688bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e1b37fea847fc3dcad464b5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:47 2009 +0200 jscript: Make String_split generic. --- dlls/jscript/string.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d0345aa..19f3792 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1085,26 +1085,38 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t *match_result = NULL; - DWORD match_cnt, i, match_len = 0; - StringInstance *string; - const WCHAR *ptr, *ptr2; + DWORD length, match_cnt, i, match_len = 0; + const WCHAR *str, *ptr, *ptr2; VARIANT *arg, var; DispatchEx *array; - BSTR match_str = NULL; + BSTR val_str = NULL, match_str = NULL; HRESULT hres; TRACE("\n"); - if(!is_class(dispex, JSCLASS_STRING)) { - FIXME("not String this\n"); + if(arg_cnt(dp) != 1) { + FIXME("unsupported args\n"); return E_NOTIMPL; } - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - if(arg_cnt(dp) != 1) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } arg = get_arg(dp, 0); @@ -1115,10 +1127,12 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); if(regexp) { if(is_class(regexp, JSCLASS_REGEXP)) { - hres = regexp_match(regexp, string->str, string->length, TRUE, &match_result, &match_cnt); + hres = regexp_match(regexp, str, length, TRUE, &match_result, &match_cnt); jsdisp_release(regexp); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } break; } jsdisp_release(regexp); @@ -1126,8 +1140,10 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } default: hres = to_string(dispex->ctx, arg, ei, &match_str); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } match_len = SysStringLen(match_str); if(!match_len) { @@ -1139,7 +1155,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM hres = create_array(dispex->ctx, 0, &array); if(SUCCEEDED(hres)) { - ptr = string->str; + ptr = str; for(i=0;; i++) { if(match_result) { if(i == match_cnt) @@ -1177,7 +1193,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } if(SUCCEEDED(hres) && (match_str || match_result)) { - DWORD len = (string->str+string->length) - ptr; + DWORD len = (str+length) - ptr; if(len || match_str) { V_VT(&var) = VT_BSTR; @@ -1193,6 +1209,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } SysFreeString(match_str); + SysFreeString(val_str); heap_free(match_result); if(SUCCEEDED(hres) && retv) {

1 0

Piotr Caban : jscript: Make String_slice generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 2f28956f065b7df1f3fbb4ea737f30f220b98d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f28956f065b7df1f3fbb4ea7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:36 2009 +0200 jscript: Make String_slice generic. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5644559..d0345aa 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -982,6 +982,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; + BSTR val_str = NULL; DWORD length; INT start=0, end; VARIANT v; @@ -989,20 +990,32 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - str = string->str; - length = string->length; - }else { - FIXME("this is not a string class\n"); - return E_NOTIMPL; + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(arg_cnt(dp)) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { start = V_I4(&v); @@ -1022,8 +1035,10 @@ 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); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { end = V_I4(&v); @@ -1046,12 +1061,16 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(retv) { BSTR retstr = SysAllocStringLen(str+start, end-start); - if(!str) + if(!retstr) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } V_VT(retv) = VT_BSTR; V_BSTR(retv) = retstr; } + + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_replace generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 54a3fa842b80704e42e2731aaacc39384317d6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a3fa842b80704e42e2731aa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:28 2009 +0200 jscript: Make String_replace generic. --- dlls/jscript/string.c | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index a291ea1..5644559 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -794,11 +794,11 @@ static HRESULT rep_call(DispatchEx *func, const WCHAR *str, match_result_t *matc static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + const WCHAR *str; DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; - BSTR rep_str = NULL, match_str = NULL, ret_str; + BSTR rep_str = NULL, match_str = NULL, ret_str, val_str = NULL; DispatchEx *rep_func = NULL, *regexp = NULL; match_result_t *parens = NULL, match; - const WCHAR *str; strbuf_t ret = {NULL,0,0}; BOOL gcheck = FALSE; VARIANT *arg_var; @@ -806,23 +806,36 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; - str = string->str; - length = string->length; - }else { - FIXME("not String this\n"); - return E_NOTIMPL; + if(!is_class(dispex, JSCLASS_STRING)) { + 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); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(!arg_cnt(dp)) { if(retv) { - ret_str = SysAllocString(str); - if(!ret_str) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } V_VT(retv) = VT_BSTR; - V_BSTR(retv) = ret_str; + V_BSTR(retv) = val_str; } return S_OK; } @@ -842,8 +855,10 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR default: hres = to_string(dispex->ctx, arg_var, ei, &match_str); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } } if(arg_cnt(dp) >= 2) { @@ -936,6 +951,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR jsdisp_release(rep_func); if(regexp) jsdisp_release(regexp); + SysFreeString(val_str); SysFreeString(rep_str); SysFreeString(match_str); heap_free(parens);

1 0

Piotr Caban : jscript: Make String_match generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 0cb6bf5b28486dea0b04a809988405d39e136052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb6bf5b28486dea0b04a8099… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:15 2009 +0200 jscript: Make String_match generic. --- dlls/jscript/string.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0c9e3d6..a291ea1 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -585,12 +585,13 @@ static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *This = (StringInstance*)dispex; + const WCHAR *str; match_result_t *match_result; DispatchEx *regexp; DispatchEx *array; VARIANT var, *arg_var; - DWORD match_cnt, i; + DWORD length, match_cnt, i; + BSTR val_str; HRESULT hres = S_OK; TRACE("\n"); @@ -623,22 +624,50 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } } - hres = regexp_match(regexp, This->str, This->length, FALSE, &match_result, &match_cnt); + if(!is_class(dispex, JSCLASS_STRING)) { + 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)) { + jsdisp_release(regexp); + return hres; + } + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; + } + + hres = regexp_match(regexp, str, length, FALSE, &match_result, &match_cnt); jsdisp_release(regexp); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(!match_cnt) { TRACE("no match\n"); if(retv) V_VT(retv) = VT_NULL; + + SysFreeString(val_str); return S_OK; } hres = create_array(dispex->ctx, match_cnt, &array); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } V_VT(&var) = VT_BSTR; @@ -655,6 +684,8 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM break; } + SysFreeString(val_str); + if(SUCCEEDED(hres) && retv) { V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array);

1 0