August 2006 - Wine-Commits - list.winehq.org

Andrew Talbot : regedit: Write-strings warnings fix.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 6ca620334a90e0b82c080a2e9451a69c991d2e99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ca620334a90e0b82c080a2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 10 20:29:43 2006 +0100 regedit: Write-strings warnings fix. --- programs/regedit/treeview.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index a9d1a8f..7a21f0d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -505,6 +505,12 @@ static BOOL InitTreeViewItems(HWND hwndT { TVINSERTSTRUCT tvins; HTREEITEM hRoot; + static TCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, + hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, + hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, + hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}, + hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, + hkdd[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}; tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ @@ -521,13 +527,13 @@ static BOOL InitTreeViewItems(HWND hwndT /* Add the item to the tree view control. */ if (!(hRoot = TreeView_InsertItem(hwndTV, &tvins))) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT, 1)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER, 1)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE, 1)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_USERS"), HKEY_USERS, 1)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG, 1)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; - + if (!AddEntryToTree(hwndTV, hRoot, hkcr, HKEY_CLASSES_ROOT, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, hkcu, HKEY_CURRENT_USER, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, hklm, HKEY_LOCAL_MACHINE, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, hku, HKEY_USERS, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; + /* expand and select host name */ SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot);

1 0

Andrew Talbot : wininet/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 5ea47faf8bc320756ed775dfe6f48456b02cc44c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ea47faf8bc320756ed775d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 10 19:24:35 2006 +0100 wininet/tests: Write-strings warnings fix. --- dlls/wininet/tests/http.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4992202..404d705 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -906,7 +906,7 @@ static DWORD CALLBACK server_thread(LPVO return 0; } -static void test_basic_request(int port, char *url) +static void test_basic_request(int port, const char *url) { HINTERNET hi, hc, hr; DWORD r, count; @@ -999,6 +999,8 @@ static void test_proxy_direct(int port) HINTERNET hi, hc, hr; DWORD r, sz; char buffer[0x40]; + static CHAR username[] = "mike", + password[] = "1101"; sprintf(buffer, "localhost:%d\n", port); hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); @@ -1022,10 +1024,10 @@ static void test_proxy_direct(int port) /* set the user + password then try again */ todo_wine { - r = InternetSetOption(hr, INTERNET_OPTION_PROXY_USERNAME, "mike", 4); + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_USERNAME, username, 4); ok(r, "failed to set user\n"); - r = InternetSetOption(hr, INTERNET_OPTION_PROXY_PASSWORD, "1101", 4); + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_PASSWORD, password, 4); ok(r, "failed to set password\n"); }

1 0

Phil Krylov : riched20: Accept RTF header without a version number.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 2aed652c01bbb7f697ae0dae3c53f3beb33a1cfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2aed652c01bbb7f697ae0da… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Aug 10 11:45:46 2006 -0400 riched20: Accept RTF header without a version number. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bf406bf..85f9a20 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -632,7 +632,7 @@ static LRESULT ME_StreamIn(ME_TextEditor ME_StreamInFill(&inStream); if (!inStream.editstream->dwError) { - if (strncmp(inStream.buffer, "{\\rtf1", 6) && strncmp(inStream.buffer, "{\\urtf", 6)) + if (strncmp(inStream.buffer, "{\\rtf", 5) && strncmp(inStream.buffer, "{\\urtf", 6)) { format &= ~SF_RTF; format |= SF_TEXT; @@ -1894,7 +1894,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND if (lParam) { TRACE("WM_SETTEXT lParam==%lx\n",lParam); - if (!IsWindowUnicode(hWnd) && !strncmp((char *)lParam, "{\\rtf1", 6)) + if (!IsWindowUnicode(hWnd) && !strncmp((char *)lParam, "{\\rtf", 5)) { /* Undocumented: WM_SETTEXT supports RTF text */ ME_StreamInRTFString(editor, 0, (char *)lParam);

1 0

Phil Krylov : riched20: Accept RTF group tokens inside colortbl destination .
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: d360f1db5137bb6a9f2efdfa6f58c7b36c55680b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d360f1db5137bb6a9f2efdf… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Aug 10 23:08:17 2006 +0400 riched20: Accept RTF group tokens inside colortbl destination. --- dlls/riched20/reader.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 856cd8a..e6e4186 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1057,6 +1057,7 @@ static void ReadColorTbl(RTF_Info *info) RTFColor *cp; int cnum = 0; const char *fn = "ReadColorTbl"; + int group_level = 1; TRACE("\n"); @@ -1066,7 +1067,18 @@ static void ReadColorTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) - break; + { + group_level--; + if (!group_level) + break; + continue; + } + else if (RTFCheckCM(info, rtfGroup, rtfBeginGroup)) + { + group_level++; + continue; + } + cp = New (RTFColor); if (cp == NULL) ERR ( "%s: cannot allocate color entry\n", fn);

1 0

Kai Blin : secur32: Implement CompleteAuthToken for NTLM.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 4ff2d893c3552b28ad98db2dc89c5e7499d9aac7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ff2d893c3552b28ad98db2… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Aug 10 13:06:39 2006 +0200 secur32: Implement CompleteAuthToken for NTLM. --- dlls/secur32/ntlm.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index d8962a5..c483b5e 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -898,18 +898,12 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac static SECURITY_STATUS SEC_ENTRY ntlm_CompleteAuthToken(PCtxtHandle phContext, PSecBufferDesc pToken) { - SECURITY_STATUS ret; - + /* We never need to call CompleteAuthToken anyway */ TRACE("%p %p\n", phContext, pToken); - if (phContext) - { - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else - { - ret = SEC_E_INVALID_HANDLE; - } - return ret; + if (!phContext) + return SEC_E_INVALID_HANDLE; + + return SEC_E_OK; } /***********************************************************************

1 0

Alexandre Julliard : server: Only call gettimeofday once per poll loop.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 753c8706f5770bcf9e5327c498caba661df8ef58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=753c8706f5770bcf9e5327c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 10 16:42:09 2006 +0200 server: Only call gettimeofday once per poll loop. --- server/fd.c | 17 +++++++++++------ server/file.h | 1 + server/mailslot.c | 3 +-- server/named_pipe.c | 11 +++-------- server/process.c | 4 ++-- server/queue.c | 20 +++++++------------- server/registry.c | 3 +-- server/request.c | 10 +++------- server/serial.c | 3 +-- server/thread.c | 8 +++----- server/timer.c | 2 +- server/trace.c | 7 +++---- server/winstation.c | 3 +-- 13 files changed, 38 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=753c8706f5770bcf9e5…

1 0

Jan Zerebecki : wined3d: Fix spelling in a comment.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 387c982d5c5354d890243850d1eb542f8b07ecd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=387c982d5c5354d89024385… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Aug 10 14:24:30 2006 +0200 wined3d: Fix spelling in a comment. --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 26751b3..b99e03b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2121,9 +2121,9 @@ #endif *pCaps->NumberOfAdaptersInGroup = 1; if(*pCaps->VertexShaderVersion >= D3DVS_VERSION(2,0)) { - /* OpenGL supports all formats below perhaps not allways without conversion but it supports them. + /* OpenGL supports all formats below, perhaps not always without conversion but it supports them. Further GLSL doesn't seem to have an official unsigned type as I'm not sure how we handle it - don't advertise iet yet. We might need to add some clamping in the shader engine to support it. + don't advertise it yet. We might need to add some clamping in the shader engine to support it. TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */ *pCaps->DeclTypes = D3DDTCAPS_UBYTE4 | D3DDTCAPS_UBYTE4N | @@ -2131,7 +2131,7 @@ #endif D3DDTCAPS_SHORT4N | D3DDTCAPS_FLOAT16_2 | D3DDTCAPS_FLOAT16_4; - + } else *pCaps->DeclTypes = 0;

1 0

Tijl Coosemans : kernel/tests: Increase requested file size in two tests to hit FreeBSD file size limit.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 529bb1adffc926414f113df3d1bfde73a8db6327 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=529bb1adffc926414f113df… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Fri Aug 4 17:39:49 2006 +0200 kernel/tests: Increase requested file size in two tests to hit FreeBSD file size limit. --- dlls/kernel/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index e3506a9..a0ac890 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1308,11 +1308,11 @@ static void test_MapFile(void) ok( hmap == NULL, "mapped zero size file\n"); ok( GetLastError() == ERROR_FILE_INVALID, "not ERROR_FILE_INVALID\n"); - hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x1000, 0, NULL ); + hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x80000000, 0, NULL ); ok( hmap == NULL, "mapping should fail\n"); /* GetLastError() varies between win9x and WinNT and also depends on the filesystem */ - hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x1000, 0x10000, NULL ); + hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x80000000, 0x10000, NULL ); ok( hmap == NULL, "mapping should fail\n"); /* GetLastError() varies between win9x and WinNT and also depends on the filesystem */

1 0

lostwages/news 2006081002.xml
by WineHQ Aug. 10, 2006

Aug. 10, 2006

ChangeSet ID: 27303 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/08/10 13:12:55 Added files: news : 2006081002.xml Log message: News about Wine 0.9.19 Patch: http://cvs.winehq.org/patch.py?id=27303 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006081002.xml Index: lostwages/news/2006081002.xml diff -u -p /dev/null lostwages/news/2006081002.xml:1.1 --- /dev/null 10 Aug 2006 18:12:55 -0000 +++ lostwages/news/2006081002.xml 10 Aug 2006 18:12:55 -0000 @@ -0,0 +1,26 @@ +<news> + <date>August 10, 2006</date> + <title>Wine 0.9.19 Released</title> + <body> + +Summer development is rolling forward. Alexandre released Wine 0.9.19 +today and a slew of updates: +<ul> + +<li> Support for a proper Trash folder.</li> +<li> Many improvements to the IDL compiler.</li> +<li> Better FreeBSD support.</li> +<li> A number of MSI bug fixes.</li> +<li> Many RichEdit improvements.</li> +</ul> + + Binary packages are in the process of being built and it may take a few days + for them to appear, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.19.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.123">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

lostwages/include winehq.conf
by Alexandre Julliard Aug. 10, 2006

Aug. 10, 2006

ChangeSet ID: 27302 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/08/10 08:52:11 Modified files: include : winehq.conf Log message: Release 0.9.19 Patch: http://cvs.winehq.org/patch.py?id=27302 Old revision New revision Changes Path 1.41 1.42 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.41 lostwages/include/winehq.conf:1.42 --- lostwages/include/winehq.conf:1.41 10 Aug 2006 13:52:11 -0000 +++ lostwages/include/winehq.conf 10 Aug 2006 13:52:11 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.18 +snapshot_date: 0.9.19 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0