September 2008 - Wine-commits

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

02 Sep '08

Module: wine Branch: master Commit: d2664e0fbbd6101b468c29e227753d406b3717f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2664e0fbbd6101b468c29e22… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 16:49:43 2008 +0200 regedit: Set the unicode flag for the listview. --- programs/regedit/edit.c | 6 ++-- programs/regedit/listview.c | 44 ++++++++++++++++++++---------------------- programs/regedit/main.c | 6 +--- programs/regedit/main.h | 3 +- 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 0b0c6eb..15dc57a 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -165,7 +165,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara if (params->lpszValueName) SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); else - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueNameW); + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); SendDlgItemMessage(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); return TRUE; case WM_COMMAND: @@ -299,7 +299,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) return FALSE; } - editValueName = valueName ? valueName : g_pszDefaultValueNameW; + editValueName = valueName ? valueName : g_pszDefaultValueName; if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { @@ -428,7 +428,7 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B BOOL result = FALSE; LONG lRet; HKEY hKey; - LPCWSTR visibleValueName = valueName ? valueName : g_pszDefaultValueNameW; + LPCWSTR visibleValueName = valueName ? valueName : g_pszDefaultValueName; WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index f4a239f..accfc65 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -2,6 +2,7 @@ * Regedit listviews * * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2008 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,8 +50,7 @@ static BOOL g_invertSort = FALSE; static LPWSTR g_valueName; static LPWSTR g_currentPath; static HKEY g_currentRootKey; -static WCHAR g_szValueNotSetW[64]; -static TCHAR g_szValueNotSet[64]; +static WCHAR g_szValueNotSet[64]; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) static int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; @@ -192,7 +192,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, if (ValBuf) { ListView_SetItemTextW(hwndLV, index, 2, ValBuf); } else { - ListView_SetItemTextW(hwndLV, index, 2, g_szValueNotSetW); + ListView_SetItemTextW(hwndLV, index, 2, g_szValueNotSet); } break; case REG_DWORD: { @@ -280,10 +280,10 @@ static BOOL CreateListColumns(HWND hWndListView) /* OnGetDispInfo - processes the LVN_GETDISPINFO notification message. */ -static void OnGetDispInfo(NMLVDISPINFO* plvdi) +static void OnGetDispInfo(NMLVDISPINFOW* plvdi) { - static TCHAR buffer[200]; - static TCHAR reg_szT[] = {'R','E','G','_','S','Z',0}, + static WCHAR buffer[200]; + static WCHAR reg_szT[] = {'R','E','G','_','S','Z',0}, reg_expand_szT[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}, reg_binaryT[] = {'R','E','G','_','B','I','N','A','R','Y',0}, reg_dwordT[] = {'R','E','G','_','D','W','O','R','D',0}, @@ -300,7 +300,7 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi) switch (plvdi->item.iSubItem) { case 0: - plvdi->item.pszText = (LPSTR)g_pszDefaultValueName; + plvdi->item.pszText = g_pszDefaultValueName; break; case 1: switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { @@ -333,9 +333,9 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi) break; default: { - TCHAR szUnknownFmt[64]; - LoadString(hInst, IDS_REGISTRY_UNKNOWN_TYPE, szUnknownFmt, COUNT_OF(szUnknownFmt)); - wsprintf(buffer, szUnknownFmt, plvdi->item.lParam); + WCHAR szUnknownFmt[64]; + LoadStringW(hInst, IDS_REGISTRY_UNKNOWN_TYPE, szUnknownFmt, COUNT_OF(szUnknownFmt)); + wsprintfW(buffer, szUnknownFmt, plvdi->item.lParam); plvdi->item.pszText = buffer; break; } @@ -403,12 +403,12 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR case WM_NOTIFY_REFLECT: switch (((LPNMHDR)lParam)->code) { - case LVN_BEGINLABELEDIT: - if (!((NMLVDISPINFO *)lParam)->item.iItem) + case LVN_BEGINLABELEDITW: + if (!((NMLVDISPINFOW *)lParam)->item.iItem) return 1; return 0; - case LVN_GETDISPINFO: - OnGetDispInfo((NMLVDISPINFO*)lParam); + case LVN_GETDISPINFOW: + OnGetDispInfo((NMLVDISPINFOW*)lParam); break; case LVN_COLUMNCLICK: if (g_columnToSort == ((LPNMLISTVIEW)lParam)->iSubItem) @@ -418,20 +418,18 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR g_invertSort = FALSE; } - SendMessage(hWnd, LVM_SORTITEMS, (WPARAM)hWnd, (LPARAM)CompareFunc); + SendMessageW(hWnd, LVM_SORTITEMS, (WPARAM)hWnd, (LPARAM)CompareFunc); break; - case LVN_ENDLABELEDIT: { - LPNMLVDISPINFO dispInfo = (LPNMLVDISPINFO)lParam; + case LVN_ENDLABELEDITW: { + LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; LPWSTR oldName = GetItemTextW(hWnd, dispInfo->item.iItem); - WCHAR* newName = GetWideString(dispInfo->item.pszText); LONG ret; if (!oldName) return -1; /* cannot rename a default value */ - ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, newName); + ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); if (ret) { - RefreshListView(hWnd, g_currentRootKey, g_currentPath, newName); + RefreshListView(hWnd, g_currentRootKey, g_currentPath, dispInfo->item.pszText); } - HeapFree(GetProcessHeap(), 0, newName); HeapFree(GetProcessHeap(), 0, oldName); return 0; } @@ -496,8 +494,7 @@ HWND CreateListView(HWND hwndParent, UINT id) 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)); - LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSetW, COUNT_OF(g_szValueNotSetW)); + LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, COUNT_OF(g_szValueNotSet)); /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); @@ -506,6 +503,7 @@ HWND CreateListView(HWND hwndParent, UINT id) 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; + SendMessageW(hwndLV, LVM_SETUNICODEFORMAT, TRUE, 0); SendMessageW(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); /* Initialize the image list */ diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 3033d7d..6fe129a 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -29,8 +29,7 @@ #define REGEDIT_DECLARE_FUNCTIONS #include "main.h" -TCHAR g_pszDefaultValueName[64]; -WCHAR g_pszDefaultValueNameW[64]; +WCHAR g_pszDefaultValueName[64]; BOOL ProcessCmdLine(LPSTR lpCmdLine); @@ -183,8 +182,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, /* Initialize global strings */ LoadString(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); - LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueNameW, COUNT_OF(g_pszDefaultValueNameW)); + LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); /* Store instance handle in our global variable */ hInst = hInstance; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 84a712c..ec2cf98 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -90,8 +90,7 @@ extern enum OPTION_FLAGS Options; extern TCHAR szTitle[]; extern const TCHAR szFrameClass[]; extern const TCHAR szChildClass[]; -extern TCHAR g_pszDefaultValueName[]; -extern WCHAR g_pszDefaultValueNameW[]; +extern WCHAR g_pszDefaultValueName[]; /* Registry class names and their indexes */ extern const WCHAR* reg_class_namesW[];

1 0

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

02 Sep '08

Module: wine Branch: master Commit: e26b563ee1e27e18b19844044ab014eb65730cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26b563ee1e27e18b19844044… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 00:57:41 2008 +0200 regedit: Remove some ANSI functions. --- programs/regedit/childwnd.c | 80 ++++++------------------------------------ programs/regedit/framewnd.c | 37 +++++++++++--------- programs/regedit/main.h | 6 +-- programs/regedit/treeview.c | 74 ++++----------------------------------- 4 files changed, 42 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26b563ee1e27e18b1984…

1 0

Alexander Nicolaysen Sørnes : regedit: Fix a memory leak.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: fef36600242fd603bbc03633d747595d01ef660c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef36600242fd603bbc03633d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 31 01:23:17 2008 +0200 regedit: Fix a memory leak. --- programs/regedit/childwnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index bb8cf6f..9e6e9e0 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -138,7 +138,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { HKEY hRootKey = NULL; if (!hItem) hItem = TreeView_GetSelection(hwndTV); - GetItemPath(hwndTV, hItem, &hRootKey); + HeapFree(GetProcessHeap(), 0, GetItemPath(hwndTV, hItem, &hRootKey)); if (!bFull && !hRootKey) return NULL; if (hRootKey)

1 0

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

02 Sep '08

Module: wine Branch: master Commit: 6b7ebf08812bde7dceaadeccf5cea11db4b0244f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7ebf08812bde7dceaadeccf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 30 23:50:24 2008 +0200 regedit: Convert key renaming to unicode. --- programs/regedit/childwnd.c | 30 +++++++++++++++++------------- programs/regedit/edit.c | 30 ++++++++++++++++-------------- programs/regedit/main.h | 2 +- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 565c90d..a80235a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -25,6 +25,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -219,13 +220,13 @@ LPWSTR GetItemFullPathW(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { return ret; } -static LPTSTR GetPathFullPath(HWND hwndTV, LPTSTR path) { - LPTSTR parts[2]; - LPTSTR ret; +static LPWSTR GetPathFullPath(HWND hwndTV, LPWSTR path) { + LPWSTR parts[2]; + LPWSTR ret; - parts[0] = GetPathRoot(hwndTV, 0, TRUE); + parts[0] = GetPathRootW(hwndTV, 0, TRUE); parts[1] = path; - ret = CombinePaths((LPCTSTR *)parts, 2); + ret = CombinePathsW((LPCWSTR*)parts, 2); HeapFree(GetProcessHeap(), 0, parts[0]); return ret; } @@ -424,19 +425,22 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case TVN_ENDLABELEDIT: { HKEY hRootKey; LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; - LPCTSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); + WCHAR* itemText = GetWideString(dispInfo->item.pszText); + LPWSTR path = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hRootKey); + BOOL res = RenameKey(hWnd, hRootKey, path, itemText); if (res) { - TVITEMEX item; - LPTSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, - dispInfo->item.pszText); + TVITEMEXW item; + LPWSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, + itemText); item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); - item.pszText = dispInfo->item.pszText; - SendMessage( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); - SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); + item.pszText = itemText; + 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/edit.c b/programs/regedit/edit.c index 3164eb1..0b0c6eb 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -30,6 +30,7 @@ #include <shellapi.h> #include <shlwapi.h> +#include "wine/unicode.h" #include "main.h" #include "regproc.h" #include "resource.h" @@ -536,10 +537,10 @@ done: } -BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName) +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) { - LPTSTR parentPath = 0; - LPCTSTR srcSubKey = 0; + LPWSTR parentPath = 0; + LPCWSTR srcSubKey = 0; HKEY parentKey = 0; HKEY destKey = 0; BOOL result = FALSE; @@ -548,17 +549,18 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName) if (!keyPath || !newName) return FALSE; - if (!strrchr(keyPath, '\\')) { + if (!strrchrW(keyPath, '\\')) { parentKey = hRootKey; srcSubKey = keyPath; } else { - LPTSTR srcSubKey_copy; + LPWSTR srcSubKey_copy; - parentPath = strdup(keyPath); - srcSubKey_copy = strrchr(parentPath, '\\'); + parentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath)+1)*sizeof(WCHAR)); + lstrcpyW(parentPath, keyPath); + srcSubKey_copy = strrchrW(parentPath, '\\'); *srcSubKey_copy = 0; srcSubKey = srcSubKey_copy + 1; - lRet = RegOpenKeyEx(hRootKey, parentPath, 0, KEY_READ | KEY_CREATE_SUB_KEY, &parentKey); + lRet = RegOpenKeyExW(hRootKey, parentPath, 0, KEY_READ | KEY_CREATE_SUB_KEY, &parentKey); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); goto done; @@ -566,9 +568,9 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName) } /* The following fails if the old name is the same as the new name. */ - if (!strcmp(srcSubKey, newName)) goto done; + if (!lstrcmpW(srcSubKey, newName)) goto done; - lRet = RegCreateKeyEx(parentKey, newName, 0, NULL, REG_OPTION_NON_VOLATILE, + lRet = RegCreateKeyExW(parentKey, newName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL /* FIXME */, &destKey, &disposition); if (disposition == REG_OPENED_EXISTING_KEY) lRet = ERROR_FILE_EXISTS; /* FIXME: we might want a better error message than this */ @@ -578,15 +580,15 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName) } /* FIXME: SHCopyKey does not copy the security attributes */ - lRet = SHCopyKey(parentKey, srcSubKey, destKey, 0); + lRet = SHCopyKeyW(parentKey, srcSubKey, destKey, 0); if (lRet != ERROR_SUCCESS) { RegCloseKey(destKey); - RegDeleteKey(parentKey, newName); + RegDeleteKeyW(parentKey, newName); error_code_messagebox(hwnd, lRet); goto done; } - lRet = SHDeleteKey(hRootKey, keyPath); + lRet = SHDeleteKeyW(hRootKey, keyPath); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); goto done; @@ -598,7 +600,7 @@ done: RegCloseKey(destKey); if (parentKey) { RegCloseKey(parentKey); - free(parentPath); + HeapFree(GetProcessHeap(), 0, parentPath); } return result; } diff --git a/programs/regedit/main.h b/programs/regedit/main.h index c9db636..aec4d2f 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -146,7 +146,7 @@ extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR value extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName); +extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); extern void error(HWND hwnd, INT resId, ...); /* hexedit.c */

1 0

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

02 Sep '08

Module: wine Branch: master Commit: 4a3d8d8cb01ad50bf9276e71876fd7dc2c333752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3d8d8cb01ad50bf9276e718… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 29 22:20:26 2008 +0200 regedit: Convert value renaming to unicode. --- programs/regedit/edit.c | 58 ++++++++---------------------------------- programs/regedit/listview.c | 17 +++++------- programs/regedit/main.h | 2 +- 3 files changed, 19 insertions(+), 58 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c44da85..3164eb1 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -198,51 +198,15 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL check_value(HWND hwnd, HKEY hKey, LPCTSTR valueName) +static BOOL check_value(HWND hwnd, HKEY hKey, LPCWSTR valueName) { - LONG lRet = RegQueryValueEx(hKey, valueName ? valueName : _T(""), 0, NULL, 0, NULL); + WCHAR empty = 0; + LONG lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, NULL, 0, NULL); if(lRet != ERROR_SUCCESS) return FALSE; return TRUE; } -static LPTSTR read_value(HWND hwnd, HKEY hKey, LPCTSTR valueName, DWORD *lpType, LONG *len) -{ - DWORD valueDataLen; - LPTSTR buffer = NULL; - LONG lRet; - - lRet = RegQueryValueEx(hKey, valueName ? valueName : _T(""), 0, lpType, 0, &valueDataLen); - if (lRet != ERROR_SUCCESS) { - if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ - if (len) *len = 1; - if (lpType) *lpType = REG_SZ; - buffer = HeapAlloc(GetProcessHeap(), 0, 1); - *buffer = '\0'; - return buffer; - } - error(hwnd, IDS_BAD_VALUE, valueName); - goto done; - } - if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+1))) { - error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); - goto done; - } - lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); - if (lRet != ERROR_SUCCESS) { - error(hwnd, IDS_BAD_VALUE, valueName); - goto done; - } - buffer[valueDataLen] = 0; - if(len) *len = valueDataLen; - return buffer; - -done: - HeapFree(GetProcessHeap(), 0, buffer); - return NULL; -} - -static LPWSTR read_valueW(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) +static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) { DWORD valueDataLen; LPWSTR buffer = NULL; @@ -335,7 +299,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) } editValueName = valueName ? valueName : g_pszDefaultValueNameW; - if(!(stringValueData = read_valueW(hwnd, hKey, valueName, &type, &len))) goto done; + if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_dlgproc) == IDOK) { @@ -532,9 +496,9 @@ done: return result; } -BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR oldName, LPCTSTR newName) +BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName) { - LPTSTR value = NULL; + LPWSTR value = NULL; DWORD type; LONG len, lRet; BOOL result = FALSE; @@ -543,7 +507,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR oldName, LPC if (!oldName) return FALSE; if (!newName) return FALSE; - lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); + lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); return FALSE; @@ -552,14 +516,14 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR oldName, LPC if (check_value(hwnd, hKey, newName)) goto done; value = read_value(hwnd, hKey, oldName, &type, &len); if(!value) goto done; - lRet = RegSetValueEx(hKey, newName, 0, type, (BYTE*)value, len); + lRet = RegSetValueExW(hKey, newName, 0, type, (BYTE*)value, len); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); goto done; } - lRet = RegDeleteValue(hKey, oldName); + lRet = RegDeleteValueW(hKey, oldName); if (lRet != ERROR_SUCCESS) { - RegDeleteValue(hKey, newName); + RegDeleteValueW(hKey, newName); error_code_messagebox(hwnd, lRet); goto done; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0a919a0..69b7865 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -422,20 +422,17 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR break; case LVN_ENDLABELEDIT: { LPNMLVDISPINFO dispInfo = (LPNMLVDISPINFO)lParam; - LPTSTR valueName = GetItemText(hWnd, dispInfo->item.iItem); - LPSTR pathA; + LPWSTR oldName = GetItemTextW(hWnd, dispInfo->item.iItem); + WCHAR* newName = GetWideString(dispInfo->item.pszText); LONG ret; - if (!valueName) return -1; /* cannot rename a default value */ - pathA = GetMultiByteString(g_currentPath); - ret = RenameValue(hWnd, g_currentRootKey, pathA, valueName, dispInfo->item.pszText); - HeapFree(GetProcessHeap(), 0, pathA); + if (!oldName) return -1; /* cannot rename a default value */ + ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, newName); if (ret) { - WCHAR* itemTextW = GetWideString(dispInfo->item.pszText); - RefreshListView(hWnd, g_currentRootKey, g_currentPath, itemTextW); - HeapFree(GetProcessHeap(), 0, itemTextW); + RefreshListView(hWnd, g_currentRootKey, g_currentPath, newName); } - HeapFree(GetProcessHeap(), 0, valueName); + HeapFree(GetProcessHeap(), 0, newName); + HeapFree(GetProcessHeap(), 0, oldName); return 0; } case NM_RETURN: { diff --git a/programs/regedit/main.h b/programs/regedit/main.h index df1dbf5..c9db636 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -145,7 +145,7 @@ extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueTy extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR oldName, LPCTSTR newName); +extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName); extern void error(HWND hwnd, INT resId, ...);

1 0

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

02 Sep '08

Module: wine Branch: master Commit: 1e56f94945a2418fdf5db914e88838585437e25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e56f94945a2418fdf5db914e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 29 21:37:43 2008 +0200 regedit: Convert value editing to unicode. --- programs/regedit/edit.c | 103 ++++++++++++++++++++++++++++++------------ programs/regedit/framewnd.c | 14 ++---- programs/regedit/main.h | 2 +- 3 files changed, 79 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e56f94945a2418fdf5db…

1 0

Alexander Nicolaysen Sørnes : regedit: Remove old fixme.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: df84eb514c4d6b22473b0ec6b9713559737c7f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df84eb514c4d6b22473b0ec6b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 29 22:11:11 2008 +0200 regedit: Remove old fixme. --- programs/regedit/framewnd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed97092..c083f06 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -795,7 +795,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) { RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, newKey); StartValueRename(g_pChildWnd->hListWnd); - /* FIXME: start rename */ } HeapFree(GetProcessHeap(), 0, keyPath); }

1 0

Alexander Nicolaysen Sørnes : regedit: Don't try to convert NULL pointers.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 7aa56d249a4faf7d4ded68a817889979977ad366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa56d249a4faf7d4ded68a81… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 30 01:23:09 2008 +0200 regedit: Don't try to convert NULL pointers. --- programs/regedit/regproc.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index eb724be..a085ae4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -70,13 +70,17 @@ if (!(p)) \ */ WCHAR* GetWideString(const char* strA) { - WCHAR* strW = NULL; - int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); + if(strA) + { + WCHAR* strW = NULL; + int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(strW); - MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); - return strW; + strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(strW); + MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); + return strW; + } + return NULL; } /****************************************************************************** @@ -85,13 +89,17 @@ WCHAR* GetWideString(const char* strA) */ char* GetMultiByteString(const WCHAR* strW) { - char* strA = NULL; - int len = WideCharToMultiByte(CP_ACP, 0, strW, -1, NULL, 0, NULL, NULL); + if(strW) + { + char* strA = NULL; + int len = WideCharToMultiByte(CP_ACP, 0, strW, -1, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, len); - CHECK_ENOUGH_MEMORY(strA); - WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, len, NULL, NULL); - return strA; + strA = HeapAlloc(GetProcessHeap(), 0, len); + CHECK_ENOUGH_MEMORY(strA); + WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, len, NULL, NULL); + return strA; + } + return NULL; } /******************************************************************************

1 0

Christian Costa : d3dxof: Some fixes for template parsing in text mode.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 23166f900eb12bbc86b62c70af6f0d6fb6b80f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23166f900eb12bbc86b62c70a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Aug 30 11:52:39 2008 +0200 d3dxof: Some fixes for template parsing in text mode. Fix lockup when going to next template in text mode. Keyword corresponding to TOKEN_LPSTR is STRING and not LPSTR. Accept numerical characters in name. --- dlls/d3dxof/d3dxof.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 30c8bdb..d1f580c 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -353,7 +353,7 @@ static WORD get_keyword_token(parse_buffer* buf) return TOKEN_SDWORD; if (is_keyword(buf, "VOID")) return TOKEN_VOID; - if (is_keyword(buf, "LPSTR")) + if (is_keyword(buf, "STRING")) return TOKEN_LPSTR; if (is_keyword(buf, "UNICODE")) return TOKEN_UNICODE; @@ -423,7 +423,7 @@ static BOOL is_name(parse_buffer* buf) BOOL error = 0; while (!is_separator(c = *(buf->buffer+pos))) { - if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')))) + if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')))) error = 1; tmp[pos++] = c; } @@ -597,7 +597,7 @@ static const char* get_primitive_string(WORD token) case TOKEN_VOID: return "VOID"; case TOKEN_LPSTR: - return "LPSTR"; + return "STRING"; case TOKEN_UNICODE: return "UNICODE"; case TOKEN_CSTRING: @@ -927,13 +927,10 @@ static BOOL parse_template(parse_buffer * buf) if (buf->txt) { /* Go to the next template */ - while (buf->rem_bytes) + while (buf->rem_bytes && is_space(*buf->buffer)) { - if (is_space(*buf->buffer)) - { - buf->buffer++; - buf->rem_bytes--; - } + buf->buffer++; + buf->rem_bytes--; } } @@ -1021,7 +1018,8 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP i = This->nb_xtemplates - 1; clsid = &This->xtemplates[i].class_id; - DPRINTF("template %s {\n", This->xtemplates[i].name); + DPRINTF("template %s\n", This->xtemplates[i].name); + DPRINTF("{\n"); DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); for (j = 0; j < This->xtemplates[i].nb_members; j++)

1 0

Gerald Pfeifer : quartz: Add return statement to PullPin_Thread_Main().
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: dc302b7c1dfb3154e04fbbae11255985783a33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc302b7c1dfb3154e04fbbae1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 30 12:38:57 2008 +0200 quartz: Add return statement to PullPin_Thread_Main(). --- dlls/quartz/pin.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index e2b868e..bcf09a5 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1611,6 +1611,7 @@ static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) default: ERR("Unknown state request: %d\n", This->state); break; } } + return 0; } static HRESULT PullPin_InitProcessing(PullPin * This)

1 0