March 2008 - Wine-commits - list.winehq.org

Andrew Talbot : dinput: Assign to struct instead of using CopyMemory.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 05ea03c00b694b4684ba4137a203913df5cb6a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ea03c00b694b4684ba4137a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Mar 28 22:52:23 2008 +0000 dinput: Assign to struct instead of using CopyMemory. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index f375978..a43f842 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -423,7 +423,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->base.lpVtbl = jvt; newDevice->base.ref = 1; newDevice->base.dinput = dinput; - CopyMemory(&newDevice->base.guid, rguid, sizeof(*rguid)); + newDevice->base.guid = *rguid; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit");

1 0

Jacek Caban : mshtml: Added IActiveScriptSiteInterruptPoll stub implementation.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 05935eb6b80fa6fc01acaf2f9857026726d9a82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05935eb6b80fa6fc01acaf2f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 18:01:37 2008 +0000 mshtml: Added IActiveScriptSiteInterruptPoll stub implementation. --- dlls/mshtml/script.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4dc1b06..f0d9ae3 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -41,7 +41,8 @@ static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; typedef struct { - const IActiveScriptSiteVtbl *lpActiveScriptSiteVtbl; + const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; + const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; LONG ref; @@ -56,7 +57,8 @@ typedef struct { struct list entry; } ScriptHost; -#define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpActiveScriptSiteVtbl) +#define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) +#define ACTSCPPOLL(x) ((IActiveScriptSiteInterruptPoll*) &(x)->lpIActiveScriptSiteInterruptPollVtbl) static BOOL init_script_engine(ScriptHost *script_host) { @@ -181,7 +183,7 @@ void connect_scripts(HTMLDocument *doc) } } -#define ACTSCPSITE_THIS(iface) DEFINE_THIS(ScriptHost, ActiveScriptSite, iface) +#define ACTSCPSITE_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSite, iface) static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -195,6 +197,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = ACTSCPSITE(This); + }else if(IsEqualGUID(&IID_IActiveScriptSiteInterruptPoll, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteInterruprtPoll %p)\n", This, ppv); + *ppv = ACTSCPPOLL(This); }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -308,13 +313,51 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +#define ACTSCPPOLL_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteInterruptPoll, iface) + +static HRESULT WINAPI ActiveScriptSiteInterruptPoll_QueryInterface(IActiveScriptSiteInterruptPoll *iface, + REFIID riid, void **ppv) +{ + ScriptHost *This = ACTSCPPOLL_THIS(iface); + return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteInterruptPoll_AddRef(IActiveScriptSiteInterruptPoll *iface) +{ + ScriptHost *This = ACTSCPPOLL_THIS(iface); + return IActiveScriptSite_AddRef(ACTSCPSITE(This)); +} + +static ULONG WINAPI ActiveScriptSiteInterruptPoll_Release(IActiveScriptSiteInterruptPoll *iface) +{ + ScriptHost *This = ACTSCPPOLL_THIS(iface); + return IActiveScriptSite_Release(ACTSCPSITE(This)); +} + +static HRESULT WINAPI ActiveScriptSiteInterruptPoll_QueryContinue(IActiveScriptSiteInterruptPoll *iface) +{ + ScriptHost *This = ACTSCPPOLL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef ACTSCPPOLL_THIS + +static const IActiveScriptSiteInterruptPollVtbl ActiveScriptSiteInterruptPollVtbl = { + ActiveScriptSiteInterruptPoll_QueryInterface, + ActiveScriptSiteInterruptPoll_AddRef, + ActiveScriptSiteInterruptPoll_Release, + ActiveScriptSiteInterruptPoll_QueryContinue +}; + static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) { ScriptHost *ret; HRESULT hres; ret = heap_alloc_zero(sizeof(*ret)); - ret->lpActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; + ret->lpIActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; + ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->ref = 1; ret->doc = doc;

1 0

Jacek Caban : mshtml: Set script engine state to SCRIPTSTATE_CONNECTED when page is loaded.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: ac6cbb79afa01c85331c3317301e53285123814c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6cbb79afa01c85331c33173… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 18:01:15 2008 +0000 mshtml: Set script engine state to SCRIPTSTATE_CONNECTED when page is loaded. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 1 + dlls/mshtml/script.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6d44f32..350ffbf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -450,6 +450,7 @@ HTMLDOMNode *get_node(HTMLDocument*,nsIDOMNode*); void release_nodes(HTMLDocument*); void release_script_hosts(HTMLDocument*); +void connect_scripts(HTMLDocument*); void doc_insert_script(HTMLDocument*,nsIDOMHTMLScriptElement*); IHTMLElementCollection *create_all_collection(HTMLDOMNode*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 2fb5ab0..eda1b54 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -136,6 +136,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(!This->doc) return NS_OK; + connect_scripts(This->doc); setup_nswindow(This->doc->window); if(This->editor_controller) { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3388ca1..4dc1b06 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -171,6 +171,16 @@ static void release_script_engine(ScriptHost *This) This->script_state = SCRIPTSTATE_UNINITIALIZED; } +void connect_scripts(HTMLDocument *doc) +{ + ScriptHost *iter; + + LIST_FOR_EACH_ENTRY(iter, &doc->script_hosts, ScriptHost, entry) { + if(iter->script_state == SCRIPTSTATE_STARTED) + IActiveScript_SetScriptState(iter->script, SCRIPTSTATE_CONNECTED); + } +} + #define ACTSCPSITE_THIS(iface) DEFINE_THIS(ScriptHost, ActiveScriptSite, iface) static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv)

1 0

Jacek Caban : mshtml: Added script engine initialization implementation.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 0db1b86c175c5055965986049b59914ebf1e03c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db1b86c175c5055965986049… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 18:00:59 2008 +0000 mshtml: Added script engine initialization implementation. --- dlls/mshtml/script.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index aa7cb08..3388ca1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "activscp.h" +#include "objsafe.h" #include "wine/debug.h" @@ -34,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR windowW[] = {'w','i','n','d','o','w',0}; + static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; @@ -43,6 +46,7 @@ typedef struct { LONG ref; IActiveScript *script; + IActiveScriptParse *parse; SCRIPTSTATE script_state; @@ -54,6 +58,119 @@ typedef struct { #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpActiveScriptSiteVtbl) +static BOOL init_script_engine(ScriptHost *script_host) +{ + IActiveScriptProperty *property; + IObjectSafety *safety; + SCRIPTSTATE state; + DWORD supported_opts=0, enabled_opts=0; + HRESULT hres; + + hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); + if(FAILED(hres)) { + WARN("Could not get IActiveScriptHost: %08x\n", hres); + return FALSE; + } + + hres = IActiveScript_QueryInterface(script_host->script, &IID_IObjectSafety, (void**)&safety); + if(FAILED(hres)) { + FIXME("Could not get IObjectSafety: %08x\n", hres); + return FALSE; + } + + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported_opts, &enabled_opts); + if(FAILED(hres)) { + FIXME("GetInterfaceSafetyOptions failed: %08x\n", hres); + }else if(!(supported_opts & INTERFACE_USES_DISPEX)) { + FIXME("INTERFACE_USES_DISPEX is not supported\n"); + }else { + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + if(FAILED(hres)) + FIXME("SetInterfaceSafetyOptions failed: %08x\n", hres); + } + + IObjectSafety_Release(safety); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptProperty, (void**)&property); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = VARIANT_TRUE; + hres = IActiveScriptProperty_SetProperty(property, SCRIPTPROP_HACK_TRIDENTEVENTSINK, NULL, &var); + if(FAILED(hres)) + WARN("SetProperty failed: %08x\n", hres); + + IActiveScriptProperty_Release(property); + }else { + WARN("Could not get IActiveScriptProperty: %08x\n", hres); + } + + hres = IActiveScriptParse_InitNew(script_host->parse); + if(FAILED(hres)) { + WARN("InitNew failed: %08x\n", hres); + return FALSE; + } + + hres = IActiveScript_SetScriptSite(script_host->script, ACTSCPSITE(script_host)); + if(FAILED(hres)) { + WARN("SetScriptSite failed: %08x\n", hres); + IActiveScript_Close(script_host->script); + return FALSE; + } + + hres = IActiveScript_GetScriptState(script_host->script, &state); + if(FAILED(hres)) + WARN("GetScriptState failed: %08x\n", hres); + else if(state != SCRIPTSTATE_INITIALIZED) + FIXME("state = %x\n", state); + + hres = IActiveScript_SetScriptState(script_host->script, SCRIPTSTATE_STARTED); + if(FAILED(hres)) { + WARN("Starting script failed: %08x\n", hres); + return FALSE; + } + + hres = IActiveScript_AddNamedItem(script_host->script, windowW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + if(FAILED(hres)) + WARN("AddNamedItem failed: %08x\n", hres); + + /* FIXME: QI for IActiveScriptParseProcedure2 and IActiveScriptParseProcedure */ + + return TRUE; +} + +static void release_script_engine(ScriptHost *This) +{ + if(!This->script) + return; + + switch(This->script_state) { + case SCRIPTSTATE_CONNECTED: + IActiveScript_SetScriptState(This->script, SCRIPTSTATE_DISCONNECTED); + + case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_DISCONNECTED: + case SCRIPTSTATE_INITIALIZED: + IActiveScript_Close(This->script); + + default: + if(This->parse) { + IActiveScriptParse_Release(This->parse); + This->parse = NULL; + } + } + + IActiveScript_Release(This->script); + This->script = NULL; + This->script_state = SCRIPTSTATE_UNINITIALIZED; +} + #define ACTSCPSITE_THIS(iface) DEFINE_THIS(ScriptHost, ActiveScriptSite, iface) static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) @@ -95,6 +212,7 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_script_engine(This); if(This->doc) list_remove(&This->entry); heap_free(This); @@ -195,8 +313,10 @@ static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) hres = CoCreateInstance(&ret->guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&ret->script); - if(FAILED(hres)) + if(FAILED(hres)) WARN("Could not load script engine: %08x\n", hres); + else if(!init_script_engine(ret)) + release_script_engine(ret); return ret; } @@ -313,6 +433,7 @@ void release_script_hosts(HTMLDocument *doc) while(!list_empty(&doc->script_hosts)) { iter = LIST_ENTRY(list_head(&doc->script_hosts), ScriptHost, entry); + release_script_engine(iter); list_remove(&iter->entry); iter->doc = NULL; IActiveScript_Release(ACTSCPSITE(iter));

1 0

Jacek Caban : mshtml: Added IActiveScriptSite::OnStateChange implementation .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 5d905ddd41a9fe2b2c87b93f16c5281e047a2a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d905ddd41a9fe2b2c87b93f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 18:00:34 2008 +0000 mshtml: Added IActiveScriptSite::OnStateChange implementation. --- dlls/mshtml/script.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 40509f3..aa7cb08 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -43,6 +43,9 @@ typedef struct { LONG ref; IActiveScript *script; + + SCRIPTSTATE script_state; + HTMLDocument *doc; GUID guid; @@ -133,8 +136,11 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *ifac static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, SCRIPTSTATE ssScriptState) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->(%x)\n", This, ssScriptState); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, ssScriptState); + + This->script_state = ssScriptState; + return S_OK; } static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror)

1 0

Jacek Caban : uuid: Include objsafe.h.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 6d5bf9cd8ac7d5ca60ab52a9bb8ff1e26d84c876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5bf9cd8ac7d5ca60ab52a9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 20:48:11 2008 +0000 uuid: Include objsafe.h. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 32f953b..4608d72 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -71,6 +71,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "hlguids.h" #include "dimm.h" #include "isguids.h" +#include "objsafe.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Rob Shearman : notepad: Remove the License and NO WARRANTY options from the Help-> Information popup menu as the same information can now be viewed from the About dialog .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 90efadc5408f5f5304792b98f7770f9fa8c89a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90efadc5408f5f5304792b98f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:53:31 2008 +0000 notepad: Remove the License and NO WARRANTY options from the Help->Information popup menu as the same information can now be viewed from the About dialog. Remove the Help->Information popup menu and rename the "About Wine" option to "About Notepad". --- programs/notepad/Bg.rc | 6 +----- programs/notepad/Cs.rc | 6 +----- programs/notepad/Da.rc | 6 +----- programs/notepad/De.rc | 33 +-------------------------------- programs/notepad/En.rc | 30 +----------------------------- programs/notepad/Eo.rc | 6 +----- programs/notepad/Es.rc | 6 +----- programs/notepad/Fi.rc | 6 +----- programs/notepad/Fr.rc | 33 +-------------------------------- programs/notepad/Hu.rc | 6 +----- programs/notepad/It.rc | 6 +----- programs/notepad/Ja.rc | 6 +----- programs/notepad/Ko.rc | 30 +----------------------------- programs/notepad/Nl.rc | 28 +--------------------------- programs/notepad/No.rc | 30 +----------------------------- programs/notepad/Pl.rc | 31 +------------------------------ programs/notepad/Pt.rc | 12 ++---------- programs/notepad/Ru.rc | 6 +----- programs/notepad/Si.rc | 6 +----- programs/notepad/Sk.rc | 6 +----- programs/notepad/Sv.rc | 6 +----- programs/notepad/Th.rc | 6 +----- programs/notepad/Tr.rc | 30 +----------------------------- programs/notepad/Wa.rc | 6 +----- programs/notepad/Zh.rc | 6 +----- programs/notepad/dialog.c | 18 +----------------- programs/notepad/dialog.h | 4 +--- programs/notepad/main.c | 4 +--- programs/notepad/notepad_res.h | 9 +-------- 29 files changed, 30 insertions(+), 358 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90efadc5408f5f5304792…

1 0

Rob Shearman : rpcrt4: Print an error if an invalid client context handle is used.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: c06f26f2e3f814003d4ad22df1e0e31945edcbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06f26f2e3f814003d4ad22df… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:52:33 2008 +0000 rpcrt4: Print an error if an invalid client context handle is used. --- dlls/rpcrt4/ndr_contexthandle.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 054bba3..15192a7 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -89,7 +89,10 @@ RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) LeaveCriticalSection(&ndr_context_cs); if (!handle) + { + ERR("invalid handle %p\n", CContext); RpcRaiseException(ERROR_INVALID_HANDLE); + } return handle; }

1 0

Rob Shearman : winedevice: Handle failure of RegisterServiceCtrlHandlerExW.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: ee811d89a8ffb77d8d9f95f1ca5229eb3db7aa34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee811d89a8ffb77d8d9f95f1c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:52:24 2008 +0000 winedevice: Handle failure of RegisterServiceCtrlHandlerExW. --- programs/winedevice/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index f40d5d8..5e9c322 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -192,6 +192,8 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, NULL ); + if (!service_handle) + return; status.dwServiceType = SERVICE_WIN32; status.dwCurrentState = SERVICE_START_PENDING;

1 0

Paul Vriens : setupapi: Fix some last errors for SetupGetLineByIndex.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: a3557272f4a3f58a579ae51aa267a9148eae0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3557272f4a3f58a579ae51aa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 16:41:20 2008 +0100 setupapi: Fix some last errors for SetupGetLineByIndex. --- dlls/setupapi/parser.c | 3 +-- dlls/setupapi/tests/parser.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index d266cf8..f6de4ed 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1311,11 +1311,9 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON struct inf_file *file = hinf; int section_index; - SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; - SetLastError( ERROR_LINE_NOT_FOUND ); if (index < file->sections[section_index]->nb_lines) { context->Inf = hinf; @@ -1330,6 +1328,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON index -= file->sections[section_index]->nb_lines; } TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 1c74bd3..d49c37f 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -571,7 +571,6 @@ static void test_GLE(void) SetLastError(0xdeadbeef); retb = SetupGetLineByIndexA( hinf, "ImNotThere", 1, &context ); ok(!retb, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_LINE_NOT_FOUND, "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError());

1 0