March 2006 - Wine-commits - list.winehq.org

Robert Shearman : wininet: Only access the URL in the cache by the provided offset.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4f40f1722605c745ce2c442e1f07a124b3415d03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f40f1722605c745ce2c442… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:55:15 2006 +0100 wininet: Only access the URL in the cache by the provided offset. --- dlls/wininet/urlcache.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f143512..a4bdfa7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -95,7 +95,7 @@ typedef struct _URL_CACHEFILE_ENTRY DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ - DWORD dwOffsetUrl; /* usually 0x68 */ + DWORD dwOffsetUrl; /* offset of start of url from start of entry */ BYTE CacheDir; /* index of cache directory this url is stored in */ BYTE Unknown4; /* usually zero */ WORD wUnknown5; /* usually 0x1010 */ @@ -112,7 +112,8 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wUnknownTime; /* usually same as wLastSyncTime */ DWORD dwUnknown7; /* usually zero */ DWORD dwUnknown8; /* usually zero */ - CHAR szSourceUrlName[1]; /* start of url */ + /* packing to dword align start of next field */ + /* CHAR szSourceUrlName[]; (url) */ /* packing to dword align start of next field */ /* CHAR szLocalFileName[]; (local file name exluding path) */ /* packing to dword align start of next field */ @@ -939,9 +940,9 @@ static BOOL URLCache_CopyEntry( ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4)); dwRequiredSize = DWORD_ALIGN(dwRequiredSize); if (bUnicode) - lenUrl = MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, NULL, 0); + lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else - lenUrl = strlen(pUrlEntry->szSourceUrlName); + lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); dwRequiredSize += lenUrl + 1; /* FIXME: is source url optional? */ @@ -949,9 +950,9 @@ static BOOL URLCache_CopyEntry( { lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, pUrlEntry->szSourceUrlName, (lenUrl + 1) * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1398,7 +1399,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); @@ -1483,7 +1484,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWST } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); if (!URLCache_CopyEntry( @@ -1704,7 +1705,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", pUrlEntry->szSourceUrlName); + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); pUrlEntry->dwHitRate++; @@ -2035,7 +2036,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn LPURLCACHE_HEADER pHeader; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; - DWORD dwBytesNeeded = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + DWORD dwBytesNeeded = DWORD_ALIGN(sizeof(*pUrlEntry)); DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwFileSizeLow = 0; @@ -2177,7 +2178,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwHitRate = 0; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; - pUrlEntry->dwOffsetUrl = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); pUrlEntry->dwSizeHigh = 0; pUrlEntry->dwSizeLow = dwFileSizeLow; pUrlEntry->dwSizeHigh = dwFileSizeHigh; @@ -2200,7 +2201,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwUnknown8 = 0; - strcpy(pUrlEntry->szSourceUrlName, achUrl); + strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); if (dwOffsetLocalFileName) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName); if (dwOffsetHeader)

1 0

Rein Klazes : msvcrt: Fix read beyond end of string in __unDNameEx().
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: ef9038c761cec7ae40b334c98c33d6e0b8fae79d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef9038c761cec7ae40b334c… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Thu Mar 30 16:30:01 2006 +0200 msvcrt: Fix read beyond end of string in __unDNameEx(). --- dlls/msvcrt/undname.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 1cda196..ebf51fa 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1233,8 +1233,7 @@ char* __unDNameEx(char* buffer, const ch result = symbol_demangle(&sym) ? sym.result : mangled; if (buffer && buflen) { - memcpy(buffer, result, buflen - 1); - buffer[buflen - 1] = '\0'; + lstrcpynA( buffer, result, buflen); } else {

1 0

Juan Lang : crypt32: Fix certificate adding
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 5eadd8c79192c5503c8969f18d8212c32bdf1e33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5eadd8c79192c5503c8969f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 30 07:27:05 2006 -0800 crypt32: Fix certificate adding - Implement add disposition in CertAddCertificateContextToStore, rather than in each store. - Add a few more tests. --- dlls/crypt32/store.c | 318 +++++++++++++++++++++++++------------------- dlls/crypt32/tests/store.c | 107 +++++++++++++++ 2 files changed, 285 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5eadd8c79192c5503c8…

1 0

Juan Lang : crypt32: Tiny fixes.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 04ed9c2a57b78f21f189e20b6d7798f0e00aa71b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04ed9c2a57b78f21f189e20… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 30 08:31:14 2006 -0800 crypt32: Tiny fixes. --- dlls/crypt32/proplist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index ec9e242..c030153 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -132,7 +132,6 @@ BOOL ContextPropertyList_SetProperty(PCO { prop->propID = id; prop->cbData = cbData; - list_init(&prop->entry); prop->pbData = data; list_add_tail(&list->properties, &prop->entry); ret = TRUE; @@ -158,6 +157,7 @@ void ContextPropertyList_RemoveProperty( list_remove(&prop->entry); CryptMemFree(prop->pbData); CryptMemFree(prop); + break; } } LeaveCriticalSection(&list->cs);

1 0

lostwages/wwn wn20011125_109.xml wn20020913_13 ...
by Jeremy Newman 30 Mar '06

30 Mar '06

ChangeSet ID: 23868 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/30 15:39:46 Modified files: wwn : wn20011125_109.xml wn20020913_135.xml wn20041231_255.xml wn20050204_260.xml wn20060129_304.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Fix the WineTools case. Patch: http://cvs.winehq.org/patch.py?id=23868 Old revision New revision Changes Path 1.9 1.10 +1 -1 lostwages/wwn/wn20011125_109.xml 1.11 1.12 +1 -1 lostwages/wwn/wn20020913_135.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20041231_255.xml 1.2 1.3 +4 -4 lostwages/wwn/wn20050204_260.xml 1.3 1.4 +2 -2 lostwages/wwn/wn20060129_304.xml Index: lostwages/wwn/wn20011125_109.xml diff -u -p lostwages/wwn/wn20011125_109.xml:1.9 lostwages/wwn/wn20011125_109.xml:1.10 --- lostwages/wwn/wn20011125_109.xml:1.9 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20011125_109.xml 30 Mar 2006 21:39:46 -0000 @@ -346,7 +346,7 @@ he was having, <quote who="Josh Thielen" Finale expects mmsystem to be present without having to call LoadLibrary on it. It does a GetModuleHandle on mmsystem.dll to find out if the mm extensions are available. I checked out windows 95, and it has mmsystem - and winmm loaded when no apps are runing besides the desktop / + and winmm loaded when no apps are running besides the desktop / explorer. This patch links wine with winmm and makes winmm load mmsystem on init. Finale gets by this ok now. I don't know if this the correct approach, though. Could someone (Eric or Alexandre?) please take a look Index: lostwages/wwn/wn20020913_135.xml diff -u -p lostwages/wwn/wn20020913_135.xml:1.11 lostwages/wwn/wn20020913_135.xml:1.12 --- lostwages/wwn/wn20020913_135.xml:1.11 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20020913_135.xml 30 Mar 2006 21:39:46 -0000 @@ -336,7 +336,7 @@ and exactly what would currently build. window mode. Basically, the main menu bar should be at the top of the window, but the - configurable taskbar / buttonbar is displayed "over" it. The accellerator + configurable taskbar / buttonbar is displayed "over" it. The accelerator keys for the menu bar are no longer recognised (the program beeps if you try to use <alt>f [for example] to get to the File menu). </quote> Index: lostwages/wwn/wn20041231_255.xml diff -u -p lostwages/wwn/wn20041231_255.xml:1.3 lostwages/wwn/wn20041231_255.xml:1.4 --- lostwages/wwn/wn20041231_255.xml:1.3 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20041231_255.xml 30 Mar 2006 21:39:46 -0000 @@ -473,7 +473,7 @@ so by making it any easier.</quote> Jon thought it was worth getting rid of heap.h though: <quote who="Jon Griffiths"> -winapi_check will allready tell us all cross-calls anyway, doesn't +winapi_check will already tell us all cross-calls anyway, doesn't it? It may be years before all the a to w conversions are done and we are 100% internally unicode, why live with a non standard header that long?</quote> Index: lostwages/wwn/wn20050204_260.xml diff -u -p lostwages/wwn/wn20050204_260.xml:1.2 lostwages/wwn/wn20050204_260.xml:1.3 --- lostwages/wwn/wn20050204_260.xml:1.2 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20050204_260.xml 30 Mar 2006 21:39:46 -0000 @@ -452,8 +452,8 @@ ever run into legal issues they need cla </section> <section - title="Debian Winetools Packages" - subject="Winetools Debian Package!" + title="Debian WineTools Packages" + subject="WineTools Debian Package!" archive="http://www.winehq.org/hypermail/wine-devel/2005/01/0048.html" posts="1" startdate="02/02/2005" @@ -461,8 +461,8 @@ ever run into legal issues they need cla <topic>Utilities</topic> -Scott Ritchie announced the availability of the Winetools package -for Debian. Winetools sets up a custom configuration and lets you +Scott Ritchie announced the availability of the WineTools package +for Debian. WineTools sets up a custom configuration and lets you install various Windows programs: <quote who="Scott Ritchie"> Index: lostwages/wwn/wn20060129_304.xml diff -u -p lostwages/wwn/wn20060129_304.xml:1.3 lostwages/wwn/wn20060129_304.xml:1.4 --- lostwages/wwn/wn20060129_304.xml:1.3 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20060129_304.xml 30 Mar 2006 21:39:46 -0000 @@ -86,7 +86,7 @@ Its main goal is to carpet. It also serv > <topic>Utilities</topic> Debate has been raging for weeks over whether the -<a href="http://www.von-thadden.de/Joachim/WineTools/">Winetools</a> +<a href="http://www.von-thadden.de/Joachim/WineTools/">WineTools</a> project should be listed on Wine's <a href="http://www.winehq.org/site/download">download</a> page. @@ -245,7 +245,7 @@ run and don't run with and without winet those users to appDB. We need information there available for everyone to see, not in your e-mail box (no offense). -Winetools has setup the +WineTools has setup the environment in a such a way that it is unified! If you're saying that all you did is tinkered with lots of stuff to get few applications to work, this is not good. Wine is not cedega designed to run games and games

1 0

lostwages/wwn wn20060313_308.xml
by Jeremy Newman 30 Mar '06

30 Mar '06

ChangeSet ID: 23867 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/30 15:39:05 Modified files: wwn : wn20060313_308.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes and tweaks. Link to Jeremy White's Darwine email. Fix the WineTools case. Patch: http://cvs.winehq.org/patch.py?id=23867 Old revision New revision Changes Path 1.2 1.3 +37 -37 lostwages/wwn/wn20060313_308.xml

1 0

Detlef Riekenberg : spoolss: Add DllAllocSplMem and DllFreeSplMem.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: fee66fb15ac70f109398c6d60e18821b0acfced1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fee66fb15ac70f109398c6d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 15:59:17 2006 +0200 spoolss: Add DllAllocSplMem and DllFreeSplMem. --- dlls/spoolss/spoolss.spec | 4 ++-- dlls/spoolss/spoolss_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 57b78d2..0862626 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -38,8 +38,8 @@ @ stub DeletePrinterDriverW @ stub DeletePrinterIC @ stub DeletePrinterKeyW -@ stub DllAllocSplMem -@ stub DllFreeSplMem +@ stdcall DllAllocSplMem(long) +@ stdcall DllFreeSplMem(ptr) @ stub DllFreeSplStr @ stub EndDocPrinter @ stub EndPagePrinter diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 65ed261..6baf07a 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -45,3 +45,51 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, } return TRUE; } + +/****************************************************************** + * DllAllocSplMem [SPOOLSS.@] + * + * Allocate cleared memory from the spooler heap + * + * PARAMS + * size [I] Number of bytes to allocate + * + * RETURNS + * Failure: NULL + * Success: PTR to the allocated memory + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ +LPVOID WINAPI DllAllocSplMem(DWORD size) +{ + LPVOID res; + + res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + TRACE("(%ld) => %p\n", size, res); + return res; +} + +/****************************************************************** + * DllFreeSplMem [SPOOLSS.@] + * + * Free the allocated spooler memory + * + * PARAMS + * memory [I] PTR to the memory allocated by DllAllocSplMem + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ + +BOOL WINAPI DllFreeSplMem(LPBYTE memory) +{ + TRACE("(%p)\n", memory); + return HeapFree(GetProcessHeap(), 0, memory); +}

1 0

Eric Kohl : widl: Implement support for ref pointers to strings.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 12d4d9c229678639f77fb07e47314ae2defec6ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12d4d9c229678639f77fb07… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Wed Mar 29 12:42:29 2006 +0200 widl: Implement support for ref pointers to strings. --- tools/widl/client.c | 41 ++++++++++---- tools/widl/header.c | 22 +++++++ tools/widl/header.h | 1 tools/widl/server.c | 38 +++++++++++-- tools/widl/typegen.c | 150 ++++++++++++++++++++++++++++++++++++++------------ tools/widl/typegen.h | 1 6 files changed, 202 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=12d4d9c229678639f77…

1 0

Dmitry Timoshkov : x11drv: Update Hungarian keyboard layout to better match the X11 one.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 70afa9214a72b172e68bd589ceebaa05e9a984b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70afa9214a72b172e68bd58… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 30 23:02:41 2006 +0900 x11drv: Update Hungarian keyboard layout to better match the X11 one. --- dlls/x11drv/keyboard.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 78ff47c..202bff9 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -595,11 +595,11 @@ static const char main_key_BE[MAIN_LEN][ /*** Hungarian keyboard layout (setxkbmap hu) */ static const char main_key_HU[MAIN_LEN][4] = { - "0�","1'~","2\"�","3+^","4!�","5%0�","6/�","7=`","8(�","9)�","�ֽ","�ܨ","�Ӹ", - "qQ\\","wW|","eE","rR","tT","zZ","uU","iI�","oO�","pP","��","��", - "aA","sS�","dD�","fF[","gG]","hH","jJ�","kK�","lL�","��$","��","�ۤ", - "yY>","xX#","cC&","vV@","bB{","nN}","mM",",?;",".:>","-_*", - "��<" + "0�","1'","2\"","3+","4!","5%","6/","7=","8(","9)","��","��","��", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", + "��" }; /*** Polish (programmer's) keyboard layout ***/

1 0

Dmitry Timoshkov : gdi32: Add a test for WMF-> EMF conversions performed by SetWinMetaFileBits.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: d53ad9c3f7c4ab7fd2577aa666ac803629218eb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d53ad9c3f7c4ab7fd2577aa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 30 23:03:02 2006 +0900 gdi32: Add a test for WMF->EMF conversions performed by SetWinMetaFileBits. These tests currently fail in Wine. --- dlls/gdi/tests/metafile.c | 188 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 179 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d53ad9c3f7c4ab7fd25…

1 0