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
December 2005
----- 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
452 discussions
Start a n
N
ew thread
Vincent Béron : Update win32.api to current git.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: 1f9fd44c3abb240e76bdcc6c6f86352085551aa3 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=1f9fd44c3abb240e76bdcc6…
Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 10:58:07 2005 +0100 Update win32.api to current git. --- tools/winapi/win32.api | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9f81c13..f17edf1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3460,10 +3460,6 @@ IUnknown * IUnknown ** void * -%void - -void - %%riched32.dll %long
1
0
0
0
Robert Shearman : OLE: Fix a typo where brackets were missing.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: ef8ae2d763bbaadc3d4a43471a5e12e5943bc56a URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=ef8ae2d763bbaadc3d4a434…
Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:58 2005 +0100 OLE: Fix a typo where brackets were missing. --- dlls/ole32/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index b50c594..d87b478 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -624,7 +624,7 @@ static HRESULT create_server(REFCLSID rc HKEY key; HRESULT hres; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; - DWORD size = MAX_PATH+1 * sizeof(WCHAR); + DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo;
1
0
0
0
Robert Shearman : OLE: ITypeInfo_Invoke parameter naming change.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: 3dd7ba394c8f4b9540ddf735c10ca36aa77619bb URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=3dd7ba394c8f4b9540ddf73…
Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:45 2005 +0100 OLE: ITypeInfo_Invoke parameter naming change. Rename the dwFlags parameter of ITypeInfo_Invoke since it is not a DWORD, but an unsigned short. --- dlls/oleaut32/typelib.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4d8a736..5c1d6c8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke ITypeInfo2 *iface, VOID *pIUnk, MEMBERID memid, - UINT16 dwFlags, + UINT16 wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, @@ -5221,15 +5221,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke HRESULT hres; const TLBFuncDesc *pFuncInfo; - TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", - This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr + TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p)\n", + This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) - if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + if (memid == pFuncInfo->funcdesc.memid && (wFlags & pFuncInfo->funcdesc.invkind)) break; if (pFuncInfo) { @@ -5395,7 +5395,7 @@ func_fail: if (SUCCEEDED(hres)) { FIXME("Calling Invoke in IDispatch iface. untested!\n"); hres = IDispatch_Invoke( - disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,dwFlags,pDispParams, + disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,wFlags,pDispParams, pVarResult,pExcepInfo,pArgErr ); if (FAILED(hres)) @@ -5435,14 +5435,14 @@ func_fail: ITypeInfo *pTInfo; hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo); if(SUCCEEDED(hres)){ - hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); + hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); ITypeInfo_Release(pTInfo); return hres; } WARN("Could not search inherited interface!\n"); } } - ERR("did not find member id %08lx, flags %d!\n", memid, dwFlags); + ERR("did not find member id %ld, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; }
1
0
0
0
Jacek Caban : shdocvw: Added get_Document implementation.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: 5ba7b1778c1b42a5ea7f5c250d6f530117971e41 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=5ba7b1778c1b42a5ea7f5c2…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:57:29 2005 +0100 shdocvw: Added get_Document implementation. --- dlls/shdocvw/webbrowser.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 9907e5b..8110950 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -260,8 +260,14 @@ static HRESULT WINAPI WebBrowser_get_Con static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = NULL; + if(This->document) + IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)ppDisp); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
1
0
0
0
Eric Pouech : winedbg: Fixed broken code about type management for binary operator.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: 4d7f9f7c65343179709cfd201f0250d2cb236d36 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7f9f7c65343179709cfd2…
Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 10:57:17 2005 +0100 winedbg: Fixed broken code about type management for binary operator. --- programs/winedbg/expr.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 5eb4d49..5815298 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -482,16 +482,18 @@ struct dbg_lvalue expr_eval(struct expr* rtn.type.id = dbg_itype_signed_int; rtn.type.module = 0; rtn.addr.Offset = (unsigned int)&exp->un.binop.result; + type1 = exp1.type; + type2 = exp2.type; switch (exp->un.binop.binop_type) { case EXP_OP_ADD: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1; @@ -513,11 +515,11 @@ struct dbg_lvalue expr_eval(struct expr* case EXP_OP_SUB: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1;
1
0
0
0
Detlef Riekenberg : winspool: Add documentation for the port functions.
by Alexandre Julliard
06 Dec '05
06 Dec '05
Module: wine Branch: refs/heads/master Commit: 1395d14507f18aa2eb73653a2b5c358d5023eea3 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=1395d14507f18aa2eb73653…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 10:57:01 2005 +0100 winspool: Add documentation for the port functions. --- dlls/winspool/info.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 3bdd01d..a54fe32 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1192,6 +1192,8 @@ DeleteMonitorW (LPWSTR pName, LPWSTR pEn /****************************************************************** * DeletePortA [WINSPOOL.@] * + * See DeletePortW. + * */ BOOL WINAPI DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) @@ -1205,6 +1207,20 @@ DeletePortA (LPSTR pName, HWND hWnd, LPS /****************************************************************** * DeletePortW [WINSPOOL.@] * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) @@ -3733,6 +3749,12 @@ static DWORD WINSPOOL_CountSerialPorts(v /****************************************************************************** * EnumPortsA (WINSPOOL.@) + * + * See EnumPortsW. + * + * BUGS + * ANSI-Version did not call the UNICODE-Version + * */ BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -3850,6 +3872,24 @@ BOOL WINAPI EnumPortsA(LPSTR name,DWORD /****************************************************************************** * EnumPortsW (WINSPOOL.@) + * + * Enumerate available Ports + * + * PARAMS + * name [I] Servername or NULL (local Computer) + * level [I] Structure-Level (1 or 2) + * buffer [O] PTR to Buffer that receives the Result + * bufsize [I] Size of Buffer at buffer + * bufneeded [O] PTR to DWORD that receives the size in Bytes used / required for buffer + * bufreturned [O] PTR to DWORD that receives the number of Ports in buffer + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * UNICODE-Version is a stub + * */ BOOL WINAPI EnumPortsW(LPWSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -4511,6 +4551,9 @@ BOOL WINAPI AbortPrinter( HANDLE hPrinte /****************************************************************************** * AddPortA (WINSPOOL.@) + * + * See AddPortW. + * */ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) { @@ -4520,6 +4563,21 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND h /****************************************************************************** * AddPortW (WINSPOOL.@) + * + * Add a Port for a specific Monitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { @@ -4530,7 +4588,8 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND /****************************************************************************** * AddPortExA (WINSPOOL.@) * - * Adds a print spooler port without presenting a user interface. + * See AddPortExW. + * */ BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, LPBYTE lpBuffer, LPSTR lpMonitorName) { @@ -4542,7 +4601,22 @@ BOOL WINAPI AddPortExA(HANDLE hMonitor, /****************************************************************************** * AddPortExW (WINSPOOL.@) * - * See AddPortExW. + * Add a Port for a specific Monitor, without presenting a user interface + * + * PARAMS + * hMonitor [I] Handle from InitializePrintMonitor2() + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1 or 2) for lpBuffer + * lpBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 + * lpMonitorName [I] Name of the Monitor that manage the Port or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortExW(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE lpBuffer, LPWSTR lpMonitorName) { @@ -4595,6 +4669,9 @@ BOOL WINAPI AddPrinterDriverExA( LPSTR p /****************************************************************************** * ConfigurePortA (WINSPOOL.@) + * + * See ConfigurePortW. + * */ BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName) { @@ -4604,6 +4681,21 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, /****************************************************************************** * ConfigurePortW (WINSPOOL.@) + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) {
1
0
0
0
Alexandre Julliard : kernel: Added a basic test for exception handling in threads.
by Alexandre Julliard
05 Dec '05
05 Dec '05
Module: wine Branch: refs/heads/master Commit: 45693738e69d056bd9102b407c9388599450d8ea URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=45693738e69d056bd9102b4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:43:33 2005 +0100 kernel: Added a basic test for exception handling in threads. --- dlls/kernel/tests/thread.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 200cdf6..444217d 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -119,6 +119,10 @@ static DWORD WINAPI threadFunc1(LPVOID p for(i=0;i<NUM_THREADS;i++) { while(tstruct->threadmem[i]==0) ; } + + /* lstrlenA contains an exception handler so this makes sure exceptions work in threads */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Check that noone changed our tls memory */ ok((int)TlsGetValue(tlsIndex)-1==tstruct->threadnum, "TlsGetValue failed\n"); @@ -180,6 +184,9 @@ static VOID test_CreateThread_basic(void DWORD i,j; DWORD GLE, ret; + /* lstrlenA contains an exception handler so this makes sure exceptions work in the main thread */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Retrieve current Thread ID for later comparisons */ curthreadId=GetCurrentThreadId(); /* Allocate some local storage */
1
0
0
0
Alexandre Julliard : user: Fixed copy/paste bug in CURSORICON_GetResIconEntry.
by Alexandre Julliard
05 Dec '05
05 Dec '05
Module: wine Branch: refs/heads/master Commit: ef4dfd4b7ab43b1587778fb8f19ee1454149e447 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4dfd4b7ab43b1587778fb…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:41:24 2005 +0100 user: Fixed copy/paste bug in CURSORICON_GetResIconEntry. --- dlls/user/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index c47a1ee..2e64d4a 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -540,7 +540,7 @@ static BOOL CURSORICON_GetResIconEntry( return FALSE; icon = &resdir->idEntries[n].ResInfo.icon; *width = icon->bWidth; - *height = icon->bWidth; + *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; return TRUE; }
1
0
0
0
Rein Klazes : ddraw: Catch access violations when calling DirectDrawEnumerateProc.
by Alexandre Julliard
05 Dec '05
05 Dec '05
Module: wine Branch: refs/heads/master Commit: 72caaad6cc3a2eaebf884d751368f9768924c00f URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=72caaad6cc3a2eaebf884d7…
Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 5 20:40:42 2005 +0100 ddraw: Catch access violations when calling DirectDrawEnumerateProc. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/main.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 361d0d0..88a7ff4 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll IMPORTLIB = libddraw.$(IMPLIBEXT) -IMPORTS = ole32 user32 gdi32 advapi32 kernel32 +IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e2912b6..25c3e05 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -39,6 +39,8 @@ #include "winnls.h" #include "winerror.h" #include "wingdi.h" +#include "wine/exception.h" +#include "excpt.h" #include "ddraw.h" #include "d3d.h" @@ -62,6 +64,14 @@ void (*wine_tsx11_unlock_ptr)(void) = NU WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + /**********************************************************************/ typedef struct { @@ -180,6 +190,7 @@ HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { int i; + BOOL stop = FALSE; TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags); if (TRACE_ON(ddraw)) { @@ -201,12 +212,21 @@ HRESULT WINAPI DirectDrawEnumerateExA( /* We have to pass NULL from the primary display device. * RoadRage chapter 6's enumeration routine expects it. */ - if (!lpCallback((DDRAW_default_driver == i) ? NULL - :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, - (LPSTR)DDRAW_drivers[i]->info->szDescription, - (LPSTR)DDRAW_drivers[i]->info->szDriver, - lpContext, 0)) - return DD_OK; + __TRY + { + if (!lpCallback((DDRAW_default_driver == i) ? NULL + :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, + (LPSTR)DDRAW_drivers[i]->info->szDescription, + (LPSTR)DDRAW_drivers[i]->info->szDriver, + lpContext, 0)) + stop = TRUE; + } + __EXCEPT(page_fault) + { + return E_INVALIDARG; + } + __ENDTRY + if (stop) return DD_OK; } /* Unsupported flags */
1
0
0
0
Thomas Weidenmueller : devenum: Don't leak key handle creating a category registry key.
by Alexandre Julliard
05 Dec '05
05 Dec '05
Module: wine Branch: refs/heads/master Commit: ae4eafbeccbf03a2659cf9d9ccfab008340d2721 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=ae4eafbeccbf03a2659cf9d…
Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 5 20:39:47 2005 +0100 devenum: Don't leak key handle creating a category registry key. --- dlls/devenum/createdevenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 15948cf..416c238 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -202,8 +202,10 @@ static HRESULT DEVENUM_CreateAMCategoryK res = E_INVALIDARG; if (SUCCEEDED(res)) - res = HRESULT_FROM_WIN32( - RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy)); + { + LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); + res = HRESULT_FROM_WIN32(lRes); + } if (hkeyDummy) RegCloseKey(hkeyDummy);
1
0
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
46
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
Results per page:
10
25
50
100
200