January 2009 - Wine-commits

Andrew Talbot : netapi32: Fix some limits and bounds checking.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 05c283246c5c30c50bf0f4f58602e0b3a55c9980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c283246c5c30c50bf0f4f58… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 19 17:34:54 2009 +0000 netapi32: Fix some limits and bounds checking. --- dlls/netapi32/nbt.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 8db87b4..5042baa 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -103,8 +103,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); #define MIN_CACHE_TIMEOUT 60000 #define CACHE_TIMEOUT 360000 -#define MAX_NBT_NAME_SZ (NCBNAMSZ * 2 + MAX_DOMAIN_NAME_LEN + 2) -#define SIMPLE_NAME_QUERY_PKT_SIZE 26 + MAX_NBT_NAME_SZ +#define MAX_NBT_NAME_SZ 255 +#define SIMPLE_NAME_QUERY_PKT_SIZE 16 + MAX_NBT_NAME_SZ #define DEFAULT_NBT_SESSIONS 16 @@ -156,7 +156,7 @@ static DWORD gWINSQueries; static DWORD gWINSQueryTimeout; static DWORD gWINSServers[MAX_WINS_SERVERS]; static int gNumWINSServers; -static char gScopeID[MAX_DOMAIN_NAME_LEN]; +static char gScopeID[MAX_SCOPE_ID_LEN]; static DWORD gCacheTimeout; static struct NBNameCache *gNameCache; @@ -1493,7 +1493,7 @@ void NetBTInit(void) (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT && dword <= MAX_QUERY_TIMEOUT) gWINSQueryTimeout = dword; - size = MAX_DOMAIN_NAME_LEN - 1; + size = sizeof(gScopeID) - 1; if (RegQueryValueExW(hKey, ScopeIDW, NULL, NULL, (LPBYTE)gScopeID + 1, &size) == ERROR_SUCCESS) { @@ -1501,11 +1501,11 @@ void NetBTInit(void) NetBTNameEncode */ char *ptr, *lenPtr; - for (ptr = gScopeID + 1; *ptr && - ptr - gScopeID < MAX_DOMAIN_NAME_LEN; ) + for (ptr = gScopeID + 1; ptr - gScopeID < sizeof(gScopeID) && *ptr; ) { - for (lenPtr = ptr - 1, *lenPtr = 0; *ptr && *ptr != '.' && - ptr - gScopeID < MAX_DOMAIN_NAME_LEN; ptr++) + for (lenPtr = ptr - 1, *lenPtr = 0; + ptr - gScopeID < sizeof(gScopeID) && *ptr && *ptr != '.'; + ptr++) *lenPtr += 1; ptr++; }

1 0

Austin English : ntdll: Add support for NetBSD (64-bit).
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 633e069c67e039b56bc30d8f80f20ceec7ca12a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633e069c67e039b56bc30d8f8… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 19 13:11:50 2009 -0600 ntdll: Add support for NetBSD (64-bit). --- dlls/ntdll/signal_x86_64.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8e9dd7c..4a57099 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -93,6 +93,53 @@ typedef struct ucontext SIGCONTEXT; #endif /* linux */ +#if defined(__NetBSD__) +# include <sys/ucontext.h> +# include <sys/types.h> +# include <signal.h> + +typedef ucontext_t SIGCONTEXT; + +#define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) +#define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) +#define RCX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RCX]) +#define RDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RDX]) +#define RSI_sig(context) ((context)->uc_mcontext.__gregs[_REG_RSI]) +#define RDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_RDI]) +#define RBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBP]) +#define R8_sig(context) ((context)->uc_mcontext.__gregs[_REG_R8]) +#define R9_sig(context) ((context)->uc_mcontext.__gregs[_REG_R9]) +#define R10_sig(context) ((context)->uc_mcontext.__gregs[_REG_R10]) +#define R11_sig(context) ((context)->uc_mcontext.__gregs[_REG_R11]) +#define R12_sig(context) ((context)->uc_mcontext.__gregs[_REG_R12]) +#define R13_sig(context) ((context)->uc_mcontext.__gregs[_REG_R13]) +#define R14_sig(context) ((context)->uc_mcontext.__gregs[_REG_R14]) +#define R15_sig(context) ((context)->uc_mcontext.__gregs[_REG_R15]) + +#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) +#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) +#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) + +#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_RFL]) + +#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_RIP])) +#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_URSP])) + +#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) + +#define FAULT_CODE (__siginfo->si_code) +#define FAULT_ADDRESS (__siginfo->si_addr) + +#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context ) +#define HANDLER_CONTEXT (__context) + +#define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) +#endif /* __NetBSD__ */ + enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */

1 0

Damjan Jovanovic : shlwapi: Support the friendly doc name and default icon queries.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: e60ec41e0671bb144e7c707f0dd7f0ce51b0193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60ec41e0671bb144e7c707f0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jan 19 18:32:43 2009 +0200 shlwapi: Support the friendly doc name and default icon queries. --- dlls/shlwapi/assoc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 070ca1a..53a873f 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -772,6 +772,38 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( return ASSOC_ReturnData(pszOut, pcchOut, path, len); } + case ASSOCSTR_FRIENDLYDOCNAME: + { + WCHAR *pszFileType; + DWORD ret; + DWORD size; + + hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + if (FAILED(hr)) + return hr; + size = 0; + ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret == ERROR_SUCCESS) + { + WCHAR *docName = HeapAlloc(GetProcessHeap(), 0, size); + if (docName) + { + ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); + if (ret == ERROR_SUCCESS) + hr = ASSOC_ReturnData(pszOut, pcchOut, docName, strlenW(docName) + 1); + else + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, docName); + } + else + hr = E_OUTOFMEMORY; + } + else + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, pszFileType); + return hr; + } + case ASSOCSTR_FRIENDLYAPPNAME: { PVOID verinfoW = NULL; @@ -851,6 +883,47 @@ get_friendly_name_fail: return hr; } + case ASSOCSTR_DEFAULTICON: + { + static const WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; + WCHAR *pszFileType; + DWORD ret; + DWORD size; + HKEY hkeyFile; + + hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + if (FAILED(hr)) + return hr; + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); + if (ret == ERROR_SUCCESS) + { + size = 0; + ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret == ERROR_SUCCESS) + { + WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); + if (icon) + { + ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); + if (ret == ERROR_SUCCESS) + hr = ASSOC_ReturnData(pszOut, pcchOut, icon, strlenW(icon) + 1); + else + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, icon); + } + else + hr = E_OUTOFMEMORY; + } + else + hr = HRESULT_FROM_WIN32(ret); + RegCloseKey(hkeyFile); + } + else + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, pszFileType); + return hr; + } + default: FIXME("assocstr %d unimplemented!\n", str); return E_NOTIMPL;

1 0

Paul Vriens : riched20/tests: Fix a test failure on Win9x.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: bd607b64fdf8adfca5df83ca02b0c4095675e141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd607b64fdf8adfca5df83ca0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 19 18:10:53 2009 +0100 riched20/tests: Fix a test failure on Win9x. --- dlls/riched20/tests/txtsrv.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index cb11469..05976ef 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -673,6 +673,7 @@ static void test_TxSetText(void) void test_TxGetNaturalSize() { HRESULT result; + BOOL ret; /* This value is used when calling TxGetNaturalSize. MSDN says that this is not supported however a null pointer cannot be @@ -702,7 +703,14 @@ void test_TxGetNaturalSize() { /* Populate the metric strucs */ SetMapMode(hdcDraw,MM_TEXT); GetTextMetrics(hdcDraw, &tmInfo_text); - GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); + SetLastError(0xdeadbeef); + ret = GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("GetCharWidth32 is not available\n"); + RestoreDC(hdcDraw,1); + ReleaseDC(NULL,hdcDraw); + return; + } /* Make measurements in MM_TEXT */ SetMapMode(hdcDraw,MM_TEXT);

1 0

Andrey Turkin : ole32: Prevent recursion when CLSIDFromString is passed empty string.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 644220b518dfb574c1f5dee22065d88b9603e7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644220b518dfb574c1f5dee22… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 19 18:11:22 2009 +0300 ole32: Prevent recursion when CLSIDFromString is passed empty string. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4e926ec..b8ddba8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1694,7 +1694,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) return CO_E_CLASSSTRING; } RegCloseKey(xhkey); - return CLSIDFromString(buf2,clsid); + return __CLSIDFromString(buf2,clsid); }

1 0

Alexandre Julliard : advapi32/tests: Fix some service test failures on NT4 and Win64.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: fc26627cdc29cf1c8f8d69f8514a4ebba6e449d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc26627cdc29cf1c8f8d69f85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 23:53:54 2009 +0100 advapi32/tests: Fix some service test failures on NT4 and Win64. --- dlls/advapi32/tests/service.c | 97 +++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc26627cdc29cf1c8f8d6…

1 0

Alexandre Julliard : advapi32: Get rid of the client-side service handle management.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 540fe928424063b930c6076758822b382e734ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540fe928424063b930c607675… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 20:24:00 2009 +0100 advapi32: Get rid of the client-side service handle management. --- dlls/advapi32/service.c | 392 +++++------------------------------------ dlls/advapi32/tests/service.c | 4 +- 2 files changed, 50 insertions(+), 346 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=540fe928424063b930c60…

1 0

Alexandre Julliard : libwine: Add support in cpmap. pl for parsing the Windows bestfit codepage files.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 97d31ec78938146563856146bdc60e3c253a7615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d31ec78938146563856146b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 19:21:55 2009 +0100 libwine: Add support in cpmap.pl for parsing the Windows bestfit codepage files. --- libs/wine/cpmap.pl | 200 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 153 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97d31ec78938146563856…

1 0

Alexandre Julliard : libwine: Enable perl warnings and use strict in cpmap. pl.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: dc727fa7b0fb6bd31ac85710dc3ce5355a9ed575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc727fa7b0fb6bd31ac85710d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 19:51:19 2009 +0100 libwine: Enable perl warnings and use strict in cpmap.pl. --- libs/wine/cpmap.pl | 303 +++++++++++++++++++++++++++------------------------- 1 files changed, 159 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc727fa7b0fb6bd31ac85…

1 0

Alexandre Julliard : libwine: Re-generate the Windows codepage data using the bestfit files.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 8e16e7871063df35ca3a6de6fb165767c00bd087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e16e7871063df35ca3a6de6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 19:57:59 2009 +0100 libwine: Re-generate the Windows codepage data using the bestfit files. --- dlls/msvcrt/tests/string.c | 20 +- libs/wine/c_1250.c | 417 +++---- libs/wine/c_1251.c | 462 ++------ libs/wine/c_1252.c | 407 +++---- libs/wine/c_1253.c | 404 ++----- libs/wine/c_1254.c | 417 +++---- libs/wine/c_1255.c | 468 +------ libs/wine/c_1256.c | 513 ++------ libs/wine/c_1257.c | 482 ++------ libs/wine/c_1258.c | 464 +------ libs/wine/c_874.c | 414 ++----- libs/wine/c_932.c | 3097 +++++++++++++++++++++++++------------------- libs/wine/c_936.c | 1498 ++++++++++++---------- libs/wine/c_949.c | 837 ++++++------- libs/wine/c_950.c | 2655 ++++++++++++++++++++++++++++++++------ 15 files changed, 6358 insertions(+), 6197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e16e7871063df35ca3a6…

1 0