April 2011 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Better support for HTTP redirection.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 0613a826713091cc7f486bcd9774e8bc90f867eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0613a826713091cc7f486bcd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 19:36:36 2011 +0200 mshtml: Better support for HTTP redirection. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 157 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 30 ++++++++- dlls/mshtml/nsio.c | 55 ++++++++++++++- 4 files changed, 235 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0613a826713091cc7f486…

1 0

Jacek Caban : mshtml: Don't include null-byte in post data.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 1054b9558849e46ecdf5ae5e99a56ca87fc9304d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1054b9558849e46ecdf5ae5e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 19:36:49 2011 +0200 mshtml: Don't include null-byte in post data. --- dlls/mshtml/navigate.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 35f87dd..990401a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -886,7 +886,7 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) if(NS_FAILED(nsres)) return E_FAIL; - post_data = data = GlobalAlloc(0, available+1); + post_data = data = GlobalAlloc(0, available); if(!data) return E_OUTOFMEMORY; @@ -896,21 +896,22 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) return E_FAIL; } - data[data_len++] = 0; - if(nschannel->post_data_contains_headers) { - if(data[0] == '\r' && data[1] == '\n') { + if(data_len >= 2 && data[0] == '\r' && data[1] == '\n') { post_data = data+2; data_len -= 2; }else { WCHAR *headers; DWORD size; - - post_data = strstr(data, "\r\n\r\n"); - if(post_data) - post_data += 4; - else - post_data = data+data_len; + char *ptr; + + post_data += data_len; + for(ptr = data; ptr+4 < data+data_len; ptr++) { + if(!memcmp(ptr, "\r\n\r\n", 4)) { + post_data = ptr+4; + break; + } + } data_len -= post_data-data;

1 0

Andrew Nguyen : regedit: Refactor window class initialization to a separate function.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 7369b6cf4174469a43ee2828d8482c8511817836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7369b6cf4174469a43ee2828d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:05:55 2011 -0500 regedit: Refactor window class initialization to a separate function. --- programs/regedit/main.c | 71 +++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 36 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 27bc26f..f10741b 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -63,7 +63,37 @@ TCHAR szTitle[MAX_LOADSTRING]; const TCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; const TCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; +static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATOM *hChildWndClass) +{ + WNDCLASSEX wndclass = {0}; + + /* Frame class */ + wndclass.cbSize = sizeof(WNDCLASSEX); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = FrameWndProc; + wndclass.hInstance = hInstance; + wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); + wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.lpszClassName = szFrameClass; + wndclass.hIconSm = LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + if (!(*hFrameWndClass = RegisterClassEx(&wndclass))) + return FALSE; + + /* Child class */ + wndclass.lpfnWndProc = ChildWndProc; + wndclass.cbWndExtra = sizeof(HANDLE); + wndclass.lpszClassName = szChildClass; + + if (!(*hChildWndClass = RegisterClassEx(&wndclass))) + { + UnregisterClass(szFrameClass, hInstance); + return FALSE; + } + return TRUE; +} /******************************************************************************* * * @@ -80,41 +110,10 @@ const TCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { WCHAR empty = 0; - WNDCLASSEX wcFrame = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - FrameWndProc, - 0/*cbClsExtra*/, - 0/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szFrameClass, - LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - }; - ATOM hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ - - WNDCLASSEX wcChild = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - ChildWndProc, - 0/*cbClsExtra*/, - sizeof(HANDLE)/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szChildClass, - LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - - }; - ATOM hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ - hChildWndClass = hChildWndClass; /* warning eater */ + ATOM hFrameWndClass, hChildWndClass; + + if (!RegisterWindowClasses(hInstance, &hFrameWndClass, &hChildWndClass)) + return FALSE; hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU)); hPopupMenus = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_POPUP_MENUS));

1 0

Andrew Nguyen : regedit: Remove obsolete comments in InitInstance.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3571ae27a240472a208d744a5853642eaebf169d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3571ae27a240472a208d744a5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:06:38 2011 -0500 regedit: Remove obsolete comments in InitInstance. --- programs/regedit/main.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index f10741b..0bc43e0 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -94,18 +94,6 @@ static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATO return TRUE; } -/******************************************************************************* - * - * - * FUNCTION: InitInstance(HANDLE, int) - * - * PURPOSE: Saves instance handle and creates main window - * - * COMMENTS: - * - * In this function, we save the instance handle in a global variable and - * create and display the main program window. - */ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { @@ -125,9 +113,6 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) HexEdit_Register(); nClipboardFormat = RegisterClipboardFormat(strClipboardFormat); - /* if (nClipboardFormat == 0) { - DWORD dwError = GetLastError(); - } */ hFrameWnd = CreateWindowEx(0, MAKEINTRESOURCE(hFrameWndClass), szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE,

1 0

Andrew Nguyen : regedit: Convert regedit main code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 182763f632fd482d055057631a5d700981aa0639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182763f632fd482d055057631… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:06:48 2011 -0500 regedit: Convert regedit main code to Unicode. --- programs/regedit/childwnd.c | 2 +- programs/regedit/framewnd.c | 12 ++++++---- programs/regedit/main.c | 48 +++++++++++++++++++++--------------------- programs/regedit/main.h | 6 ++-- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index bb56cb2..769886c 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -441,7 +441,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } /* fall through */ default: def: - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); } return 0; } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c118b59..c4f4f92 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -921,15 +921,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + static const WCHAR captionW[] = {'r','e','g','e','d','i','t',' ','c','h','i','l','d',' ','w','i','n','d','o','w',0}; + switch (message) { case WM_CREATE: - CreateWindowEx(0, szChildClass, _T("regedit child window"), WS_CHILD | WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hWnd, NULL, hInst, 0); + CreateWindowExW(0, szChildClass, captionW, WS_CHILD | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, NULL, hInst, 0); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); break; case WM_ACTIVATE: if (LOWORD(hWnd)) @@ -960,7 +962,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa PostQuitMessage(0); } default: - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); } return 0; } diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 0bc43e0..b055d7b 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -55,30 +55,30 @@ HWND hStatusBar; HMENU hMenuFrame; HMENU hPopupMenus = 0; UINT nClipboardFormat; -LPCTSTR strClipboardFormat = _T("TODO: SET CORRECT FORMAT"); +const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C','O','R','R','E','C','T',' ','F','O','R','M','A','T',0}; #define MAX_LOADSTRING 100 -TCHAR szTitle[MAX_LOADSTRING]; -const TCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; -const TCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; +WCHAR szTitle[MAX_LOADSTRING]; +const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; +const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATOM *hChildWndClass) { - WNDCLASSEX wndclass = {0}; + WNDCLASSEXW wndclass = {0}; /* Frame class */ - wndclass.cbSize = sizeof(WNDCLASSEX); + wndclass.cbSize = sizeof(WNDCLASSEXW); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = FrameWndProc; wndclass.hInstance = hInstance; - wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); - wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_REGEDIT)); + wndclass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndclass.lpszClassName = szFrameClass; - wndclass.hIconSm = LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wndclass.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); - if (!(*hFrameWndClass = RegisterClassEx(&wndclass))) + if (!(*hFrameWndClass = RegisterClassExW(&wndclass))) return FALSE; /* Child class */ @@ -86,9 +86,9 @@ static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATO wndclass.cbWndExtra = sizeof(HANDLE); wndclass.lpszClassName = szChildClass; - if (!(*hChildWndClass = RegisterClassEx(&wndclass))) + if (!(*hChildWndClass = RegisterClassExW(&wndclass))) { - UnregisterClass(szFrameClass, hInstance); + UnregisterClassW(szFrameClass, hInstance); return FALSE; } @@ -112,12 +112,12 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) /* register our hex editor control */ HexEdit_Register(); - nClipboardFormat = RegisterClipboardFormat(strClipboardFormat); + nClipboardFormat = RegisterClipboardFormatW(strClipboardFormat); - hFrameWnd = CreateWindowEx(0, MAKEINTRESOURCE(hFrameWndClass), szTitle, - WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, hMenuFrame, hInstance, NULL/*lpParam*/); + hFrameWnd = CreateWindowExW(0, MAKEINTRESOURCEW(hFrameWndClass), szTitle, + WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, hMenuFrame, hInstance, NULL/*lpParam*/); if (!hFrameWnd) { return FALSE; @@ -148,7 +148,7 @@ static BOOL TranslateChildTabMessage(MSG *msg) if (msg->message != WM_KEYDOWN) return FALSE; if (msg->wParam != VK_TAB) return FALSE; if (GetParent(msg->hwnd) != g_pChildWnd->hWnd) return FALSE; - PostMessage(g_pChildWnd->hWnd, WM_COMMAND, ID_SWITCH_PANELS, 0); + PostMessageW(g_pChildWnd->hWnd, WM_COMMAND, ID_SWITCH_PANELS, 0); return TRUE; } @@ -165,7 +165,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, } /* Initialize global strings */ - LoadString(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); /* Store instance handle in our global variable */ @@ -175,14 +175,14 @@ int APIENTRY WinMain(HINSTANCE hInstance, if (!InitInstance(hInstance, nCmdShow)) { return FALSE; } - hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT); + hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDC_REGEDIT)); /* Main message loop */ - while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator(hFrameWnd, hAccel, &msg) + while (GetMessageW(&msg, NULL, 0, 0)) { + if (!TranslateAcceleratorW(hFrameWnd, hAccel, &msg) && !TranslateChildTabMessage(&msg)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } ExitInstance(); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 6ecaf6c..d399d81 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -87,9 +87,9 @@ extern HMENU hPopupMenus; extern HFONT hFont; extern enum OPTION_FLAGS Options; -extern TCHAR szTitle[]; -extern const TCHAR szFrameClass[]; -extern const TCHAR szChildClass[]; +extern WCHAR szTitle[]; +extern const WCHAR szFrameClass[]; +extern const WCHAR szChildClass[]; extern WCHAR g_pszDefaultValueName[]; /* Registry class names and their indexes */

1 0

Andrew Nguyen : regedit: Remove all Unicode macros in main.h.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 82796c565ed14a416e3101523c223d01c09d46a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82796c565ed14a416e3101523… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:03 2011 -0500 regedit: Remove all Unicode macros in main.h. --- programs/regedit/childwnd.c | 2 +- programs/regedit/hexedit.c | 34 ++++++++++++++++++---------------- programs/regedit/main.h | 4 ++-- programs/regedit/treeview.c | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 769886c..86fa62b 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -388,7 +388,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa if (((int)wParam == TREE_WINDOW) && (g_pChildWnd != NULL)) { switch (((LPNMHDR)lParam)->code) { case TVN_ITEMEXPANDINGW: - return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); + return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEWW*)lParam); case TVN_SELCHANGEDW: OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 5e770c9..ddf6b09 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -54,6 +54,8 @@ typedef struct tagHEXEDIT_INFO INT nScrollPos; /* first visible line */ } HEXEDIT_INFO; +const WCHAR szHexEditClass[] = {'H','e','x','E','d','i','t',0}; + static inline LRESULT HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw); static inline BYTE hexchar_to_byte(TCHAR ch) @@ -331,7 +333,7 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, TCHAR ch) } static inline LRESULT -HexEdit_Create (HEXEDIT_INFO *infoPtr, LPCREATESTRUCT lpcs) +HexEdit_Create (HEXEDIT_INFO *infoPtr, LPCREATESTRUCTW lpcs) { HexEdit_SetFont(infoPtr, GetStockObject(SYSTEM_FONT), FALSE); HexEdit_UpdateScrollbars(infoPtr); @@ -467,15 +469,15 @@ HexEdit_LButtonDown (HEXEDIT_INFO *infoPtr) } -static inline LRESULT HexEdit_NCCreate (HWND hwnd, LPCREATESTRUCT lpcs) +static inline LRESULT HexEdit_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) { HEXEDIT_INFO *infoPtr; - SetWindowLong(hwnd, GWL_EXSTYLE, - lpcs->dwExStyle | WS_EX_CLIENTEDGE); + SetWindowLongW(hwnd, GWL_EXSTYLE, + lpcs->dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ infoPtr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEXEDIT_INFO)); - SetWindowLongPtr(hwnd, 0, (DWORD_PTR)infoPtr); + SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ infoPtr->nCaretPos = 0; @@ -484,7 +486,7 @@ static inline LRESULT HexEdit_NCCreate (HWND hwnd, LPCREATESTRUCT lpcs) infoPtr->bFocusHex = TRUE; infoPtr->bInsert = TRUE; - return DefWindowProc(infoPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)lpcs); + return DefWindowProcW(infoPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)lpcs); } static inline LRESULT @@ -611,10 +613,10 @@ HexEdit_VScroll (HEXEDIT_INFO *infoPtr, INT action) static LRESULT WINAPI HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HEXEDIT_INFO *infoPtr = (HEXEDIT_INFO *)GetWindowLongPtr (hwnd, 0); + HEXEDIT_INFO *infoPtr = (HEXEDIT_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && (uMsg != WM_NCCREATE)) - return DefWindowProc(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); switch (uMsg) { @@ -625,10 +627,10 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return HexEdit_GetData (infoPtr, (INT)wParam, (BYTE *)lParam); case WM_CHAR: - return HexEdit_Char (infoPtr, (TCHAR)wParam); + return HexEdit_Char (infoPtr, (WCHAR)wParam); case WM_CREATE: - return HexEdit_Create (infoPtr, (LPCREATESTRUCT)lParam); + return HexEdit_Create (infoPtr, (LPCREATESTRUCTW)lParam); case WM_DESTROY: return HexEdit_Destroy (infoPtr); @@ -652,7 +654,7 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return HexEdit_LButtonDown (infoPtr); case WM_NCCREATE: - return HexEdit_NCCreate (hwnd, (LPCREATESTRUCT)lParam); + return HexEdit_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); case WM_PAINT: HexEdit_Paint(infoPtr); @@ -668,23 +670,23 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return HexEdit_VScroll (infoPtr, (INT)wParam); default: - return DefWindowProc(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } return 0; } void HexEdit_Register(void) { - WNDCLASS wndClass; + WNDCLASSW wndClass; - ZeroMemory(&wndClass, sizeof(WNDCLASS)); + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = 0; wndClass.lpfnWndProc = HexEdit_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); wndClass.hCursor = NULL; wndClass.hbrBackground = NULL; - wndClass.lpszClassName = HEXEDIT_CLASS; + wndClass.lpszClassName = szHexEditClass; - RegisterClass(&wndClass); + RegisterClassW(&wndClass); } diff --git a/programs/regedit/main.h b/programs/regedit/main.h index d399d81..8b6eede 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -40,7 +40,6 @@ #define WM_NOTIFY_REFLECT (WM_USER+1024) /* HexEdit Class */ -#define HEXEDIT_CLASS TEXT("HexEdit") #define HEM_SETDATA (WM_USER+0) #define HEM_GETDATA (WM_USER+1) @@ -90,6 +89,7 @@ extern enum OPTION_FLAGS Options; extern WCHAR szTitle[]; extern const WCHAR szFrameClass[]; extern const WCHAR szChildClass[]; +extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[]; /* Registry class names and their indexes */ @@ -127,7 +127,7 @@ extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); -extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); +extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); extern LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index e48eb5b..18e41bc 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -650,7 +650,7 @@ done: return TRUE; } -BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv) +BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEWW* pnmtv) { return UpdateExpandingTree(hwndTV, pnmtv->itemNew.hItem, pnmtv->itemNew.state); }

1 0

Andrew Nguyen : regedit: Convert the child window code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: dfc0fa86d4165159e8189311bc69623020559cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc0fa86d4165159e8189311b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:08 2011 -0500 regedit: Convert the child window code to Unicode. --- programs/regedit/childwnd.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 86fa62b..1ff7a90 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -131,7 +131,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { WCHAR text[260]; HKEY hRootKey = NULL; if (!hItem) - hItem = TreeView_GetSelection(hwndTV); + hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); HeapFree(GetProcessHeap(), 0, GetItemPath(hwndTV, hItem, &hRootKey)); if (!bFull && !hRootKey) return NULL; @@ -262,7 +262,9 @@ static void set_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) { - wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), FALSE); + HTREEITEM selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + + wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, (lstrlenW(wszVal) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, wszVal); RegCloseKey(hkey); @@ -309,7 +311,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa GetCursorPos(&pt); ScreenToClient(hWnd, &pt); if (pt.x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { - SetCursor(LoadCursor(0, IDC_SIZEWE)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_SIZEWE)); return TRUE; } } @@ -354,7 +356,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa ResizeWnd(rt.right, rt.bottom); last_split = -1; ReleaseCapture(); - SetCursor(LoadCursor(0, IDC_ARROW)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } break; @@ -413,7 +415,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa LPWSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, dispInfo->item.pszText); item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + item.hItem = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); item.pszText = dispInfo->item.pszText; SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath);

1 0

Andrew Nguyen : regedit: Convert the edit code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 8f0bc1e2ed31158af0b43571c55ac28784a262c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0bc1e2ed31158af0b43571c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:13 2011 -0500 regedit: Convert the edit code to Unicode. --- programs/regedit/edit.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d9f4005..57edbb5 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,13 +106,16 @@ static void error_code_messagebox(HWND hwnd, DWORD error_code) static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { - TCHAR buf[128]; + static const WCHAR percent_u[] = {'%','u',0}; + static const WCHAR percent_x[] = {'%','x',0}; + + WCHAR buf[128]; DWORD val; - if (!GetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; - if (!_stscanf(buf, toHex ? "%u" : "%x", &val)) return FALSE; - wsprintf(buf, toHex ? "%x" : "%u", val); - return SetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf); + if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; + if (!swscanf(buf, toHex ? percent_u : percent_x, &val)) return FALSE; + wsprintfW(buf, toHex ? percent_x : percent_u, val); + return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); } static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -163,18 +166,18 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (ULONG_PTR)params); + SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); if (params->lpszValueName) SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessage(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - params = (struct edit_params *)GetWindowLongPtr(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessage(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = HeapAlloc(GetProcessHeap(), 0, cbData); if (pData) @@ -263,7 +266,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) goto done; } - if (!LoadStringW(GetModuleHandle(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; /* try to find out a name for the newly create key (max 100 times) */ for (keyNum = 1; keyNum < 100; keyNum++) { @@ -330,7 +333,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.lpszValueName = valueName; params.pData = stringValueData; params.cbData = len; - result = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_EDIT_BINARY), hwnd, + result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); } else if ( type == REG_MULTI_SZ ) { WCHAR char1 = '\r', char2 = '\n'; @@ -467,7 +470,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW return FALSE; } - if (!LoadStringW(GetModuleHandle(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; /* try to find out a name for the newly create key (max 100 times) */ for (valueNum = 1; valueNum < 100; valueNum++) {

1 0

Andrew Nguyen : regedit: Convert the frame window code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 9b586bc2ee8ac299306717f21a8bd49f2417599b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b586bc2ee8ac299306717f21… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:17 2011 -0500 regedit: Convert the frame window code to Unicode. --- programs/regedit/framewnd.c | 55 ++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c4f4f92..0cdedec 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -105,7 +105,10 @@ static void UpdateMenuItems(HMENU hMenu) { BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPWSTR keyName; - keyName = GetItemPath(hwndTV, TreeView_GetSelection(hwndTV), &hRootKey); + HTREEITEM selection; + + selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + keyName = GetItemPath(hwndTV, selection, &hRootKey); if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ bAllowEdit = TRUE; } @@ -327,10 +330,12 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) return TRUE; } -static BOOL import_registry_filename(LPTSTR filename) +static BOOL import_registry_filename(LPWSTR filename) { + static const WCHAR mode_r[] = {'r',0}; + BOOL Success; - FILE* reg_file = fopen(filename, "r"); + FILE* reg_file = _wfopen(filename, mode_r); if(!reg_file) return FALSE; @@ -353,13 +358,8 @@ static BOOL ImportRegistryFile(HWND hWnd) LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { - CHAR* fileA = GetMultiByteString(ofn.lpstrFile); - if (!import_registry_filename(fileA)) { - /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ - HeapFree(GetProcessHeap(), 0, fileA); + if (!import_registry_filename(ofn.lpstrFile)) return FALSE; - } - HeapFree(GetProcessHeap(), 0, fileA); } else { CheckCommDlgError(hWnd); } @@ -397,8 +397,8 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) #if 1 PRINTDLGW pd; - ZeroMemory(&pd, sizeof(PRINTDLG)); - pd.lStructSize = sizeof(PRINTDLG); + ZeroMemory(&pd, sizeof(PRINTDLGW)); + pd.lStructSize = sizeof(PRINTDLGW); pd.hwndOwner = hWnd; pd.hDevMode = NULL; /* Don't forget to free or store hDevMode*/ pd.hDevNames = NULL; /* Don't forget to free or store hDevNames*/ @@ -555,7 +555,7 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(LOWORD(wParam)) { case IDC_VALUE_NAME: if (HIWORD(wParam) == EN_UPDATE) { - EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLength(hwndValue)>0); + EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLengthW(hwndValue) > 0); return TRUE; } break; @@ -696,11 +696,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); + curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); while(curIndex != -1) { WCHAR* valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); - curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, curIndex, LVNI_SELECTED); + curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, curIndex, MAKELPARAM(LVNI_SELECTED, 0)); if(curIndex != -1 && firstItem) { if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_BOX_TEXT_MULTIPLE), MAKEINTRESOURCEW(IDS_DELETE_BOX_TITLE), @@ -720,7 +720,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HeapFree(GetProcessHeap(), 0, keyPath); } else if (IsChild(g_pChildWnd->hTreeWnd, hWndDelete) || IsChild(g_pChildWnd->hListWnd, hWndDelete)) { - SendMessage(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); + SendMessageW(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); } break; } @@ -738,14 +738,14 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HTREEITEM hItem; if (LOWORD(wParam) == ID_EDIT_FIND && - DialogBox(0, MAKEINTRESOURCE(IDD_FIND), hWnd, find_dlgproc) != IDOK) + DialogBoxW(0, MAKEINTRESOURCEW(IDD_FIND), hWnd, find_dlgproc) != IDOK) break; if (!*searchString) break; - hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + hItem = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); if (hItem) { - int row = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_FOCUSED); - HCURSOR hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); + int row = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); + HCURSOR hcursorOld = SetCursor(LoadCursorW(NULL, (LPCWSTR)IDC_WAIT)); hItem = FindNext(g_pChildWnd->hTreeWnd, hItem, searchString, searchMask, &row); SetCursor(hcursorOld); if (hItem) { @@ -753,8 +753,15 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) InvalidateRect(g_pChildWnd->hTreeWnd, NULL, TRUE); UpdateWindow(g_pChildWnd->hTreeWnd); if (row != -1) { - ListView_SetItemState(g_pChildWnd->hListWnd, -1, 0, LVIS_FOCUSED|LVIS_SELECTED); - ListView_SetItemState(g_pChildWnd->hListWnd, row, LVIS_FOCUSED|LVIS_SELECTED, LVIS_FOCUSED|LVIS_SELECTED); + LVITEMW item; + + item.state = 0; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, (UINT)-1, (LPARAM)&item); + + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, row, (LPARAM)&item); SetFocus(g_pChildWnd->hListWnd); } else { SetFocus(g_pChildWnd->hTreeWnd); @@ -840,7 +847,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HKEY hKey; LPWSTR lpKeyPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); if (lpKeyPath) { - if (DialogBox(0, MAKEINTRESOURCE(IDD_ADDFAVORITE), hWnd, addtofavorites_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_ADDFAVORITE), hWnd, addtofavorites_dlgproc) == IDOK) { if (RegCreateKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { @@ -854,7 +861,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } case ID_FAVORITES_REMOVEFAVORITE: { - if (DialogBox(0, MAKEINTRESOURCE(IDD_DELFAVORITE), hWnd, removefavorite_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_DELFAVORITE), hWnd, removefavorite_dlgproc) == IDOK) { HKEY hKey; if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ|KEY_WRITE, &hKey) == ERROR_SUCCESS) { @@ -896,7 +903,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) pts = pt; if(ClientToScreen(g_pChildWnd->hWnd, &pts)) { SetCursorPos(pts.x, pts.y); - SetCursor(LoadCursor(0, IDC_SIZEWE)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_SIZEWE)); SendMessageW(g_pChildWnd->hWnd, WM_LBUTTONDOWN, 0, MAKELPARAM(pt.x, pt.y)); } return TRUE;

1 0

Andrew Nguyen : regedit: Convert the hex edit code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 172ce3eed83cbba499c529da2e1aa8c300912453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172ce3eed83cbba499c529da2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:21 2011 -0500 regedit: Convert the hex edit code to Unicode. --- programs/regedit/hexedit.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index ddf6b09..103a062 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -58,7 +58,7 @@ const WCHAR szHexEditClass[] = {'H','e','x','E','d','i','t',0}; static inline LRESULT HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw); -static inline BYTE hexchar_to_byte(TCHAR ch) +static inline BYTE hexchar_to_byte(WCHAR ch) { if (ch >= '0' && ch <= '9') return ch - '0'; @@ -70,17 +70,19 @@ static inline BYTE hexchar_to_byte(TCHAR ch) return -1; } -static LPTSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) +static LPWSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) { - LPTSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, - (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(TCHAR)); + static const WCHAR percent_02xW[] = {'%','0','2','X',' ',0}; + + LPWSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, + (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); LONG i; if (!lpszLine) return NULL; for (i = 0; i < cbData; i++) - wsprintf(lpszLine + i*3, TEXT("%02X "), pData[i]); + wsprintfW(lpszLine + i*3, percent_02xW, pData[i]); for (i = 0; i < pad * 3; i++) lpszLine[cbData * 3 + i] = ' '; @@ -117,7 +119,7 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) nXStart = GetSystemMetrics(SM_CXBORDER); nYStart = GetSystemMetrics(SM_CYBORDER); - if (GetWindowLong(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) + if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) clrOldText = SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); else clrOldText = SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT)); @@ -127,14 +129,14 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) for (pData = infoPtr->pData + lByteOffset; pData < infoPtr->pData + infoPtr->cbData; pData += infoPtr->nBytesPerLine) { - LPTSTR lpszLine; + LPWSTR lpszLine; LONG nLineLen = min((LONG)((infoPtr->pData + infoPtr->cbData) - pData), infoPtr->nBytesPerLine); lpszLine = HexEdit_GetLineText(pData, nLineLen, infoPtr->nBytesPerLine - nLineLen); /* FIXME: draw hex <-> ASCII mapping highlighted? */ - TextOut(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); + TextOutW(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); nYStart += infoPtr->nHeight; HeapFree(GetProcessHeap(), 0, lpszLine); @@ -157,7 +159,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) INT nByteLinePos = nCaretBytePos % infoPtr->nBytesPerLine; INT nLine = nCaretBytePos / infoPtr->nBytesPerLine; LONG nLineLen = min(infoPtr->cbData - nLine * infoPtr->nBytesPerLine, infoPtr->nBytesPerLine); - LPTSTR lpszLine = HexEdit_GetLineText(infoPtr->pData + nLine * infoPtr->nBytesPerLine, nLineLen, infoPtr->nBytesPerLine - nLineLen); + LPWSTR lpszLine = HexEdit_GetLineText(infoPtr->pData + nLine * infoPtr->nBytesPerLine, nLineLen, infoPtr->nBytesPerLine - nLineLen); INT nCharOffset; /* calculate offset of character caret is on in the line */ @@ -169,7 +171,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) hdc = GetDC(infoPtr->hwndSelf); hOldFont = SelectObject(hdc, infoPtr->hFont); - GetTextExtentPoint32(hdc, lpszLine, nCharOffset, &size); + GetTextExtentPoint32W(hdc, lpszLine, nCharOffset, &size); SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndSelf, hdc); @@ -221,7 +223,7 @@ HexEdit_EnsureVisible(HEXEDIT_INFO *infoPtr, INT nCaretPos) si.fMask = SIF_POS; SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &si, FALSE); - SendMessage(infoPtr->hwndSelf, WM_VSCROLL, MAKELONG(SB_THUMBPOSITION, 0), 0); + SendMessageW(infoPtr->hwndSelf, WM_VSCROLL, MAKELONG(SB_THUMBPOSITION, 0), 0); } @@ -255,7 +257,7 @@ HexEdit_GetData(HEXEDIT_INFO *infoPtr, INT cbData, BYTE *pData) } static inline LRESULT -HexEdit_Char (HEXEDIT_INFO *infoPtr, TCHAR ch) +HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) { INT nCaretBytePos = infoPtr->nCaretPos/2; @@ -349,7 +351,7 @@ HexEdit_Destroy (HEXEDIT_INFO *infoPtr) HeapFree(GetProcessHeap(), 0, infoPtr->pData); /* free info data */ HeapFree(GetProcessHeap(), 0, infoPtr); - SetWindowLongPtr(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; } @@ -360,12 +362,12 @@ HexEdit_EraseBackground (HEXEDIT_INFO *infoPtr, HDC hdc) HBRUSH hBrush, hSolidBrush = NULL; RECT rc; - if (GetWindowLong(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) + if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); else { - hBrush = (HBRUSH)SendMessage(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + hBrush = (HBRUSH)SendMessageW(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); if (!hBrush) hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } @@ -505,7 +507,7 @@ HexEdit_SetFocus (HEXEDIT_INFO *infoPtr, HWND lostFocus) static inline LRESULT HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) { - TEXTMETRIC tm; + TEXTMETRICW tm; HDC hdc; HFONT hOldFont = NULL; LONG i; @@ -517,7 +519,7 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) if (infoPtr->hFont) hOldFont = SelectObject(hdc, infoPtr->hFont); - GetTextMetrics(hdc, &tm); + GetTextMetricsW(hdc, &tm); infoPtr->nHeight = tm.tmHeight + tm.tmExternalLeading; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -525,9 +527,9 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) for (i = 0; ; i++) { BYTE *pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, i); - LPTSTR lpszLine = HexEdit_GetLineText(pData, i, 0); + LPWSTR lpszLine = HexEdit_GetLineText(pData, i, 0); SIZE size; - GetTextExtentPoint32(hdc, lpszLine, lstrlen(lpszLine), &size); + GetTextExtentPoint32W(hdc, lpszLine, lstrlenW(lpszLine), &size); HeapFree(GetProcessHeap(), 0, lpszLine); HeapFree(GetProcessHeap(), 0, pData); if (size.cx > (rcClient.right - rcClient.left))

1 0