winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1348 discussions
Start a n
N
ew thread
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
0
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Alexandre Julliard : advapi32: Reimplemented QueryServiceConfig2W in services.exe.
by Alexandre Julliard
20 Jan '09
20 Jan '09
Module: wine Branch: master Commit: b608a43df7429794fed77ae80804f08226497891 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b608a43df7429794fed77ae80…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 20:18:24 2009 +0100 advapi32: Reimplemented QueryServiceConfig2W in services.exe. --- dlls/advapi32/service.c | 60 +++++++++++++++++++++++----------------------- include/wine/svcctl.idl | 10 ++++++- programs/services/rpc.c | 49 ++++++++++++++++++++++++++++++++----- 3 files changed, 80 insertions(+), 39 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cf58e2c..dd056b2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -292,6 +292,7 @@ static DWORD map_exception_code(DWORD exception_code) switch (exception_code) { case RPC_X_NULL_REF_POINTER: + return ERROR_INVALID_ADDRESS; case RPC_X_ENUM_VALUE_OUT_OF_RANGE: case RPC_X_BYTE_COUNT_TOO_SMALL: return ERROR_INVALID_PARAMETER; @@ -1654,9 +1655,7 @@ cleanup: BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, DWORD size, LPDWORD needed) { - DWORD sz, type; - HKEY hKey; - LONG r; + DWORD err; struct sc_service *hsvc; if(dwLevel != SERVICE_CONFIG_DESCRIPTION) { @@ -1670,7 +1669,8 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(!needed || (!buffer && size)) { + + if(!buffer && size) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } @@ -1683,36 +1683,36 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - hKey = hsvc->hkey; - switch(dwLevel) { - case SERVICE_CONFIG_DESCRIPTION: { - static const WCHAR szDescription[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; - LPSERVICE_DESCRIPTIONW config = (LPSERVICE_DESCRIPTIONW) buffer; - LPBYTE strbuf = NULL; - *needed = sizeof (SERVICE_DESCRIPTIONW); - sz = size - *needed; - if(config && (*needed <= size)) - strbuf = (LPBYTE) (config + 1); - r = RegQueryValueExW( hKey, szDescription, 0, &type, strbuf, &sz ); - if((r == ERROR_SUCCESS) && ( type != REG_SZ)) { - FIXME("SERVICE_CONFIG_DESCRIPTION: don't know how to handle type %d\n", type); - return FALSE; - } - *needed += sz; - if(config) { - if(r == ERROR_SUCCESS) - config->lpDescription = (LPWSTR) (config + 1); - else - config->lpDescription = NULL; - } + __TRY + { + err = svcctl_QueryServiceConfig2W(hsvc->hdr.server_handle, dwLevel, buffer, size, needed); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + { + SetLastError( err ); + return FALSE; + } + + switch (dwLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if (buffer) + { + SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + if (descr->lpDescription) /* make it an absolute pointer */ + descr->lpDescription = (WCHAR *)(buffer + (ULONG_PTR)descr->lpDescription); + break; } - break; } - if(*needed > size) - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return (*needed <= size); + return TRUE; } /****************************************************************************** diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 66abd30..d04da08 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -296,8 +296,14 @@ typedef [switch_type(DWORD)] union /* Not compatible with Windows function 0x26 */ DWORD svcctl_QueryServiceConfig2A(/* FIXME */); - /* Not compatible with Windows function 0x27 */ - DWORD svcctl_QueryServiceConfig2W(/* FIXME */); + /* Untested with Windows function 0x27 */ + DWORD svcctl_QueryServiceConfig2W( + [in] SC_RPC_HANDLE hService, + [in] DWORD InfoLevel, + [out,size_is(cbBufSize)] BYTE lpBuffer[], + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded + ); /* Untested with Windows function 0x28 */ DWORD svcctl_QueryServiceStatusEx( diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 830ed9c..b6014aa 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -646,6 +646,48 @@ DWORD svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE return err; } +DWORD svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, + BYTE *buffer, DWORD size, LPDWORD needed ) +{ + struct sc_service_handle *service; + DWORD err; + + if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + return err; + + switch (level) + { + case SERVICE_CONFIG_DESCRIPTION: + { + SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + + service_lock_shared(service->service_entry); + *needed = sizeof(*descr); + if (service->service_entry->description) + *needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR); + if (size >= *needed) + { + if (service->service_entry->description) + { + /* store a buffer offset instead of a pointer */ + descr->lpDescription = (WCHAR *)((BYTE *)(descr + 1) - buffer); + strcpyW( (WCHAR *)(descr + 1), service->service_entry->description ); + } + else descr->lpDescription = NULL; + } + else err = ERROR_INSUFFICIENT_BUFFER; + service_unlock(service->service_entry); + } + break; + + default: + WINE_FIXME("level %u not implemented\n", level); + err = ERROR_INVALID_LEVEL; + break; + } + return err; +} + DWORD svcctl_QueryServiceStatusEx( SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel, @@ -1141,13 +1183,6 @@ DWORD svcctl_QueryServiceConfig2A( return ERROR_CALL_NOT_IMPLEMENTED; } -DWORD svcctl_QueryServiceConfig2W( - void) -{ - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; -} - DWORD RPC_Init(void) {
1
0
0
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
0
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
0
0
← Newer
1
...
52
53
54
55
56
57
58
...
135
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
Results per page:
10
25
50
100
200