January 2006 - Wine-commits

Marcus Meissner : winspool: Added ordinal exported functions of winspool.drv.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 25b54cbb9f6bd9e3638f7fe4eb4c11e9bd0e60ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25b54cbb9f6bd9e3638f7fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 5 13:42:13 2006 +0100 winspool: Added ordinal exported functions of winspool.drv. --- dlls/winspool/winspool.drv.spec | 42 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec index 5f714eb..bc85e7d 100644 --- a/dlls/winspool/winspool.drv.spec +++ b/dlls/winspool/winspool.drv.spec @@ -1,4 +1,42 @@ -100 stub @ +100 stub -noname EnumPrinterPropertySheets +101 stub -noname ClusterSplOpen +102 stub -noname ClusterSplClose +103 stub -noname ClusterSplIsAlive +104 stub PerfClose +105 stub PerfCollect +106 stub PerfOpen +201 stdcall GetDefaultPrinterA(ptr ptr) +202 stub SetDefaultPrinterA +203 stdcall GetDefaultPrinterW(ptr ptr) +204 stub SetDefaultPrinterW +205 stub -noname SplReadPrinter +206 stub -noname AddPerMachineConnectionA +207 stub -noname AddPerMachineConnectionW +208 stub -noname DeletePerMachineConnectionA +209 stub -noname DeletePerMachineConnectionW +210 stub -noname EnumPerMachineConnectionsA +211 stub -noname EnumPerMachineConnectionsW +212 stub -noname LoadPrinterDriver +213 stub -noname RefCntLoadDriver +214 stub -noname RefCntUnloadDriver +215 stub -noname ForceUnloadDriver +216 stub -noname PublishPrinterA +217 stub -noname PublishPrinterW +218 stub -noname CallCommonPropertySheetUI +219 stub -noname PrintUIQueueCreate +220 stub -noname PrintUIPrinterPropPages +221 stub -noname PrintUIDocumentDefaults +222 stub -noname SendRecvBidiData +223 stub -noname RouterFreeBidiResponseContainer +224 stub -noname ExternalConnectToLd64In32Server +226 stub -noname PrintUIWebPnpEntry +227 stub -noname PrintUIWebPnpPostEntry +228 stub -noname PrintUICreateInstance +229 stub -noname PrintUIDocumentPropertiesWrap +230 stub -noname PrintUIPrinterSetup +231 stub -noname PrintUIServerPropPages +232 stub -noname AddDriverCatalog + @ stub ADVANCEDSETUPDIALOG @ stdcall AbortPrinter(long) @ stdcall AddFormA(long long ptr) @@ -89,8 +127,6 @@ @ stdcall FindFirstPrinterChangeNotification(long long long ptr) @ stdcall FindNextPrinterChangeNotification(long ptr ptr ptr) @ stdcall FreePrinterNotifyInfo(ptr) -@ stdcall GetDefaultPrinterA(ptr ptr) -@ stdcall GetDefaultPrinterW(ptr ptr) @ stdcall GetFormA(long str long ptr long ptr) @ stdcall GetFormW(long wstr long ptr long ptr) @ stdcall GetJobA(long long long ptr long ptr)

1 0

Jacek Caban : urlmon: Query service provider for IInternetProtocol.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 6744b9b4682b2f499f52242ce3cec627736e175d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6744b9b4682b2f499f52242… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 13:42:32 2006 +0100 urlmon: Query service provider for IInternetProtocol. --- dlls/urlmon/binding.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c590717..46ced83 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -44,6 +44,7 @@ typedef struct { IBindStatusCallback *callback; IInternetProtocol *protocol; + IServiceProvider *service_provider; IStream *stream; BINDINFO bindinfo; @@ -112,6 +113,8 @@ static ULONG WINAPI Binding_Release(IBin IBindStatusCallback_Release(This->callback); if(This->protocol) IInternetProtocol_Release(This->protocol); + if(This->service_provider) + IServiceProvider_Release(This->service_provider); if(This->stream) IStream_Release(This->stream); @@ -459,6 +462,13 @@ static HRESULT get_protocol(Binding *Thi if(SUCCEEDED(hres)) return S_OK; + if(This->service_provider) { + hres = IServiceProvider_QueryService(This->service_provider, &IID_IInternetProtocol, + &IID_IInternetProtocol, (void**)&This->protocol); + if(SUCCEEDED(hres)) + return S_OK; + } + hres = get_protocol_iface(url, &unk); if(FAILED(hres)) return hres; @@ -498,6 +508,7 @@ static HRESULT Binding_Create(LPCWSTR ur ret->callback = NULL; ret->protocol = NULL; + ret->service_provider = NULL; ret->stream = NULL; ret->mime = NULL; ret->url = NULL; @@ -513,6 +524,9 @@ static HRESULT Binding_Create(LPCWSTR ur return hres; } + IBindStatusCallback_QueryInterface(ret->callback, &IID_IServiceProvider, + (void**)&ret->service_provider); + hres = get_protocol(ret, url); if(FAILED(hres)) { WARN("Could not get protocol handler\n");

1 0

Dan Kegel : oleaut32: Allow _invoke to handle up to 23 parameters.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: d69366a17191fb96b92aecf085561ad047adfd86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d69366a17191fb96b92aecf… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jan 5 13:41:35 2006 +0100 oleaut32: Allow _invoke to handle up to 23 parameters. --- dlls/oleaut32/typelib.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9d7ba2a..4ef590e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4899,6 +4899,24 @@ _invoke(FARPROC func,CALLCONV callconv, case 17: res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16]); break; + case 18: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17]); + break; + case 19: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18]); + break; + case 20: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19]); + break; + case 21: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20]); + break; + case 22: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21]); + break; + case 23: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22]); + break; default: FIXME("unsupported number of arguments %d in stdcall\n",nrargs); res = -1;

1 0

Robert Reif : dsound: Capture refactoring.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 5070268711f99d82a591832558129eff82f7f8e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5070268711f99d82a591832… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Jan 5 13:37:15 2006 +0100 dsound: Capture refactoring. Move initialization code from DirectSoundCapture to DirectSoundCaptureDevice. Make DirectSoundCaptureBuffer directly reference DirectSoundCaptureDevice rather than DirectSoundCapture to eliminate one level of indirection. Rename DSOUND_CreateDirectSoundCaptureBuffer to IDirectSoundCaptureBufferImpl_Create to be consistent. --- dlls/dsound/capture.c | 642 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 14 + 2 files changed, 331 insertions(+), 325 deletions(-)

1 0

Eric Pouech : dbghelp: StackWalk (32 and 64 bit version).
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 558130a696a1e6c11a84f3d1f12515c74b9ef17f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=558130a696a1e6c11a84f3d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jan 5 13:41:25 2006 +0100 dbghelp: StackWalk (32 and 64 bit version). - enhance implementation of StackWalk (32 and 64 bit version) by making use of module information and calling for FPO - FPO part is still non functional - implemented SymGetModuleBase64 - stubbed SymFunctionTableAccess64 --- dlls/dbghelp/dbghelp.spec | 4 ++- dlls/dbghelp/module.c | 11 ++++++++- dlls/dbghelp/stack.c | 56 ++++++++++++++++++++++++++++++++++++++------- dlls/dbghelp/symbol.c | 14 +++++++++-- include/dbghelp.h | 2 ++ 5 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 92ccd49..7318bce 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -43,7 +43,7 @@ @ stdcall SymFromAddr(ptr double ptr ptr) @ stdcall SymFromName(long str ptr) @ stub SymFromToken -@ stub SymFunctionTableAccess64 +@ stdcall SymFunctionTableAccess64(long double) @ stdcall SymFunctionTableAccess(long long) @ stub SymGetFileLineOffsets64 @ stub SymGetHomeDirectory @@ -55,7 +55,7 @@ @ stdcall SymGetLineNext(long ptr) @ stdcall SymGetLinePrev64(long ptr) @ stdcall SymGetLinePrev(long ptr) -@ stub SymGetModuleBase64 +@ stdcall SymGetModuleBase64(long double) @ stdcall SymGetModuleBase(long long) @ stdcall SymGetModuleInfo64(long double ptr) @ stdcall SymGetModuleInfo(long long ptr) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 2b0de8c..3c0c5d4 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -642,7 +642,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h } /*********************************************************************** - * SymGetModuleBase (IMAGEHLP.@) + * SymGetModuleBase (DBGHELP.@) */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { @@ -655,6 +655,15 @@ DWORD WINAPI SymGetModuleBase(HANDLE hPr return module->module.BaseOfImage; } +/*********************************************************************** + * SymGetModuleBase64 (DBGHELP.@) + */ +DWORD64 WINAPI SymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) +{ + if (!validate_addr64(dwAddr)) return 0; + return SymGetModuleBase(hProcess, (DWORD)dwAddr); +} + /****************************************************************** * module_reset_debug_info * Removes any debug information linked to a given module. diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 69e9c1f..e4827a6 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -89,11 +89,15 @@ struct stack_walk_callback { PREAD_PROCESS_MEMORY_ROUTINE f_read_mem; PTRANSLATE_ADDRESS_ROUTINE f_xlat_adr; + PFUNCTION_TABLE_ACCESS_ROUTINE f_tabl_acs; + PGET_MODULE_BASE_ROUTINE f_modl_bas; } s32; struct { PREAD_PROCESS_MEMORY_ROUTINE64 f_read_mem; PTRANSLATE_ADDRESS_ROUTINE64 f_xlat_adr; + PFUNCTION_TABLE_ACCESS_ROUTINE64 f_tabl_acs; + PGET_MODULE_BASE_ROUTINE64 f_modl_bas; } s64; } u; }; @@ -122,17 +126,32 @@ static inline BOOL sw_read_mem(struct st static inline DWORD sw_xlat_addr(struct stack_walk_callback* cb, ADDRESS* addr) { - if (cb->is32) - return cb->u.s32.f_xlat_adr(cb->hProcess, cb->hThread, addr); - else if (cb->u.s64.f_xlat_adr) + if (addr->Mode == AddrModeFlat) return addr->Offset; + if (cb->is32) return cb->u.s32.f_xlat_adr(cb->hProcess, cb->hThread, addr); + if (cb->u.s64.f_xlat_adr) { ADDRESS64 addr64; addr_32to64(addr, &addr64); return cb->u.s64.f_xlat_adr(cb->hProcess, cb->hThread, &addr64); } + return addr_to_linear(cb->hProcess, cb->hThread, addr); +} + +static inline void* sw_tabl_acs(struct stack_walk_callback* cb, DWORD addr) +{ + if (cb->is32) + return cb->u.s32.f_tabl_acs(cb->hProcess, addr); else - return addr_to_linear(cb->hProcess, cb->hThread, addr); + return cb->u.s64.f_tabl_acs(cb->hProcess, addr); +} + +static inline DWORD sw_modl_bas(struct stack_walk_callback* cb, DWORD addr) +{ + if (cb->is32) + return cb->u.s32.f_modl_bas(cb->hProcess, addr); + else + return cb->u.s64.f_modl_bas(cb->hProcess, addr); } static BOOL stack_walk(struct stack_walk_callback* cb, LPSTACKFRAME frame) @@ -223,6 +242,7 @@ static BOOL stack_walk(struct stack_walk /* don't set up AddrStack on first call. Either the caller has set it up, or * we will get it in the next frame */ + memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); } else { @@ -414,16 +434,21 @@ static BOOL stack_walk(struct stack_walk frame->Params, sizeof(frame->Params)); } - frame->Far = FALSE; - frame->Virtual = FALSE; + frame->Far = TRUE; + frame->Virtual = TRUE; + p = sw_xlat_addr(cb, &frame->AddrPC); + if (p && sw_modl_bas(cb, p)) + frame->FuncTableEntry = sw_tabl_acs(cb, p); + else + frame->FuncTableEntry = NULL; - TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08lx nSwitch=%08lx\n", + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08lx nSwitch=%08lx FuncTable=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), - curr_switch, next_switch); + curr_switch, next_switch, frame->FuncTableEntry); return TRUE; done_err: @@ -460,6 +485,8 @@ BOOL WINAPI StackWalk(DWORD MachineType, /* sigh... MS isn't even consistent in the func prototypes */ swcb.u.s32.f_read_mem = (f_read_mem) ? f_read_mem : read_mem; swcb.u.s32.f_xlat_adr = (f_xlat_adr) ? f_xlat_adr : addr_to_linear; + swcb.u.s32.f_tabl_acs = (FunctionTableAccessRoutine) ? FunctionTableAccessRoutine : SymFunctionTableAccess; + swcb.u.s32.f_modl_bas = (GetModuleBaseRoutine) ? GetModuleBaseRoutine : SymGetModuleBase; return stack_walk(&swcb, frame); } @@ -479,7 +506,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp STACKFRAME frame32; BOOL ret; - TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p) - stub!\n", + TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p)\n", MachineType, hProcess, hThread, frame64, ctx, f_read_mem, FunctionTableAccessRoutine, GetModuleBaseRoutine, f_xlat_adr); @@ -509,6 +536,8 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp /* sigh... MS isn't even consistent in the func prototypes */ swcb.u.s64.f_read_mem = (f_read_mem) ? f_read_mem : read_mem64; swcb.u.s64.f_xlat_adr = f_xlat_adr; + swcb.u.s64.f_tabl_acs = (FunctionTableAccessRoutine) ? FunctionTableAccessRoutine : SymFunctionTableAccess64; + swcb.u.s64.f_modl_bas = (GetModuleBaseRoutine) ? GetModuleBaseRoutine : SymGetModuleBase64; ret = stack_walk(&swcb, &frame32); @@ -529,6 +558,15 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp frame64->Reserved[1] = (ULONG)frame32.Reserved[1]; frame64->Reserved[2] = (ULONG)frame32.Reserved[2]; /* we don't handle KdHelp */ + frame64->KdHelp.Thread = 0xC000FADE; + frame64->KdHelp.ThCallbackStack = 0x10; + frame64->KdHelp.ThCallbackBStore = 0; + frame64->KdHelp.NextCallback = 0; + frame64->KdHelp.FramePointer = 0; + frame64->KdHelp.KiCallUserMode = 0xD000DAFE; + frame64->KdHelp.KeUserCallbackDispatcher = 0xE000F000; + frame64->KdHelp.SystemRangeStart = 0xC0000000; + frame64->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; return ret; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8df2d5b..704c8e4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1253,9 +1253,17 @@ BOOL WINAPI SymGetLineNext64(HANDLE hPro */ PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) { - FIXME("(%p, 0x%08lx): stub\n", hProcess, AddrBase); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + WARN("(%p, 0x%08lx): stub\n", hProcess, AddrBase); + return NULL; +} + +/*********************************************************************** + * SymFunctionTableAccess64 (DBGHELP.@) + */ +PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) +{ + WARN("(%p, %s): stub\n", hProcess, wine_dbgstr_longlong(AddrBase)); + return NULL; } /*********************************************************************** diff --git a/include/dbghelp.h b/include/dbghelp.h index dd2aad8..c70ca15 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -691,6 +691,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE, BOOL WINAPI SymGetModuleInfo64(HANDLE, DWORD64, PIMAGEHLP_MODULE64); BOOL WINAPI SymGetModuleInfoW64(HANDLE, DWORD64, PIMAGEHLP_MODULEW64); DWORD WINAPI SymGetModuleBase(HANDLE, DWORD); +DWORD64 WINAPI SymGetModuleBase64(HANDLE, DWORD64); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PSTR, PSTR, DWORD, DWORD); DWORD64 WINAPI SymLoadModule64(HANDLE, HANDLE, PSTR, PSTR, DWORD64, DWORD); DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, @@ -973,6 +974,7 @@ BOOL WINAPI StackWalk64(DWORD, HANDLE, H PTRANSLATE_ADDRESS_ROUTINE64); PVOID WINAPI SymFunctionTableAccess(HANDLE, DWORD); +PVOID WINAPI SymFunctionTableAccess64(HANDLE, DWORD64); typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)(HANDLE, DWORD, PVOID); typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK64)(HANDLE, ULONG64, ULONG64);

1 0

Alexandre Julliard : Remove YY_NO defines that cause warnings.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 1e96455094bd381e50840183a03ecf58f50700f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e96455094bd381e5084018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 5 12:20:05 2006 +0100 Remove YY_NO defines that cause warnings. --- libs/wpp/ppl.l | 2 -- programs/winedbg/debug.l | 2 -- programs/winhelp/macro.lex.l | 1 - tools/widl/parser.l | 4 ---- tools/wrc/parser.l | 4 ---- 5 files changed, 0 insertions(+), 13 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 020f91f..073a6ac 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -172,8 +172,6 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][u #error Must use flex version 2.5.1 or higher (yy_scan_* routines are required). #endif -#define YY_USE_PROTOS -#define YY_NO_UNPUT #define YY_READ_BUF_SIZE 65536 /* So we read most of a file at once */ #define yy_current_state() YY_START diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index c5aa044..1c40642 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -70,8 +70,6 @@ static size_t last_line_idx = 0; if ((result = read_input("Wine-dbg>", buf, max_size)) < 0) \ YY_FATAL_ERROR("read_input in flex scanner failed"); -#define YY_NO_UNPUT - static int syntax_error; %} diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index b614821..7e83337 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -39,7 +39,6 @@ struct lexret yylval; #define YY_INPUT(buf,result,max_size)\ if ((result = *macroptr ? 1 : 0)) buf[0] = *macroptr++; -#define YY_NO_UNPUT %} %% diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4955bad..c053c12 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -53,10 +53,6 @@ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd #include "parser.tab.h" -#define YY_USE_PROTOS -#define YY_NO_UNPUT -#define YY_NO_TOP_STATE - extern char *temp_name; static void addcchar(char c); diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index cbdf9b6..aea3fb8 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -112,10 +112,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #include "parser.tab.h" -#define YY_USE_PROTOS -#define YY_NO_UNPUT -#define YY_NO_TOP_STATE - /* Always update the current character position within a line */ #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0;

1 0

Robert Shearman : rpcrt4: Implement NdrClientCall2 and NdrServerCall2.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: be77b876001a29432c62fcadd794f30a43bc9b3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be77b876001a29432c62fca… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 5 12:19:05 2006 +0100 rpcrt4: Implement NdrClientCall2 and NdrServerCall2. --- dlls/rpcrt4/cproxy.c | 2 dlls/rpcrt4/ndr_misc.h | 3 dlls/rpcrt4/ndr_stubless.c | 1490 ++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/rpcrt4.spec | 4 4 files changed, 1432 insertions(+), 67 deletions(-)

1 0

Eric Pouech : dbghelp: Removed no longer needed 'stub' in TRACEs.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 5d210af9dcfff39adb4fca05fb24fc9c8b8910c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d210af9dcfff39adb4fca0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jan 5 12:19:18 2006 +0100 dbghelp: Removed no longer needed 'stub' in TRACEs. --- dlls/dbghelp/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2e840e2..8df2d5b 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1263,7 +1263,7 @@ PVOID WINAPI SymFunctionTableAccess(HAND */ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength) { - TRACE("(%p %s %lu): stub\n", sym, UnDecName, UnDecNameLength); + TRACE("(%p %s %lu)\n", sym, UnDecName, UnDecNameLength); return UnDecorateSymbolName(sym->Name, UnDecName, UnDecNameLength, UNDNAME_COMPLETE) != 0; } @@ -1281,7 +1281,7 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR static char* (*p_undname)(char*, const char*, int, void* (*)(size_t), void (*)(void*), unsigned short); static WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - TRACE("(%s, %p, %ld, 0x%08lx): stub\n", + TRACE("(%s, %p, %ld, 0x%08lx)\n", debugstr_a(DecoratedName), UnDecoratedName, UndecoratedLength, Flags); if (!p_undname)

1 0

Robert Shearman : ole: Store the result from _invoke in a VARIANTARG structure.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 83ff8560c3ae9b8feabc00a7d2047566237e459a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83ff8560c3ae9b8feabc00a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 5 12:18:54 2006 +0100 ole: Store the result from _invoke in a VARIANTARG structure. --- dlls/oleaut32/typelib.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index af26fc8..9d7ba2a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5335,10 +5335,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - DWORD res; int numargs, numargs2, argspos, args2pos; DWORD *args , *args2; VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); + VARIANT varresult; + memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); hres = S_OK; @@ -5433,7 +5434,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (func_desc->cParamsOpt < 0) FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); - res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, &func_desc->elemdescFunc.tdesc, &V_VT(&varresult)); + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ + + V_ERROR(&varresult) = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], func_desc->callconv, numargs, args @@ -5479,11 +5484,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } } - if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) + if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult))) { - WARN("invoked function failed with error 0x%08lx\n", res); + WARN("invoked function failed with error 0x%08lx\n", V_ERROR(&varresult)); hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = res; + if (pExcepInfo) pExcepInfo->scode = V_ERROR(&varresult); } func_fail: @@ -5491,7 +5496,7 @@ func_fail: HeapFree(GetProcessHeap(),0,args2); HeapFree(GetProcessHeap(),0,args); break; - } + } case FUNC_DISPATCH: { IDispatch *disp;

1 0

Robert Shearman : kernel32: Check for the correct error return value from open.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 1191249fc96d60d07cc4ba74528c0fe2b383732e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1191249fc96d60d07cc4ba7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 5 12:18:29 2006 +0100 kernel32: Check for the correct error return value from open. --- dlls/kernel/oldconfig.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c index eb73f78..47e249f 100644 --- a/dlls/kernel/oldconfig.c +++ b/dlls/kernel/oldconfig.c @@ -161,12 +161,11 @@ static void create_scsi_entry( PSCSI_ADD int fd, dma; fd = open(lpUnixDeviceName, O_RDONLY|O_NONBLOCK); - if (fd) + if (fd != -1) { if (ioctl(fd, HDIO_GET_DMA, &dma) != -1) value = dma; close(fd); - }else - ERR("Can't open %s", buffer); + } #endif RtlCreateUnicodeStringFromAsciiz( &nameW, "DMAEnabled" ); NtSetValueKey( portKey,&nameW, 0, REG_DWORD, (BYTE *)&value, sizeof(DWORD));

1 0