wine-commits November 2005

wine-commits@winehq.org

4 participants
575 discussions

wine/include rpcdce.h
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21240 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:20:30 Modified files: include : rpcdce.h Log message: Peter Lemenkov <petro(a)mail.ru> Added extern "C". Patch: http://cvs.winehq.org/patch.py?id=21240 Old revision New revision Changes Path 1.29 1.30 +8 -0 wine/include/rpcdce.h Index: wine/include/rpcdce.h diff -u -p wine/include/rpcdce.h:1.29 wine/include/rpcdce.h:1.30 --- wine/include/rpcdce.h:1.29 14 Nov 2005 11:20:30 -0000 +++ wine/include/rpcdce.h 14 Nov 2005 11:20:30 -0000 @@ -19,6 +19,10 @@ #ifndef __WINE_RPCDCE_H #define __WINE_RPCDCE_H +#ifdef __cplusplus +extern "C" { +#endif + #ifndef IN #define IN #endif @@ -312,6 +316,10 @@ RPCRTAPI unsigned short RPC_ENTRY RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); +#ifdef __cplusplus +} +#endif + #include <rpcdcep.h> #endif /*__WINE_RPCDCE_H */

1 0

wine/dlls/comctl32 imagelist.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21239 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:20:10 Modified files: dlls/comctl32 : imagelist.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Reformat "see" section, to match c2man requirements. Patch: http://cvs.winehq.org/patch.py?id=21239 Old revision New revision Changes Path 1.100 1.101 +1 -2 wine/dlls/comctl32/imagelist.c Index: wine/dlls/comctl32/imagelist.c diff -u -p wine/dlls/comctl32/imagelist.c:1.100 wine/dlls/comctl32/imagelist.c:1.101 --- wine/dlls/comctl32/imagelist.c:1.100 14 Nov 2005 11:20:10 -0000 +++ wine/dlls/comctl32/imagelist.c 14 Nov 2005 11:20:10 -0000 @@ -1581,8 +1581,7 @@ ImageList_GetImageRect (HIMAGELIST himl, * * Creates an image list from a bitmap, icon or cursor. * - * SEE - * ImageList_LoadImageW () + * See ImageList_LoadImageW. */ HIMAGELIST WINAPI

1 0

wine/dlls/commdlg printdlg.c fontdlg.c finddlg ...
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21238 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:12:25 Modified files: dlls/commdlg : printdlg.c fontdlg.c finddlg32.c filetitle.c colordlg.c cdlg32.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - complete missing A/W pairs - document remaining comdlg32 functions Patch: http://cvs.winehq.org/patch.py?id=21238 Old revision New revision Changes Path 1.97 1.98 +28 -0 wine/dlls/commdlg/printdlg.c 1.81 1.82 +12 -0 wine/dlls/commdlg/fontdlg.c 1.23 1.24 +10 -6 wine/dlls/commdlg/finddlg32.c 1.18 1.19 +11 -0 wine/dlls/commdlg/filetitle.c 1.53 1.54 +12 -0 wine/dlls/commdlg/colordlg.c 1.33 1.34 +1 -1 wine/dlls/commdlg/cdlg32.c

1 0

wine/dlls/advapi32 security.c registry.c event ...
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21237 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:12:03 Modified files: dlls/advapi32 : security.c registry.c eventlog.c crypt_sha.c crypt.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - add missing returns section Patch: http://cvs.winehq.org/patch.py?id=21237 Old revision New revision Changes Path 1.116 1.117 +6 -0 wine/dlls/advapi32/security.c 1.85 1.86 +36 -5 wine/dlls/advapi32/registry.c 1.26 1.27 +23 -0 wine/dlls/advapi32/eventlog.c 1.4 1.5 +21 -0 wine/dlls/advapi32/crypt_sha.c 1.73 1.74 +4 -0 wine/dlls/advapi32/crypt.c

1 0

wine/programs/winetest Makefile.in
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21236 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:11:27 Modified files: programs/winetest: Makefile.in Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Add shdocvw tests to winetest. Patch: http://cvs.winehq.org/patch.py?id=21236 Old revision New revision Changes Path 1.44 1.45 +3 -0 wine/programs/winetest/Makefile.in Index: wine/programs/winetest/Makefile.in diff -u -p wine/programs/winetest/Makefile.in:1.44 wine/programs/winetest/Makefile.in:1.45 --- wine/programs/winetest/Makefile.in:1.44 12 Nov 2005 19:11:27 -0000 +++ wine/programs/winetest/Makefile.in 12 Nov 2005 19:11:27 -0000 @@ -52,6 +52,7 @@ TESTBINS = \ rsaenh_test.exe$(DLLEXT) \ secur32_test.exe$(DLLEXT) \ setupapi_test.exe$(DLLEXT) \ + shdocvw_test.exe$(DLLEXT) \ shell32_test.exe$(DLLEXT) \ shlwapi_test.exe$(DLLEXT) \ urlmon_test.exe$(DLLEXT) \ @@ -157,6 +158,8 @@ secur32_test.exe$(DLLEXT): $(DLLDIR)/sec cp $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) $@ && $(STRIP) $@ setupapi_test.exe$(DLLEXT): $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) cp $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ +shdocvw_test.exe$(DLLEXT): $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) + cp $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) $@ && $(STRIP) $@ shell32_test.exe$(DLLEXT): $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) cp $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) $@ && $(STRIP) $@ shlwapi_test.exe$(DLLEXT): $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT)

1 0

wine/dlls/ole32 compobj.c
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21235 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:11:21 Modified files: dlls/ole32 : compobj.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement CLSCTX_INPROC_HANDLER in CoGetClassObject similar to CLSCTX_INPROC_SERVER by looking at the InprocHandler32 registry key instead of InprocServer32. Patch: http://cvs.winehq.org/patch.py?id=21235 Old revision New revision Changes Path 1.167 1.168 +34 -4 wine/dlls/ole32/compobj.c Index: wine/dlls/ole32/compobj.c diff -u -p wine/dlls/ole32/compobj.c:1.167 wine/dlls/ole32/compobj.c:1.168 --- wine/dlls/ole32/compobj.c:1.167 12 Nov 2005 19:11:21 -0000 +++ wine/dlls/ole32/compobj.c 12 Nov 2005 19:11:21 -0000 @@ -1554,7 +1554,7 @@ static HRESULT get_inproc_class_object(H if ((hLibrary = LoadLibraryExW(dllpath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) { /* failure: DLL could not be loaded */ - ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(dllpath)); + ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ } @@ -1612,8 +1612,8 @@ HRESULT WINAPI CoGetClassObject( return hres; } - /* first try: in-process */ - if ((CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER) & dwClsContext) + /* First try in-process server */ + if (CLSCTX_INPROC_SERVER & dwClsContext) { static const WCHAR wszInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; HKEY hkey; @@ -1624,7 +1624,34 @@ HRESULT WINAPI CoGetClassObject( if (hres == REGDB_E_CLASSNOTREG) ERR("class %s not registered\n", debugstr_guid(rclsid)); else - WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); + WARN("class %s not registered as in-proc server\n", debugstr_guid(rclsid)); + } + + if (SUCCEEDED(hres)) + { + hres = get_inproc_class_object(hkey, rclsid, iid, ppv); + RegCloseKey(hkey); + } + + /* return if we got a class, otherwise fall through to one of the + * other types */ + if (SUCCEEDED(hres)) + return hres; + } + + /* Next try in-process handler */ + if (CLSCTX_INPROC_HANDLER & dwClsContext) + { + static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; + HKEY hkey; + + hres = COM_OpenKeyForCLSID(rclsid, wszInprocHandler32, KEY_READ, &hkey); + if (FAILED(hres)) + { + if (hres == REGDB_E_CLASSNOTREG) + ERR("class %s not registered\n", debugstr_guid(rclsid)); + else + WARN("class %s not registered in-proc handler\n", debugstr_guid(rclsid)); } if (SUCCEEDED(hres)) @@ -1652,6 +1679,9 @@ HRESULT WINAPI CoGetClassObject( hres = E_NOINTERFACE; } + if (FAILED(hres)) + ERR("no class object %s could be created for for context 0x%lx\n", + debugstr_guid(rclsid), dwClsContext); return hres; }

1 0

wine/dlls/kernel/tests thread.c
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21234 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:11:05 Modified files: dlls/kernel/tests: thread.c Log message: Paul Vriens <Paul.Vriens(a)xs4all.nl> Add some extra error information. Patch: http://cvs.winehq.org/patch.py?id=21234 Old revision New revision Changes Path 1.29 1.30 +2 -2 wine/dlls/kernel/tests/thread.c Index: wine/dlls/kernel/tests/thread.c diff -u -p wine/dlls/kernel/tests/thread.c:1.29 wine/dlls/kernel/tests/thread.c:1.30 --- wine/dlls/kernel/tests/thread.c:1.29 12 Nov 2005 19:11: 5 -0000 +++ wine/dlls/kernel/tests/thread.c 12 Nov 2005 19:11: 5 -0000 @@ -629,14 +629,14 @@ static void test_SetThreadContext(void) HANDLE thread = CreateThread( NULL, 0, threadFunc6, (void *)2, CREATE_SUSPENDED, NULL ); ctx.ContextFlags = CONTEXT_FULL; - ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed\n" ); + ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed : (%ld)\n", GetLastError() ); /* simulate a call to set_test_val(10) */ stack = (int *)ctx.Esp; stack[-1] = 10; stack[-2] = ctx.Eip; ctx.Esp -= 2 * sizeof(int *); ctx.Eip = (DWORD)set_test_val; - ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed\n" ); + ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%ld)\n", GetLastError() ); ResumeThread( thread ); WaitForSingleObject( thread, INFINITE ); ok( test_value == 20, "test_value %d instead of 20\n", test_value );

1 0

wine/dlls/wininet internet.h internet.c
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21233 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:10:56 Modified files: dlls/wininet : internet.h internet.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement InternetReadFileExA (based on a patch by Brian Gerst). Patch: http://cvs.winehq.org/patch.py?id=21233 Old revision New revision Changes Path 1.38 1.39 +7 -0 wine/dlls/wininet/internet.h 1.138 1.139 +142 -31 wine/dlls/wininet/internet.c

1 0

wine/dlls/dinput joystick_linuxinput.c
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21232 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:10:38 Modified files: dlls/dinput : joystick_linuxinput.c Log message: Daniel Remenak <dtremenak(a)gmail.com> Add additional sanity checks to the linux input system dinput joystick implementation. Patch: http://cvs.winehq.org/patch.py?id=21232 Old revision New revision Changes Path 1.33 1.34 +20 -4 wine/dlls/dinput/joystick_linuxinput.c Index: wine/dlls/dinput/joystick_linuxinput.c diff -u -p wine/dlls/dinput/joystick_linuxinput.c:1.33 wine/dlls/dinput/joystick_linuxinput.c:1.34 --- wine/dlls/dinput/joystick_linuxinput.c:1.33 12 Nov 2005 19:10:38 -0000 +++ wine/dlls/dinput/joystick_linuxinput.c 12 Nov 2005 19:10:38 -0000 @@ -419,8 +419,6 @@ static HRESULT WINAPI JoystickAImpl_SetD TRACE("(this=%p,%p)\n",This,df); - _dump_DIDATAFORMAT(df); - if (df == NULL) { WARN("invalid pointer\n"); return E_POINTER; @@ -431,6 +429,8 @@ static HRESULT WINAPI JoystickAImpl_SetD return DIERR_INVALIDPARAM; } + _dump_DIDATAFORMAT(df); + if (This->joyfd!=-1) { WARN("acquired\n"); return DIERR_ACQUIRED; @@ -906,8 +906,13 @@ static HRESULT WINAPI JoystickAImpl_SetP { JoystickImpl *This = (JoystickImpl *)iface; - FIXME("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph); - FIXME("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow); + if (!ph) { + WARN("invalid argument\n"); + return DIERR_INVALIDPARAM; + } + + TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph); + TRACE("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow); if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { @@ -993,6 +998,17 @@ static HRESULT WINAPI JoystickAImpl_GetC int i,axes,buttons; TRACE("%p->(%p)\n",iface,lpDIDevCaps); + + if (!lpDIDevCaps) { + WARN("invalid pointer\n"); + return E_POINTER; + } + + if (lpDIDevCaps->dwSize != sizeof(DIDEVCAPS)) { + WARN("invalid argument\n"); + return DIERR_INVALIDPARAM; + } + if (xfd==-1) { /* yes, games assume we return something, even if unacquired */ JoystickAImpl_Acquire(iface);

1 0

wine/programs/winedbg debug.l dbg.y
by Alexandre Julliard 12 Nov '05

12 Nov '05

ChangeSet ID: 21231 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:10:24 Modified files: programs/winedbg: debug.l dbg.y Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Removed a couple of shift/reduce warnings in grammar. Patch: http://cvs.winehq.org/patch.py?id=21231 Old revision New revision Changes Path 1.15 1.16 +1 -0 wine/programs/winedbg/debug.l 1.26 1.27 +5 -4 wine/programs/winedbg/dbg.y Index: wine/programs/winedbg/debug.l diff -u -p wine/programs/winedbg/debug.l:1.15 wine/programs/winedbg/debug.l:1.16 --- wine/programs/winedbg/debug.l:1.15 12 Nov 2005 19:10:24 -0000 +++ wine/programs/winedbg/debug.l 12 Nov 2005 19:10:24 -0000 @@ -112,6 +112,7 @@ STRING \"[^\n"]+\" "<<" { return OP_SHL; } ">>" { return OP_SHR; } "->" { return OP_DRF; } +"::" { return OP_SCOPE; } [-+<=>|&^()*/%:!~,\.] { return *yytext; } "[" { return *yytext; } "]" { return *yytext; } Index: wine/programs/winedbg/dbg.y diff -u -p wine/programs/winedbg/dbg.y:1.26 wine/programs/winedbg/dbg.y:1.27 --- wine/programs/winedbg/dbg.y:1.26 12 Nov 2005 19:10:24 -0000 +++ wine/programs/winedbg/dbg.y 12 Nov 2005 19:10:24 -0000 @@ -79,7 +79,7 @@ int yyerror(const char*); %left '+' '-' %left '*' '/' '%' %left OP_SIGN '!' '~' OP_DEREF /* OP_INC OP_DEC OP_ADDR */ -%left '.' '[' OP_DRF +%left '.' '[' OP_DRF OP_SCOPE %nonassoc ':' %type <expression> expr lvalue @@ -164,8 +164,8 @@ identifier: tIDENTIFIER { $$ = $1; } | tPATH '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); sprintf($$, "%s!%s", $1, $3); } - | identifier ':' ':' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($4) + 1); - sprintf($$, "%s::%s", $1, $4); } + | identifier OP_SCOPE tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($3) + 1); + sprintf($$, "%s::%s", $1, $3); } ; list_arg: @@ -374,7 +374,8 @@ lvalue_addr: lvalue { $$ = expr_eval($1); } ; -lvalue: tNUM { $$ = expr_alloc_sconstant($1); } +lvalue: + tNUM { $$ = expr_alloc_sconstant($1); } | tINTVAR { $$ = expr_alloc_internal_var($1); } | identifier { $$ = expr_alloc_symbol($1); } | lvalue OP_DRF tIDENTIFIER { $$ = expr_alloc_pstruct($1, $3); }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2005