September 2008 - Wine-commits

Christian Costa : d3dxof: Fix IDirectXFileDataReference macros.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: b939b8d3452e6ccabde236a2087046c1649343d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b939b8d3452e6ccabde236a20… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Aug 31 10:34:46 2008 +0200 d3dxof: Fix IDirectXFileDataReference macros. --- include/dxfile.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dxfile.h b/include/dxfile.h index cf63541..b0adceb 100644 --- a/include/dxfile.h +++ b/include/dxfile.h @@ -207,14 +207,14 @@ DECLARE_INTERFACE_(IDirectXFileDataReference,IDirectXFileObject) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ -#define IDirectXFileData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectXFileData_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectXFileData_Release(p) (p)->lpVtbl->Release(p) +#define IDirectXFileDataReference_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectXFileDataReference_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectXFileDataReference_Release(p) (p)->lpVtbl->Release(p) /*** IDirectXFileObject methods ***/ -#define IDirectXFileData_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) -#define IDirectXFileData_GetId(p,a) (p)->lpVtbl->GetId(p,a) +#define IDirectXFileDataReference_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) +#define IDirectXFileDataReference_GetId(p,a) (p)->lpVtbl->GetId(p,a) /*** IDirectXFileDataReference methods ***/ -#define IDirectXFileData_Resolve(p,a) (p)->lpVtbl->GetData(p,a) +#define IDirectXFileDataReference_Resolve(p,a) (p)->lpVtbl->GetData(p,a) #endif #define INTERFACE IDirectXFileBinary

1 0

Paul Vriens : msi/tests: Create a system restore point when needed.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: c559895ce901dc9edc69f851309d9d4687728ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c559895ce901dc9edc69f8513… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 1 12:16:41 2008 +0200 msi/tests: Create a system restore point when needed. --- dlls/msi/tests/install.c | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e335cfa..3ff3420 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -29,6 +29,7 @@ #include <msi.h> #include <fci.h> #include <objidl.h> +#include <srrestoreptapi.h> #include "wine/test.h" @@ -39,6 +40,10 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static UINT (WINAPI *pMsiSourceListGetInfoA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); +static HMODULE hsrclient = 0; +static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); +static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); + static const char *msifile = "msitest.msi"; static const char *msifile2 = "winetest2.msi"; static const char *mstfile = "winetest.mst"; @@ -1271,14 +1276,18 @@ static void init_functionpointers(void) { HMODULE hmsi = GetModuleHandleA("msi.dll"); -#define GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hmsi, #func); \ +#define GET_PROC(mod, func) \ + p ## func = (void*)GetProcAddress(mod, #func); \ if(!p ## func) \ trace("GetProcAddress(%s) failed\n", #func); - GET_PROC(MsiQueryComponentStateA); - GET_PROC(MsiSourceListEnumSourcesA); - GET_PROC(MsiSourceListGetInfoA); + GET_PROC(hmsi, MsiQueryComponentStateA); + GET_PROC(hmsi, MsiSourceListEnumSourcesA); + GET_PROC(hmsi, MsiSourceListGetInfoA); + + hsrclient = LoadLibraryA("srclient.dll"); + GET_PROC(hsrclient, SRRemoveRestorePoint); + GET_PROC(hsrclient, SRSetRestorePointA); #undef GET_PROC } @@ -1618,6 +1627,27 @@ static void check_service_is_installed(void) CloseServiceHandle(scm); } +static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) +{ + RESTOREPOINTINFOA spec; + + spec.dwEventType = event_type; + spec.dwRestorePtType = APPLICATION_INSTALL; + spec.llSequenceNumber = status->llSequenceNumber; + lstrcpyA(spec.szDescription, "msitest restore point"); + + return pSRSetRestorePointA(&spec, status); +} + +static void remove_restore_point(DWORD seq_number) +{ + DWORD res; + + res = pSRRemoveRestorePoint(seq_number); + if (res != ERROR_SUCCESS) + trace("Failed to remove the restore point : %08x\n", res); +} + static void test_MsiInstallProduct(void) { UINT r; @@ -5402,6 +5432,8 @@ START_TEST(install) { DWORD len; char temp_path[MAX_PATH], prev_path[MAX_PATH]; + STATEMGRSTATUS status; + BOOL ret = FALSE; init_functionpointers(); @@ -5417,6 +5449,15 @@ START_TEST(install) get_program_files_dir(PROG_FILES_DIR, COMMON_FILES_DIR); + /* Create a restore point ourselves so we circumvent the multitude of restore points + * that would have been created by all the installation and removal tests. + */ + if (pSRSetRestorePointA) + { + memset(&status, 0, sizeof(status)); + ret = notify_system_change(BEGIN_NESTED_SYSTEM_CHANGE, &status); + } + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); @@ -5453,5 +5494,13 @@ START_TEST(install) test_MsiConfigureProductEx(); test_missingcomponent(); + if (pSRSetRestorePointA && ret) + { + ret = notify_system_change(END_NESTED_SYSTEM_CHANGE, &status); + if (ret) + remove_restore_point(status.llSequenceNumber); + } + FreeLibrary(hsrclient); + SetCurrentDirectoryA(prev_path); }

1 0

Paul Vriens : shell32/tests: Don't test unimplemented functions.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 4732f48fbc3c1e0827a1e09e0bac47079fe4a34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4732f48fbc3c1e0827a1e09e0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 1 16:03:44 2008 +0200 shell32/tests: Don't test unimplemented functions. --- dlls/shell32/tests/shlfolder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9bb7208..a5fff49 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1271,7 +1271,12 @@ static void test_ITEMIDLIST_format(void) { ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; + SetLastError(0xdeadbeef); bResult = SetCurrentDirectoryW(wszPersonal); + if (!bResult && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("Most W-calls are not implemented\n"); + return; + } ok(bResult, "SetCurrentDirectory failed! Last error: %u\n", GetLastError()); if (!bResult) return;

1 0

Paul Vriens : shlwapi/tests: Don't test unimplemented functions.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: cea45c533991ccb1bf2b09c7de789df6fd5fd648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea45c533991ccb1bf2b09c7d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 1 16:04:05 2008 +0200 shlwapi/tests: Don't test unimplemented functions. --- dlls/shlwapi/tests/ordinal.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index df90bf7..484db0a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -42,13 +42,19 @@ static void test_GetAcceptLanguagesA(void) DWORD buffersize, buffersize2, exactsize; char buffer[100]; - if (!pGetAcceptLanguagesA) + if (!pGetAcceptLanguagesA) { + win_skip("GetAcceptLanguagesA is not available\n"); return; + } buffersize = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); + if (!retval && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("GetAcceptLanguagesA is not implemented\n"); + return; + } trace("GetAcceptLanguagesA: retval %08x, size %08x, buffer (%s)," " last error %u\n", retval, buffersize, buffer, GetLastError()); if(retval != S_OK) { @@ -58,7 +64,6 @@ static void test_GetAcceptLanguagesA(void) ok( (ERROR_NO_IMPERSONATION_TOKEN == GetLastError()) || (ERROR_CLASS_DOES_NOT_EXIST == GetLastError()) || (ERROR_PROC_NOT_FOUND == GetLastError()) || - (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) || (ERROR_SUCCESS == GetLastError()), "last error set to %u\n", GetLastError()); exactsize = strlen(buffer); @@ -105,9 +110,9 @@ static void test_GetAcceptLanguagesA(void) switch(retval) { case 0L: if(buffersize == exactsize) { - ok( (ERROR_SUCCESS == GetLastError()) || (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) || + ok( (ERROR_SUCCESS == GetLastError()) || (ERROR_PROC_NOT_FOUND == GetLastError()) || (ERROR_NO_IMPERSONATION_TOKEN == GetLastError()), - "last error wrong: got %u; expected ERROR_SUCCESS(NT4)/ERROR_CALL_NOT_IMPLEMENTED(98/ME)/" + "last error wrong: got %u; expected ERROR_SUCCESS(NT4)/" "ERROR_PROC_NOT_FOUND(NT4)/ERROR_NO_IMPERSONATION_TOKEN(XP)\n", GetLastError()); ok(exactsize == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), exactsize); @@ -370,7 +375,7 @@ static void test_GetShellSecurityDescriptor(void) if(!pGetShellSecurityDescriptor) { - skip("GetShellSecurityDescriptor not available\n"); + win_skip("GetShellSecurityDescriptor not available\n"); return; } @@ -379,7 +384,14 @@ static void test_GetShellSecurityDescriptor(void) psd = pGetShellSecurityDescriptor(rgsup, 0); ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + SetLastError(0xdeadbeef); psd = pGetShellSecurityDescriptor(rgsup, 2); + if (psd == NULL && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* The previous calls to GetShellSecurityDescriptor don't set the last error */ + win_skip("GetShellSecurityDescriptor is not implemented\n"); + return; + } ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); if (psd!=NULL) {

1 0

Alexander Nicolaysen Sørnes : regedit: Set the unicode flag for the treeview.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: c36fec1cd06eacd6f144681bef912a21aab1b362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36fec1cd06eacd6f144681be… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 17:16:21 2008 +0200 regedit: Set the unicode flag for the treeview. --- programs/regedit/childwnd.c | 18 ++++++++---------- programs/regedit/treeview.c | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 9e6e9e0..9879c95 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -350,11 +350,11 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case WM_NOTIFY: if (((int)wParam == TREE_WINDOW) && (g_pChildWnd != NULL)) { switch (((LPNMHDR)lParam)->code) { - case TVN_ITEMEXPANDING: + case TVN_ITEMEXPANDINGW: return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); - case TVN_SELCHANGED: + case TVN_SELCHANGEDW: OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, - ((NMTREEVIEW *)lParam)->itemNew.hItem, TRUE); + ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); break; case NM_SETFOCUS: g_pChildWnd->nFocusPanel = 0; @@ -366,25 +366,23 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); break; } - case TVN_ENDLABELEDIT: { + case TVN_ENDLABELEDITW: { HKEY hRootKey; - LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; - WCHAR* itemText = GetWideString(dispInfo->item.pszText); + LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam; LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - BOOL res = RenameKey(hWnd, hRootKey, path, itemText); + BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); if (res) { TVITEMEXW item; LPWSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, - itemText); + dispInfo->item.pszText); item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); - item.pszText = itemText; + item.pszText = dispInfo->item.pszText; SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); } HeapFree(GetProcessHeap(), 0, path); - HeapFree(GetProcessHeap(), 0, itemText); return res; } default: diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 6e4131c..d028b4a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -670,6 +670,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); + SendMessageW(hwndTV, TVM_SETUNICODEFORMAT, TRUE, 0); /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) { DestroyWindow(hwndTV);

1 0

Alexander Nicolaysen Sørnes : include: Define some Get/SetUnicodeFormat macros.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 6ac5b387a0dcb83f7c55629767ba349d62946d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac5b387a0dcb83f7c5562976… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 16:30:30 2008 +0200 include: Define some Get/SetUnicodeFormat macros. --- include/commctrl.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 2a49e00..046e13f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2859,6 +2859,10 @@ typedef struct tagTVKEYDOWN #define TreeView_MapHTREEITEMToAccID(hwnd, htreeitem) \ (UINT)SNDMSG((hwnd), TVM_MAPHTREEITEMTOACCID, (WPARAM)htreeitem, 0) +#define TreeView_SetUnicodeFormat(hwnd, fUnicode) \ + (BOOL)SNDMSG((hwnd), TVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) +#define TreeView_GetUnicodeFormat(hwnd) \ + (BOOL)SNDMSG((hwnd), TVM_GETUNICODEFORMAT, 0, 0) /* Listview control */ @@ -3921,6 +3925,10 @@ typedef struct NMLVSCROLL (UINT)SNDMSG((hwnd), LVM_MAPINDEXTOID, (WPARAM)index, (LPARAM)0) #define ListView_MapIDToIndex(hwnd, id) \ (UINT)SNDMSG((hwnd), LVM_MAPIDTOINDEX, (WPARAM)id, (LPARAM)0) +#define ListView_SetUnicodeFormat(hwnd, fUnicode) \ + (BOOL)SNDMSG((hwnd), LVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) +#define ListView_GetUnicodeFormat(hwnd) \ + (BOOL)SNDMSG((hwnd), LVM_GETUNICODEFORMAT, 0, 0) /* Tab Control */

1 0

Paul Vriens : msi/tests: Add a missing CoUninitialize.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 4bc832c29a8e150ca9b2a1a9c78bd996e3e24a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc832c29a8e150ca9b2a1a9c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Aug 30 21:59:34 2008 +0200 msi/tests: Add a missing CoUninitialize. --- dlls/msi/tests/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 40fabf8..e335cfa 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1776,6 +1776,8 @@ static void test_packagecoltypes(void) MsiCloseHandle(rec); MsiCloseHandle(view); MsiCloseHandle(hdb); + CoUninitialize(); + DeleteFile(msifile); }

1 0

Paul Vriens : include: Add a system restore header.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 262b551ae96a37b88e9580af831e1b140e7202f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262b551ae96a37b88e9580af8… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Aug 30 22:05:38 2008 +0200 include: Add a system restore header. --- include/Makefile.in | 1 + include/srrestoreptapi.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 808a6fc..415ac1b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -385,6 +385,7 @@ SRCDIR_INCLUDES = \ sql.h \ sqlext.h \ sqltypes.h \ + srrestoreptapi.h \ sspi.h \ storage.h \ svrapi.h \ diff --git a/include/srrestoreptapi.h b/include/srrestoreptapi.h new file mode 100644 index 0000000..6e62934 --- /dev/null +++ b/include/srrestoreptapi.h @@ -0,0 +1,58 @@ +/* + * System Restore definitions + * + * Copyright 2008 Paul Vriens + * + * 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 + */ + +#ifndef __WINE_SRRESTOREPTAPI_H +#define __WINE_SRRESTOREPTAPI_H + +/* Event types */ +#define BEGIN_NESTED_SYSTEM_CHANGE 102 +#define END_NESTED_SYSTEM_CHANGE 103 + +/* Restore point types */ +#define APPLICATION_INSTALL 0 + +#define MAX_DESC 64 + +#pragma pack(1) + +typedef struct _RESTOREPTINFOA { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + CHAR szDescription[MAX_DESC]; +} RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; + +typedef struct _SMGRSTATUS { + DWORD nStatus; + INT64 llSequenceNumber; +} STATEMGRSTATUS, *PSTATEMGRSTATUS; + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +DWORD WINAPI SRRemoveRestorePoint(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* !defined(__WINE_SRRESTOREPTAPI_H) */

1 0

Alexander Nicolaysen Sørnes : regedit: Remove an ANSI function.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 0035421e455f38cc481599631f5d8a4607931282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0035421e455f38cc481599631… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 16:58:27 2008 +0200 regedit: Remove an ANSI function. --- programs/regedit/framewnd.c | 12 +++++------- programs/regedit/listview.c | 31 +++---------------------------- programs/regedit/main.h | 2 +- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b0631b7..0fef96e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -639,7 +639,6 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HKEY hKeyRoot = 0; - LPCTSTR valueName; DWORD valueType; int curIndex; BOOL firstItem = TRUE; @@ -693,9 +692,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); while(curIndex != -1) { - WCHAR* valueNameW; + WCHAR* valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); - valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, curIndex, LVNI_SELECTED); if(curIndex != -1 && firstItem) { if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_BOX_TEXT_MULTIPLE), @@ -703,14 +701,14 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) MB_YESNO | MB_ICONEXCLAMATION) != IDYES) break; } - valueNameW = GetWideString(valueName); - if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueNameW, curIndex==-1 && firstItem)) + + if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, curIndex==-1 && firstItem)) { - HeapFree(GetProcessHeap(), 0, valueNameW); + HeapFree(GetProcessHeap(), 0, valueName); break; } firstItem = FALSE; - HeapFree(GetProcessHeap(), 0, valueNameW); + HeapFree(GetProcessHeap(), 0, valueName); } RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); HeapFree(GetProcessHeap(), 0, keyPath); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index accfc65..04f63ac 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -22,11 +22,9 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <tchar.h> #include <stdio.h> #include "main.h" -#include "regproc.h" #include "wine/unicode.h" static INT Image_String; @@ -56,30 +54,7 @@ static WCHAR g_szValueNotSet[64]; static int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT }; -LPTSTR GetItemText(HWND hwndLV, UINT item) -{ - LPTSTR newStr, curStr; - unsigned int maxLen = 128; - - curStr = HeapAlloc(GetProcessHeap(), 0, maxLen); - if (!curStr) return NULL; - if (item == 0) { /* first item is ALWAYS a default */ - HeapFree(GetProcessHeap(), 0, curStr); - return NULL; - } - do { - ListView_GetItemText(hwndLV, item, 0, curStr, maxLen); - if (_tcslen(curStr) < maxLen - 1) return curStr; - newStr = HeapReAlloc(GetProcessHeap(), 0, curStr, maxLen * 2); - if (!newStr) break; - curStr = newStr; - maxLen *= 2; - } while (TRUE); - HeapFree(GetProcessHeap(), 0, curStr); - return NULL; -} - -LPWSTR GetItemTextW(HWND hwndLV, UINT item) +LPWSTR GetItemText(HWND hwndLV, UINT item) { LPWSTR newStr, curStr; unsigned int maxLen = 128; @@ -113,7 +88,7 @@ LPCWSTR GetValueName(HWND hwndLV) item = ListView_GetNextItem(hwndLV, -1, LVNI_FOCUSED); if (item == -1) return NULL; - g_valueName = GetItemTextW(hwndLV, item); + g_valueName = GetItemText(hwndLV, item); return g_valueName; } @@ -422,7 +397,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR break; case LVN_ENDLABELEDITW: { LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; - LPWSTR oldName = GetItemTextW(hWnd, dispInfo->item.iItem); + LPWSTR oldName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; if (!oldName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index ec2cf98..3c40515 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -120,7 +120,7 @@ extern void UpdateStatusBar(void); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV); -extern LPTSTR GetItemText(HWND hwndLV, UINT item); +extern LPWSTR GetItemText(HWND hwndLV, UINT item); extern LPCWSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i);

1 0

Alexander Nicolaysen Sørnes : regedit: Convert listview init to unicode.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: d0991c92d77d2cb1e9dbf6e97c2d4540c43c74d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0991c92d77d2cb1e9dbf6e97… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 14:53:30 2008 +0200 regedit: Convert listview init to unicode. --- programs/regedit/listview.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 69b7865..f4a239f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -240,15 +240,15 @@ static BOOL InitListViewImageList(HWND hWndListView) if (!himl) return FALSE; - hicon = LoadImage(hInst, MAKEINTRESOURCE(IDI_STRING), + hicon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_STRING), IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR); Image_String = ImageList_AddIcon(himl, hicon); - hicon = LoadImage(hInst, MAKEINTRESOURCE(IDI_BIN), + hicon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_BIN), IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR); Image_Binary = ImageList_AddIcon(himl, hicon); - SendMessage( hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) himl ); + SendMessageW( hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) himl ); /* fail if some of the icons failed to load */ if (ImageList_GetImageCount(himl) < 2) @@ -259,9 +259,9 @@ static BOOL InitListViewImageList(HWND hWndListView) static BOOL CreateListColumns(HWND hWndListView) { - TCHAR szText[50]; + WCHAR szText[50]; int index; - LV_COLUMN lvC; + LVCOLUMNW lvC; /* Create columns. */ lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; @@ -272,8 +272,8 @@ static BOOL CreateListColumns(HWND hWndListView) lvC.iSubItem = index; lvC.cx = default_column_widths[index]; lvC.fmt = column_alignment[index]; - LoadString(hInst, IDS_LIST_COLUMN_FIRST + index, szText, sizeof(szText)/sizeof(TCHAR)); - if (ListView_InsertColumn(hWndListView, index, &lvC) == -1) return FALSE; + LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, sizeof(szText)/sizeof(WCHAR)); + if (ListView_InsertColumnW(hWndListView, index, &lvC) == -1) return FALSE; } return TRUE; } @@ -493,6 +493,7 @@ HWND CreateListView(HWND hwndParent, UINT id) { RECT rcClient; HWND hwndLV; + WCHAR ListView[] = {'L','i','s','t',' ','V','i','e','w',0}; /* prepare strings */ LoadString(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, COUNT_OF(g_szValueNotSet)); @@ -500,17 +501,17 @@ HWND CreateListView(HWND hwndParent, UINT id) /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); - hwndLV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, _T("List View"), + hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, ListView, WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; - SendMessage(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + SendMessageW(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); /* Initialize the image list */ if (!InitListViewImageList(hwndLV)) goto fail; if (!CreateListColumns(hwndLV)) goto fail; - g_orgListWndProc = (WNDPROC) SetWindowLongPtr(hwndLV, GWLP_WNDPROC, (LPARAM)ListWndProc); + g_orgListWndProc = (WNDPROC) SetWindowLongPtrW(hwndLV, GWLP_WNDPROC, (LPARAM)ListWndProc); return hwndLV; fail: DestroyWindow(hwndLV);

1 0