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

Paul Chitescu : kernel32: Declare and add stubs for GetLogicalProcessorInformation(Ex).
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 2e977463405efee97f5c972d7601b1df9dd0f43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e977463405efee97f5c972d7… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 19 18:22:35 2010 +0300 kernel32: Declare and add stubs for GetLogicalProcessorInformation(Ex). --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/process.c | 20 ++++++++++++++++++++ include/winbase.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 843e97c..e7ae774 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -547,6 +547,8 @@ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() +@ stdcall GetLogicalProcessorInformation(ptr ptr) +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) @ stdcall GetLongPathNameA (str long long) @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1e4a6e1..fc170f9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3323,6 +3323,26 @@ HANDLE WINAPI GetCurrentProcess(void) } /*********************************************************************** + * GetLogicalProcessorInformation (KERNEL32.@) + */ +BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer, PDWORD pBufLen) +{ + FIXME("(%p,%p): stub\n", buffer, pBufLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * GetLogicalProcessorInformationEx (KERNEL32.@) + */ +BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer, PDWORD pBufLen) +{ + FIXME("(%u,%p,%p): stub\n", relationship, buffer, pBufLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CmdBatNotification (KERNEL32.@) * * Notifies the system that a batch file has started or finished. diff --git a/include/winbase.h b/include/winbase.h index c3dc64c..ea10696 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1701,6 +1701,8 @@ WINBASEAPI BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UI #define GetPrivateProfileStruct WINELIB_NAME_AW(GetPrivateProfileStruct) WINBASEAPI FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); WINBASEAPI BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD_PTR,PDWORD_PTR); +WINBASEAPI BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION,PDWORD); +WINBASEAPI BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP,PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX,PDWORD); WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);

1 0

Henri Verbeet : ddraw: Merge the surface thunks into surface.c.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: ce8f6ecf6e27436f1cde97498e86ec48a1f95486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8f6ecf6e27436f1cde97498… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 18:36:20 2010 +0200 ddraw: Merge the surface thunks into surface.c. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/surface.c | 849 ++++++++++++++++++++++++++++++------------- dlls/ddraw/surface_thunks.c | 473 ------------------------ 5 files changed, 594 insertions(+), 735 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce8f6ecf6e27436f1cde9…

1 0

David Hedberg : shell32: Shell_GetImageLists should be declared in shlobj. h and exported by name.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: be2259dce9bc8cb7d163a13392475c278089fa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2259dce9bc8cb7d163a1339… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 10:11:49 2010 +0200 shell32: Shell_GetImageLists should be declared in shlobj.h and exported by name. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.h | 2 -- dlls/shell32/shellord.c | 2 +- dlls/shell32/shlmenu.c | 2 +- include/shlobj.h | 1 + 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 0bc5820..83ed1dd 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -200,7 +200,7 @@ static void InitializeTreeView( browse_info *info ) TRACE("%p\n", info ); - Shell_GetImageList(NULL, &hImageList); + Shell_GetImageLists(NULL, &hImageList); if (hImageList) SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c4087d2..637dbca 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -513,13 +513,13 @@ static int SIC_LoadOverlayIcon(int icon_idx) } /************************************************************************* - * Shell_GetImageList [SHELL32.71] + * Shell_GetImageLists [SHELL32.71] * * PARAMETERS * imglist[1|2] [OUT] pointer which receives imagelist handles * */ -BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) +BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) { TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) { *lpBigList = ShellBigIconList; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index ee6f8a5..7f1c5b6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -66,7 +66,7 @@ 68 stdcall -noname SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource 70 stdcall -noname SHCreateDefClassObject(long long long long long) - 71 stdcall -noname Shell_GetImageList(ptr ptr) + 71 stdcall -ordinal Shell_GetImageLists(ptr ptr) 72 stdcall -noname Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW 73 stdcall -noname SHShellFolderView_Message(long long long) 74 stdcall -noname SHCreateStdEnumFmtEtc(long ptr ptr) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3eecdad..87fb911 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -45,8 +45,6 @@ extern HINSTANCE shell32_hInstance; extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellBigIconList; -BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); - /* Iconcache */ #define INVALID_INDEX -1 BOOL SIC_Initialize(void); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fac7a7a..051154d 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2203,7 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) return E_FAIL; } - Shell_GetImageList(&hLarge, &hSmall); + Shell_GetImageLists(&hLarge, &hSmall); hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); /* Get the interface for the new image list */ diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index ae13ff8..a6cc314 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -628,7 +628,7 @@ LRESULT WINAPI FileMenu_DrawItem( ExtTextOutW (lpdis->hDC, xt , yt, ETO_OPAQUE, &TextRect, pMyItem->szItemText, pMyItem->cchItemText, NULL); - Shell_GetImageList(0, &hImageList); + Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); diff --git a/include/shlobj.h b/include/shlobj.h index bd00d21..0aef3cf 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -83,6 +83,7 @@ int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); +BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */

1 0

David Hedberg : shell32: Shell_MergeMenus should be declared in shlobj. h and exported by name.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 65f6ab7c8646da4f5d0a46c3e5fad8189f7a04c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f6ab7c8646da4f5d0a46c3e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 10:11:48 2010 +0200 shell32: Shell_MergeMenus should be declared in shlobj.h and exported by name. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.h | 5 ----- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 -- dlls/shell32/undocshell.h | 4 ---- include/shlobj.h | 6 ++++++ 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f913872..ee6f8a5 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -62,7 +62,7 @@ 64 stdcall -noname DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -noname IsNetDrive(long) - 67 stdcall -noname Shell_MergeMenus(long long long long long long) + 67 stdcall -ordinal Shell_MergeMenus(long long long long long long) 68 stdcall -noname SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource 70 stdcall -noname SHCreateDefClassObject(long long long long long) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 8f51850..3eecdad 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -108,11 +108,6 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST); LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST); -/* menu merging */ -#define MM_ADDSEPARATOR 0x00000001L -#define MM_SUBMENUSHAVEIDS 0x00000002L -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); - /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ {\ diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index aea319c..ae13ff8 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -857,7 +857,7 @@ static BOOL _SHIsMenuSeparator(HMENU hm, int i) /************************************************************************* * Shell_MergeMenus [SHELL32.67] */ -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) +UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) { int nItem; HMENU hmSubMenu; BOOL bAlreadySeparated; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 08867c8..3e9a2e4 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2309,8 +2309,6 @@ static void test_unicode(void) ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); } -extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); - static void test_shlmenu(void) { HRESULT hres; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 513006d..fa0ac05 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -191,10 +191,6 @@ int WINAPI Shell_GetCachedImageIndex( UINT nIconIndex, BOOL bSimulateDoc); -BOOL WINAPI Shell_GetImageLists( - HIMAGELIST *lphimlLarge, - HIMAGELIST *lphimlSmall); - HICON WINAPI SHGetFileIcon( DWORD dwReserved, LPCSTR lpszPath, diff --git a/include/shlobj.h b/include/shlobj.h index 5f125c1..bd00d21 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -82,6 +82,7 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); BOOL WINAPI IsUserAnAdmin(void); +UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ @@ -116,6 +117,11 @@ BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR); +/* Shell_MergeMenus flags */ +#define MM_ADDSEPARATOR 0x00000001 +#define MM_SUBMENUSHAVEIDS 0x00000002 +#define MM_DONTREMOVESEPS 0x00000004 + /***************************************************************************** * IContextMenu interface */

1 0

Michael Mc Donnell : shell32/tests: Test that clicking "Make New Folder" makes a new folder.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 5c715b46f4312a2e76aa14499e09edad2af42e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c715b46f4312a2e76aa14499… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sat Jul 10 11:38:06 2010 -0400 shell32/tests: Test that clicking "Make New Folder" makes a new folder. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/brsfolder.c | 189 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 2849a33..0799944 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 C_SRCS = \ appbar.c \ autocomplete.c \ + brsfolder.c \ generated.c \ progman_dde.c \ shelllink.c \ diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c new file mode 100644 index 0000000..af2bc73 --- /dev/null +++ b/dlls/shell32/tests/brsfolder.c @@ -0,0 +1,189 @@ +/* + * Unit test of the SHBrowseForFolder function. + * + * Copyright 2009 Michael Mc Donnell + * + * 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 <windows.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <string.h> + +#include "wine/test.h" +#define IDD_MAKENEWFOLDER 0x3746 /* From "../shresdef.h" */ + +/* + * Returns the number of folders in a folder. + */ +static int get_number_of_folders(LPCSTR path) +{ + int number_of_folders = 0; + char path_search_string[MAX_PATH]; + WIN32_FIND_DATA find_data; + HANDLE find_handle; + + strncpy(path_search_string, path, MAX_PATH); + strncat(path_search_string, "*", 1); + + find_handle = FindFirstFile(path_search_string, &find_data); + if (find_handle == INVALID_HANDLE_VALUE) + return -1; + + do + { + if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + strcmp(find_data.cFileName, ".") != 0 && + strcmp(find_data.cFileName, "..") != 0) + { + number_of_folders++; + } + } + while (FindNextFile(find_handle, &find_data) != 0); + + return number_of_folders; +} + +static BOOL does_folder_or_file_exist(LPCSTR folder_path) +{ + DWORD file_attributes = GetFileAttributesA(folder_path); + return !(file_attributes == INVALID_FILE_ATTRIBUTES); +} + +/* + * Callback used by test_click_make_new_folder_button for SHBrowseForFolder + * dialog box. It clicks the "Make New Folder" button and then closes the dialog + * box. + */ +static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, + LPARAM lParam, LPARAM lpData) +{ + switch (uMsg) + { + case BFFM_INITIALIZED: + /* Click "Make New Folder" button */ + SendMessage(hwnd, WM_COMMAND, IDD_MAKENEWFOLDER, 0); + /* Close dialog box */ + SendMessage(hwnd, WM_COMMAND, IDCANCEL, 0); + return TRUE; + default: + return FALSE; + } +} + +/* + * Tests if clicking the "Make New Folder" button in a SHBrowseForFolder + * dialog box creates a new folder. (Bug 17986). + * + * The algorithm is: + * 1. Check that there is no "test_click_make_new_folder_button" folder. + * 2. Create a test folder called "test_click_make_new_folder_button". + * 3. Use the test folder as root for SHBrowseForFolder dialog box. + * 3. Hook up SHBrowseForFolder dialog box with callback. + * 4. Display SHBrowseForFolder dialog box. + * 5. Callback clicks "Make New Folder" button (by sending a message). + * 6. Callback closes SHBrowseForFolder dialog box. + * 7. Check that there is a new folder inside the test folder. + * 8. Remove the test folder and any subfolders. + */ +static void test_click_make_new_folder_button(void) +{ + HRESULT resCoInit; + BROWSEINFO bi; + LPITEMIDLIST pidl = NULL; + LPITEMIDLIST test_folder_pidl; + IShellFolder *test_folder_object; + char test_folder_path[MAX_PATH]; + WCHAR test_folder_pathW[MAX_PATH]; + char selected_folder[MAX_PATH]; + const CHAR title[] = "test_click_make_new_folder_button"; + int number_of_folders = -1; + SHFILEOPSTRUCT shfileop; + + if (does_folder_or_file_exist(title)) + { + skip("The test folder already exists.\n"); + return; + } + + /* Must initialize COM if using the NEWDIAlOGSTYLE according to MSDN. */ + resCoInit = CoInitialize(NULL); + if(!(resCoInit == S_OK || resCoInit == S_FALSE)) + { + skip("COM could not be initialized %u\n", GetLastError()); + return; + } + + /* Leave room for concatenating title, two backslashes, and an extra NULL. */ + if (!GetCurrentDirectoryA(MAX_PATH-strlen(title)-3, test_folder_path)) + { + skip("GetCurrentDirectoryA failed %u\n", GetLastError()); + } + strncat(test_folder_path, "\\", 1); + strncat(test_folder_path, title, MAX_PATH-1); + strncat(test_folder_path, "\\", 1); + + /* Avoid conflicts by creating a test folder. */ + if (!CreateDirectoryA(title, NULL)) + { + skip("CreateDirectoryA failed %u\n", GetLastError()); + return; + } + + /* Initialize browse info struct for SHBrowseForFolder */ + bi.hwndOwner = NULL; + bi.pszDisplayName = (LPTSTR) &selected_folder; + bi.lpszTitle = (LPTSTR) title; + bi.ulFlags = BIF_NEWDIALOGSTYLE; + bi.lpfn = create_new_folder_callback; + /* Use test folder as the root folder for dialog box */ + MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, + test_folder_pathW, MAX_PATH*sizeof(WCHAR)); + SHGetDesktopFolder(&test_folder_object); + test_folder_object->lpVtbl->ParseDisplayName(test_folder_object, NULL, NULL, + test_folder_pathW, 0UL, &test_folder_pidl, 0UL); + bi.pidlRoot = test_folder_pidl; + + /* Display dialog box and let callback click the buttons */ + pidl = SHBrowseForFolder(&bi); + + number_of_folders = get_number_of_folders(test_folder_path); + todo_wine ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W98, W2K */, + "Clicking \"Make New Folder\" button did not result in a new folder.\n"); + + /* Remove test folder and any subfolders created in this test */ + shfileop.hwnd = NULL; + shfileop.wFunc = FO_DELETE; + /* Path must be double NULL terminated */ + test_folder_path[strlen(test_folder_path)+1] = '\0'; + shfileop.pFrom = test_folder_path; + shfileop.pTo = NULL; + shfileop.fFlags = FOF_NOCONFIRMATION|FOF_NOERRORUI|FOF_SILENT; + SHFileOperation(&shfileop); + + if (pidl) + CoTaskMemFree(pidl); + if (test_folder_pidl) + CoTaskMemFree(test_folder_pidl); + if (test_folder_object) + test_folder_object->lpVtbl->Release(test_folder_object); + + CoUninitialize(); +} + +START_TEST(brsfolder) +{ + test_click_make_new_folder_button(); +}

1 0

Henri Verbeet : ddraw: Merge the ddraw thunks into ddraw.c.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 6fb9ee0ee7ab11d2ebcb4529ac395c0fcd0f0266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb9ee0ee7ab11d2ebcb4529a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 18:36:19 2010 +0200 ddraw: Merge the ddraw thunks into ddraw.c. Note how both ddraw 1 and ddraw 7 used the same IDirectDrawImpl_XXX naming convention. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/ddraw.c | 1540 ++++++++++++++++++++++++++++++++++++++------ dlls/ddraw/ddraw_private.h | 25 +- dlls/ddraw/ddraw_thunks.c | 1201 ---------------------------------- dlls/ddraw/device.c | 6 +- dlls/ddraw/direct3d.c | 5 +- dlls/ddraw/surface.c | 4 +- 7 files changed, 1340 insertions(+), 1442 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fb9ee0ee7ab11d2ebcb4…

1 0

Austin English : Remove references to wineprefixcreate.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 82868174bcf2460d3692bad3b48050a82018cabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82868174bcf2460d3692bad3b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 19 18:38:04 2010 -0500 Remove references to wineprefixcreate. --- dlls/dinput8/dinput8_main.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- programs/winecfg/drivedetect.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 87dd07b..9d426fb 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -66,7 +66,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { - ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr); + ERR("CoCreateInstance failed with hr = %d\n", hr); return DIERR_INVALIDPARAM; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index cf031f5..3db2e81 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -439,7 +439,7 @@ static void test_persist(void) 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinkCreateFromString failed with error 0x%08x\n", hr); if (!lnk) { - skip("Can't create lnk, skipping test_persist. Was wineprefixcreate run properly?\n"); + skip("Can't create lnk, skipping test_persist.\n"); return; } test_persist_save_data("url only", lnk, diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 75bce53..b20b97c 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -204,7 +204,7 @@ static void report_error(int code) case NO_DRIVE_C: if (gui_mode) - MessageBox(NULL, "No virtual drive C mapped\n\nTry running wineprefixcreate", "", MB_OK | MB_ICONEXCLAMATION); + MessageBox(NULL, "No virtual drive C mapped!\n", "", MB_OK | MB_ICONEXCLAMATION); else fprintf(stderr, "winecfg: no drive_c directory\n");

1 0

Paul Chitescu : kernel32: Declare structures related to logical processor information (core, cache, node, group).
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 25c8f445c0819ff53243f9d7158838206df1fd26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c8f445c0819ff53243f9d71… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 19 18:32:38 2010 +0300 kernel32: Declare structures related to logical processor information (core, cache, node, group). --- include/winnt.h | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index eb3ab2c..e29444a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5476,6 +5476,114 @@ typedef enum _JOBOBJECTINFOCLASS MaxJobObjectInfoClass } JOBOBJECTINFOCLASS; +typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP +{ + RelationProcessorCore = 0, + RelationNumaNode = 1, + RelationCache = 2, + RelationProcessorPackage = 3, + RelationGroup = 4, + RelationAll = 0xffff +} LOGICAL_PROCESSOR_RELATIONSHIP; + +typedef enum _PROCESSOR_CACHE_TYPE +{ + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace +} PROCESSOR_CACHE_TYPE; + +typedef struct _PROCESSOR_GROUP_INFO +{ + BYTE MaximumProcessorCount; + BYTE ActiveProcessorCount; + BYTE Reserved[38]; + KAFFINITY ActiveProcessorMask; +} PROCESSOR_GROUP_INFO, *PPROCESSOR_GROUP_INFO; + +typedef struct _CACHE_DESCRIPTOR +{ + BYTE Level; + BYTE Associativity; + WORD LineSize; + DWORD Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + +typedef struct _GROUP_AFFINITY +{ + KAFFINITY Mask; + WORD Group; + WORD Reserved[3]; +} GROUP_AFFINITY, *PGROUP_AFFINITY; + +typedef struct _PROCESSOR_RELATIONSHIP +{ + BYTE Flags; + BYTE Reserved[21]; + WORD GroupCount; + GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; +} PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; + + +typedef struct _NUMA_NODE_RELATIONSHIP +{ + DWORD NodeNumber; + BYTE Reserved[20]; + GROUP_AFFINITY GroupMask; +} NUMA_NODE_RELATIONSHIP, *PNUMA_NODE_RELATIONSHIP; + +typedef struct _CACHE_RELATIONSHIP +{ + BYTE Level; + BYTE Associativity; + WORD LineSize; + PROCESSOR_CACHE_TYPE Type; + BYTE Reserved[20]; + GROUP_AFFINITY GroupMask; +} CACHE_RELATIONSHIP, *PCACHE_RELATIONSHIP; + +typedef struct _GROUP_RELATIONSHIP +{ + WORD MaximumGroupCount; + WORD ActiveGroupCount; + BYTE Reserved[20]; + PROCESSOR_GROUP_INFO GroupInfo[ANYSIZE_ARRAY]; +} GROUP_RELATIONSHIP, *PGROUP_RELATIONSHIP; + +typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION +{ + ULONG_PTR ProcessorMask; + LOGICAL_PROCESSOR_RELATIONSHIP Relationship; + union + { + struct + { + BYTE Flags; + } ProcessorCore; + struct + { + DWORD NodeNumber; + } NumaNode; + CACHE_DESCRIPTOR Cache; + ULONGLONG Reserved[2]; + } DUMMYUNIONNAME; +} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; + +typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX +{ + LOGICAL_PROCESSOR_RELATIONSHIP Relationship; + DWORD Size; + union + { + PROCESSOR_RELATIONSHIP Processor; + NUMA_NODE_RELATIONSHIP NumaNode; + CACHE_RELATIONSHIP Cache; + GROUP_RELATIONSHIP Group; + } DUMMYUNIONNAME; +} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; + NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); #ifdef __cplusplus

1 0

Alexandre Julliard : tests: Run all tests with the default FPU control word .
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: b14cfdeea4a2540d76749a6571a80195b8a53913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14cfdeea4a2540d76749a657… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 11:41:05 2010 +0200 tests: Run all tests with the default FPU control word. --- dlls/kernel32/tests/thread.c | 2 -- include/wine/test.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 3da29a2..19e695b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1329,8 +1329,6 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } -void _fpreset(void) {} /* override the mingw fpu init code */ - static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/include/wine/test.h b/include/wine/test.h index 6ff4372..1a98025 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -590,6 +590,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +void _fpreset(void) {} /* override the mingw fpu init code */ + /* main function */ int main( int argc, char **argv ) {

1 0

Alexandre Julliard : tests: Print information about the last executed test before crashing.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 89ad1f2615918067bb6198bcdae74304f2c40dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ad1f2615918067bb6198bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 19 23:46:18 2010 +0200 tests: Print information about the last executed test before crashing. --- include/wine/test.h | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 27c4938..6ff4372 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -237,8 +237,7 @@ static tls_data* get_tls_data(void) data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data)); - data->todo_level = 0; + data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -577,6 +576,19 @@ static void usage( const char *argv0 ) exit_process(1); } +/* trap unhandled exceptions */ +static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) +{ + tls_data *data = get_tls_data(); + + if (data->current_file) + fprintf( stdout, "%s:%d: this is the last test seen before the exception\n", + data->current_file, data->current_line ); + fprintf( stdout, "%s: unhandled exception %08x at %p\n", current_test->name, + ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + fflush( stdout ); + return EXCEPTION_EXECUTE_HANDLER; +} /* main function */ int main( int argc, char **argv ) @@ -593,6 +605,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); if (!argv[1])

1 0