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

Alexandre Julliard : ntdll: Fix the LPC_MESSAGE structure definition for 64-bit.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 82fb611806b37be7959723670889835e1b9d554f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fb611806b37be7959723670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 13:42:39 2009 +0200 ntdll: Fix the LPC_MESSAGE structure definition for 64-bit. --- dlls/ntdll/nt.c | 4 ++-- dlls/ntdll/tests/port.c | 4 ++-- include/winternl.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8ffa9e0..58320c3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -691,8 +691,8 @@ NTSTATUS WINAPI NtRequestWaitReplyPort( TRACE("\tVirtualRangesOffset = %u\n",pLpcMessageIn->VirtualRangesOffset); TRACE("\tClientId.UniqueProcess = %p\n",pLpcMessageIn->ClientId.UniqueProcess); TRACE("\tClientId.UniqueThread = %p\n",pLpcMessageIn->ClientId.UniqueThread); - TRACE("\tMessageId = %u\n",pLpcMessageIn->MessageId); - TRACE("\tSectionSize = %u\n",pLpcMessageIn->SectionSize); + TRACE("\tMessageId = %lu\n",pLpcMessageIn->MessageId); + TRACE("\tSectionSize = %lu\n",pLpcMessageIn->SectionSize); TRACE("\tData = %s\n", debugstr_an((const char*)pLpcMessageIn->Data,pLpcMessageIn->DataSize)); } diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 51707e3..0795b4c 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -62,8 +62,8 @@ typedef struct _LPC_MESSAGE USHORT MessageType; USHORT VirtualRangesOffset; CLIENT_ID ClientId; - ULONG MessageId; - ULONG SectionSize; + ULONG_PTR MessageId; + ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE; diff --git a/include/winternl.h b/include/winternl.h index 5ebbca5..b06a10c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1803,8 +1803,8 @@ typedef struct _LPC_MESSAGE { USHORT MessageType; USHORT VirtualRangesOffset; CLIENT_ID ClientId; - ULONG MessageId; - ULONG SectionSize; + ULONG_PTR MessageId; + ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE;

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::IsPreservedKey.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 32828799acfd8cffd9f0d3094071acdfd4f9c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32828799acfd8cffd9f0d3094… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:45 2009 -0500 msctf: Implement ITfKeystrokeMgr::IsPreservedKey. --- dlls/msctf/tests/inputprocessor.c | 6 +++--- dlls/msctf/threadmgr.c | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4cc71ef..2477ad8 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -420,14 +420,14 @@ static void test_KeystrokeMgr(void) preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); todo_wine ok(hr == S_OK, "ITfKeystrokeMgr_IsPreservedKey failed\n"); - if (hr == S_OK) todo_wine ok(preserved == TRUE,"misreporting preserved key\n"); + if (hr == S_OK) ok(preserved == TRUE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); - todo_wine ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); - if (hr == S_FALSE) todo_wine ok(preserved == FALSE,"misreporting preserved key\n"); + ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); + if (hr == S_FALSE) ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 976fcbc..f0c76b1 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -547,8 +547,25 @@ static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface, REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + + TRACE("(%p) %s (%x %x) %p\n",This,debugstr_guid(rguid), (pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0, pfRegistered); + + if (!rguid || !pprekey || !pfRegistered) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + { + *pfRegistered = TRUE; + return S_OK; + } + } + + *pfRegistered = FALSE; + return S_FALSE; } static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface,

1 0

Dmitry Kislyuk : kernel32/tests: Show that NULLs need to be preserved in data before first section.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 8d9434eefe556568660b73be8b827715bf81ef3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9434eefe556568660b73be8… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed May 6 23:11:35 2009 -0300 kernel32/tests: Show that NULLs need to be preserved in data before first section. --- dlls/kernel32/tests/profile.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 15a3902..fbf5d24 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -824,11 +824,10 @@ static void test_GetPrivateProfileString(const char *content, const char *descri static DWORD timeout = 0; -static BOOL check_file_data(LPCSTR path, LPCSTR data) +static BOOL check_binary_file_data(LPCSTR path, const VOID *data, DWORD size) { HANDLE file; CHAR buf[MAX_PATH]; - DWORD size; BOOL ret; /* Sleep() is needed on Win9x and WinME */ @@ -839,17 +838,23 @@ static BOOL check_file_data(LPCSTR path, LPCSTR data) if (file == INVALID_HANDLE_VALUE) return FALSE; - size = GetFileSize(file, NULL); - buf[size] = '\0'; + if(size != GetFileSize(file, NULL) ) + { + CloseHandle(file); + return FALSE; + } + ret = ReadFile(file, buf, size, &size, NULL); CloseHandle(file); if (!ret) return FALSE; - if (!*data && size != 0) - return FALSE; + return !memcmp(buf, data, size); +} - return !lstrcmpA(buf, data); +static BOOL check_file_data(LPCSTR path, LPCSTR data) +{ + return check_binary_file_data(path, data, lstrlenA(data)); } static void test_WritePrivateProfileString(void) @@ -1039,7 +1044,23 @@ static void test_WritePrivateProfileString(void) ret = WritePrivateProfileStringA("App3", "key5", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + /* NULLs in file before first section. Should be preserved in output */ + data = "Data \0 before \0 first \0 section" /* 31 bytes */ + "\r\n[section1]\r\n" /* 14 bytes */ + "key1=string1\r\n"; /* 14 bytes */ + GetTempFileNameA(temp, "wine", 0, path); + create_test_file(path, data, 31); + ret = WritePrivateProfileStringA("section1", "key1", "string1", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + ok( check_binary_file_data(path, data, 59) || + broken( check_binary_file_data(path, /* Windows 9x */ + "Data \0 before \0 first \0 section" /* 31 bytes */ + "\r\n\r\n[section1]\r\n" /* 14 bytes */ + "key1=string1" /* 14 bytes */ + , 59)), "File doesn't match\n"); DeleteFileA(path); }

1 0

Alexandre Julliard : user32/tests: Fix the window creation on Win64.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 8432ff70bb898867d1fa6cdda3aeb6ddf4c45144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8432ff70bb898867d1fa6cdda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 13:50:49 2009 +0200 user32/tests: Fix the window creation on Win64. --- dlls/user32/tests/class.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f3e8242..f8a4cd8 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -43,11 +43,13 @@ static const WCHAR WC_EDITW[] = {'E','d','i','t',0}; static LRESULT WINAPI ClassTest_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == WM_NCCREATE) return 1; return DefWindowProcW (hWnd, msg, wParam, lParam); } static LRESULT WINAPI ClassTest_WndProc2 (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == WM_NCCREATE) return 1; return DefWindowProcA (hWnd, msg, wParam, lParam); } @@ -370,6 +372,7 @@ static void test_instances(void) /* setting global flag doesn't change status of class */ hwnd = CreateWindowExA( 0, name, "test", 0, 0, 0, 0, 0, 0, 0, main_module, 0 ); + ok( hwnd != 0, "CreateWindow failed error %u\n", GetLastError()); SetClassLongA( hwnd, GCL_STYLE, CS_GLOBALCLASS ); cls.lpszMenuName = "kernel32"; cls.hInstance = kernel32;

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::UnpreserveKey.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: a2c7a99471f91184c67e7111861976a31f5e196a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c7a99471f91184c67e71118… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:38 2009 -0500 msctf: Implement ITfKeystrokeMgr::UnpreserveKey. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d29b319..4cc71ef 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -430,7 +430,7 @@ static void test_KeystrokeMgr(void) if (hr == S_FALSE) todo_wine ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); - todo_wine ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5580410..976fcbc 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -598,8 +598,29 @@ static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, REFGUID rguid, const TF_PRESERVEDKEY *pprekey) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + PreservedKey* key = NULL; + struct list *cursor; + TRACE("(%p) %s (%x %x)\n",This,debugstr_guid(rguid),(pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0); + + if (!pprekey || !rguid) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + break; + key = NULL; + } + + if (!key) + return CONNECT_E_NOCONNECTION; + + list_remove(&key->entry); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface,

1 0

Michael Stefaniuc : notepad: Use the explicit W-form of the types.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 3e7647ad72455f8527c65971fa60a52aad940ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7647ad72455f8527c65971f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 7 11:08:48 2009 +0200 notepad: Use the explicit W-form of the types. --- programs/notepad/dialog.c | 27 +++++++++++++-------------- programs/notepad/main.c | 36 ++++++++++++++++++------------------ programs/notepad/main.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 53 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 65f9b09..b651269 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -50,8 +50,7 @@ VOID ShowLastError(void) LoadString(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle)); FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error, 0, - (LPTSTR) &lpMsgBuf, 0, NULL); + NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL); MessageBox(NULL, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } @@ -122,7 +121,7 @@ static int AlertFileNotSaved(LPCWSTR szFileName) */ BOOL FileExists(LPCWSTR szFilename) { - WIN32_FIND_DATA entry; + WIN32_FIND_DATAW entry; HANDLE hFile; hFile = FindFirstFile(szFilename, &entry); @@ -287,7 +286,7 @@ VOID DIALOG_FileNew(VOID) VOID DIALOG_FileOpen(VOID) { - OPENFILENAME openfilename; + OPENFILENAMEW openfilename; WCHAR szPath[MAX_PATH]; WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; @@ -326,7 +325,7 @@ BOOL DIALOG_FileSave(VOID) BOOL DIALOG_FileSaveAs(VOID) { - OPENFILENAME saveas; + OPENFILENAMEW saveas; WCHAR szPath[MAX_PATH]; WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; @@ -337,7 +336,7 @@ BOOL DIALOG_FileSaveAs(VOID) GetCurrentDirectory(SIZEOF(szDir), szDir); lstrcpy(szPath, txt_files); - saveas.lStructSize = sizeof(OPENFILENAME); + saveas.lStructSize = sizeof(OPENFILENAMEW); saveas.hwndOwner = Globals.hMainWnd; saveas.hInstance = Globals.hInstance; saveas.lpstrFilter = Globals.szFilter; @@ -384,7 +383,7 @@ static int notepad_print_header(HDC hdc, RECT *rc, BOOL dopage, BOOL header, int static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTINFO tInfo) { int b, y; - TEXTMETRIC tm; + TEXTMETRICW tm; SIZE szMetrics; if (dopage) @@ -478,10 +477,10 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI VOID DIALOG_FilePrint(VOID) { - DOCINFO di; - PRINTDLG printer; + DOCINFOW di; + PRINTDLGW printer; int page, dopage, copy; - LOGFONT lfFont; + LOGFONTW lfFont; HFONT hTextFont, old_font = 0; DWORD size; BOOL ret = FALSE; @@ -516,7 +515,7 @@ VOID DIALOG_FilePrint(VOID) SetMapMode(printer.hDC, MM_TEXT); /* initialize DOCINFO */ - di.cbSize = sizeof(DOCINFO); + di.cbSize = sizeof(DOCINFOW); di.lpszDocName = Globals.szFileTitle; di.lpszOutput = NULL; di.lpszDatatype = NULL; @@ -594,7 +593,7 @@ VOID DIALOG_FilePrint(VOID) VOID DIALOG_FilePrinterSetup(VOID) { - PRINTDLG printer; + PRINTDLGW printer; ZeroMemory(&printer, sizeof(printer)); printer.lStructSize = sizeof(printer); @@ -701,8 +700,8 @@ VOID DIALOG_EditWrap(VOID) VOID DIALOG_SelectFont(VOID) { - CHOOSEFONT cf; - LOGFONT lf=Globals.lfFont; + CHOOSEFONTW cf; + LOGFONTW lf=Globals.lfFont; ZeroMemory( &cf, sizeof(cf) ); cf.lStructSize=sizeof(cf); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index fcea9e3..3618168 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -356,7 +356,7 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, int index) GetWindowTextLength(Globals.hEdit) ? MF_ENABLED : MF_GRAYED); } -static LPTSTR NOTEPAD_StrRStr(LPTSTR pszSource, LPTSTR pszLast, LPTSTR pszSrch) +static LPWSTR NOTEPAD_StrRStr(LPWSTR pszSource, LPWSTR pszLast, LPWSTR pszSrch) { int len = lstrlen(pszSrch); pszLast--; @@ -372,16 +372,16 @@ static LPTSTR NOTEPAD_StrRStr(LPTSTR pszSource, LPTSTR pszLast, LPTSTR pszSrch) /*********************************************************************** * The user activated the Find dialog */ -void NOTEPAD_DoFind(FINDREPLACE *fr) +void NOTEPAD_DoFind(FINDREPLACEW *fr) { - LPTSTR content; - LPTSTR found; + LPWSTR content; + LPWSTR found; int len = lstrlen(fr->lpstrFindWhat); int fileLen; DWORD pos; - + fileLen = GetWindowTextLength(Globals.hEdit) + 1; - content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); @@ -415,16 +415,16 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } -static void NOTEPAD_DoReplace(FINDREPLACE *fr) +static void NOTEPAD_DoReplace(FINDREPLACEW *fr) { - LPTSTR content; + LPWSTR content; int len = lstrlen(fr->lpstrFindWhat); int fileLen; DWORD pos; DWORD pos_start; fileLen = GetWindowTextLength(Globals.hEdit) + 1; - content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); @@ -447,10 +447,10 @@ static void NOTEPAD_DoReplace(FINDREPLACE *fr) NOTEPAD_DoFind(fr); } -static void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) +static void NOTEPAD_DoReplaceAll(FINDREPLACEW *fr) { - LPTSTR content; - LPTSTR found; + LPWSTR content; + LPWSTR found; int len = lstrlen(fr->lpstrFindWhat); int fileLen; DWORD pos; @@ -458,7 +458,7 @@ static void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); while(TRUE){ fileLen = GetWindowTextLength(Globals.hEdit) + 1; - content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); @@ -495,8 +495,8 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, { if (msg == aFINDMSGSTRING) /* not a constant so can't be used in switch */ { - FINDREPLACE *fr = (FINDREPLACE *)lParam; - + FINDREPLACEW *fr = (FINDREPLACEW *)lParam; + if (fr->Flags & FR_DIALOGTERM) Globals.hFindReplaceDlg = NULL; if (fr->Flags & FR_FINDNEXT) @@ -717,9 +717,9 @@ static void HandleCommandLine(LPWSTR cmdline) */ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { - MSG msg; - HACCEL hAccel; - WNDCLASSEX class; + MSG msg; + HACCEL hAccel; + WNDCLASSEXW class; HMONITOR monitor; MONITORINFO info; INT x, y; diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 88e7fbe..69c31af 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -27,27 +27,27 @@ typedef struct { - HANDLE hInstance; - HWND hMainWnd; - HWND hFindReplaceDlg; - HWND hEdit; - HFONT hFont; /* Font used by the edit control */ - LOGFONT lfFont; - BOOL bWrapLongLines; - WCHAR szFindText[MAX_PATH]; - WCHAR szReplaceText[MAX_PATH]; - WCHAR szFileName[MAX_PATH]; - WCHAR szFileTitle[MAX_PATH]; - WCHAR szFilter[2 * MAX_STRING_LEN + 100]; - INT iMarginTop; - INT iMarginBottom; - INT iMarginLeft; - INT iMarginRight; - WCHAR szHeader[MAX_PATH]; - WCHAR szFooter[MAX_PATH]; + HANDLE hInstance; + HWND hMainWnd; + HWND hFindReplaceDlg; + HWND hEdit; + HFONT hFont; /* Font used by the edit control */ + LOGFONTW lfFont; + BOOL bWrapLongLines; + WCHAR szFindText[MAX_PATH]; + WCHAR szReplaceText[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; + WCHAR szFileTitle[MAX_PATH]; + WCHAR szFilter[2 * MAX_STRING_LEN + 100]; + INT iMarginTop; + INT iMarginBottom; + INT iMarginLeft; + INT iMarginRight; + WCHAR szHeader[MAX_PATH]; + WCHAR szFooter[MAX_PATH]; - FINDREPLACE find; - FINDREPLACE lastFind; + FINDREPLACEW find; + FINDREPLACEW lastFind; HGLOBAL hDevMode; /* printer mode */ HGLOBAL hDevNames; /* printer names */ } NOTEPAD_GLOBALS; @@ -55,5 +55,5 @@ typedef struct extern NOTEPAD_GLOBALS Globals; VOID SetFileName(LPCWSTR szFileName); -void NOTEPAD_DoFind(FINDREPLACE *fr); +void NOTEPAD_DoFind(FINDREPLACEW *fr); DWORD get_dpi(void);

1 0

Nikolay Sivov : comctl32/listview: Remove irrelevant fixme comment.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 5123ffc36b20f6d3d3c5e30585d870ba6933aed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5123ffc36b20f6d3d3c5e3058… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 6 22:58:32 2009 +0400 comctl32/listview: Remove irrelevant fixme comment. --- dlls/comctl32/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b76da63..133d3c2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9633,7 +9633,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; /* FIXME: if LVS_NOSORTHEADER changed, update header */ - /* or LVS_SORT{AS,DES}CENDING */ infoPtr->dwStyle = lpss->styleNew;

1 0

Aric Stewart : msctf: Implement ITfClientId.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: f1d7cfa93af9c33eacd3f057d7cb9c18f319351c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d7cfa93af9c33eacd3f057d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 6 10:35:52 2009 -0500 msctf: Implement ITfClientId. --- dlls/msctf/tests/inputprocessor.c | 31 +++++++++++++++++++ dlls/msctf/threadmgr.c | 59 +++++++++++++++++++++++++++++++++++++ include/msctf.idl | 13 ++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index b5ae508..8d6579b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -648,6 +648,36 @@ static void test_TfGuidAtom(void) todo_wine ok(!IsEqualGUID(&g1,&GUID_NULL),"guid should not be NULL\n"); } +static void test_ClientId(void) +{ + ITfClientId *pcid; + TfClientId id1,id2; + HRESULT hr; + GUID g2; + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfClientId, (LPVOID*)&pcid); + ok(SUCCEEDED(hr),"Unable to aquire ITfClientId interface\n"); + + CoCreateGuid(&g2); + + hr = ITfClientId_GetClientId(pcid,&GUID_NULL,&id1); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + hr = ITfClientId_GetClientId(pcid,&GUID_NULL,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id1==id2,"Id's for GUID_NULL do not match\n"); + hr = ITfClientId_GetClientId(pcid,&CLSID_FakeService,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id2!=id1,"Id matches GUID_NULL\n"); + todo_wine ok(id2==tid,"Id for CLSID_FakeService not matching tid\n"); + ok(id2!=cid,"Id for CLSID_FakeService matching cid\n"); + hr = ITfClientId_GetClientId(pcid,&g2,&id2); + ok(SUCCEEDED(hr),"GetClientId failed\n"); + ok(id2!=id1,"Id matches GUID_NULL\n"); + ok(id2!=tid,"Id for random guid matching tid\n"); + ok(id2!=cid,"Id for random guid matching cid\n"); + ITfClientId_Release(pcid); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -660,6 +690,7 @@ START_TEST(inputprocessor) test_Activate(); test_startSession(); test_TfGuidAtom(); + test_ClientId(); test_KeystrokeMgr(); test_endSession(); test_EnumLanguageProfiles(); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index fa13a2f..fcd4dae 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -61,6 +61,7 @@ typedef struct tagACLMulti { const ITfSourceVtbl *SourceVtbl; const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; const ITfMessagePumpVtbl *MessagePumpVtbl; + const ITfClientIdVtbl *ClientIdVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -91,6 +92,11 @@ static inline ThreadMgr *impl_from_ITfMessagePumpVtbl(ITfMessagePump *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,MessagePumpVtbl)); } +static inline ThreadMgr *impl_from_ITfClientIdVtbl(ITfClientId *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ClientIdVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -173,6 +179,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->MessagePumpVtbl; } + else if (IsEqualIID(iid, &IID_ITfClientId)) + { + *ppvOut = &This->ClientIdVtbl; + } if (*ppvOut) { @@ -660,6 +670,54 @@ static const ITfMessagePumpVtbl ThreadMgr_MessagePumpVtbl = }; /***************************************************** + * ITfClientId functions + *****************************************************/ + +static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ClientId_AddRef(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI ClientId_Release(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI ClientId_GetClientId(ITfClientId *iface, + REFCLSID rclsid, TfClientId *ptid) + +{ + HRESULT hr; + ITfCategoryMgr *catmgr; + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + + TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); + + CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr); + hr = ITfCategoryMgr_RegisterGUID(catmgr,rclsid,ptid); + ITfCategoryMgr_Release(catmgr); + + return hr; +} + +static const ITfClientIdVtbl ThreadMgr_ClientIdVtbl = +{ + ClientId_QueryInterface, + ClientId_AddRef, + ClientId_Release, + + ClientId_GetClientId +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -803,6 +861,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->SourceVtbl = &ThreadMgr_SourceVtbl; This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; + This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index 115e643..7e643f4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -686,3 +686,16 @@ interface ITfMessagePump : IUnknown [in] UINT wMsgFilterMax, [out] BOOL *pfResult); }; + +[ + object, + local, + uuid(d60a7b49-1b9f-4be2-b702-47e9dc05dec3), + pointer_default(unique) +] +interface ITfClientId : IUnknown +{ + HRESULT GetClientId( + [in] REFCLSID rclsid, + [out] TfClientId *ptid); +};

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillRectangle.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 323e7e68eb0bf48557380152378e7af5ee823e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323e7e68eb0bf485573801523… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 6 16:34:19 2009 -0500 gdiplus: Use brush_fill_path in GdipFillRectangle. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68d71c5..07b2114 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2479,12 +2479,14 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 4); + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, 4); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Nikolay Sivov : comctl32/listview: Add tests for LVS_NOSORTHEADER switchover.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 4bc8e87ab604a3b655420a40405f159eae22f748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc8e87ab604a3b655420a404… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 6 23:28:08 2009 +0400 comctl32/listview: Add tests for LVS_NOSORTHEADER switchover. --- dlls/comctl32/listview.c | 2 - dlls/comctl32/tests/listview.c | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 133d3c2..a8ecd91 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9631,8 +9631,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; - - /* FIXME: if LVS_NOSORTHEADER changed, update header */ infoPtr->dwStyle = lpss->styleNew; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b6cbd47..e94bdaa 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2027,6 +2027,47 @@ static void test_norecompute(void) DestroyWindow(hwnd); } +static void test_nosortheader(void) +{ + HWND hwnd, header; + LONG_PTR style; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "header expected\n"); + + style = GetWindowLongPtr(header, GWL_STYLE); + ok(style & HDS_BUTTONS, "expected header to have HDS_BUTTONS\n"); + + style = GetWindowLongPtr(hwnd, GWL_STYLE); + SetWindowLongPtr(hwnd, GWL_STYLE, style | LVS_NOSORTHEADER); + /* HDS_BUTTONS retained */ + style = GetWindowLongPtr(header, GWL_STYLE); + ok(style & HDS_BUTTONS, "expected header to retain HDS_BUTTONS\n"); + + DestroyWindow(hwnd); + + /* create with LVS_NOSORTHEADER */ + hwnd = create_listview_control(LVS_NOSORTHEADER); + ok(hwnd != NULL, "failed to create a listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "header expected\n"); + + style = GetWindowLongPtr(header, GWL_STYLE); + ok(!(style & HDS_BUTTONS), "expected header to have no HDS_BUTTONS\n"); + + style = GetWindowLongPtr(hwnd, GWL_STYLE); + SetWindowLongPtr(hwnd, GWL_STYLE, style & ~LVS_NOSORTHEADER); + /* not changed here */ + style = GetWindowLongPtr(header, GWL_STYLE); + ok(!(style & HDS_BUTTONS), "expected header to have no HDS_BUTTONS\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2068,4 +2109,5 @@ START_TEST(listview) test_sorting(); test_ownerdata(); test_norecompute(); + test_nosortheader(); }

1 0