wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Paul Chitescu : gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 329fc386e0b65ea6e70fcbb80bc43b0085a4edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329fc386e0b65ea6e70fcbb80… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:31 2009 +0200 gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/gpkcsp/gpkcsp.spec | 4 ++-- dlls/gpkcsp/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index 1f828b0..af3cdee 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -22,5 +22,5 @@ @ stub CPSignHash @ stub CPVerifySignature @ stdcall DllMain(ptr long ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c index b6d9f17..79f1e2d 100644 --- a/dlls/gpkcsp/main.c +++ b/dlls/gpkcsp/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Paul Chitescu : slbcsp: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 6d3b409c5aecf512d09fa6a527239b884b46687d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3b409c5aecf512d09fa6a52… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:52 2009 +0200 slbcsp: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/slbcsp/main.c | 18 ++++++++++++++++++ dlls/slbcsp/slbcsp.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/slbcsp/main.c b/dlls/slbcsp/main.c index 594f811..a6aece1 100644 --- a/dlls/slbcsp/main.c +++ b/dlls/slbcsp/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/slbcsp/slbcsp.spec b/dlls/slbcsp/slbcsp.spec index d3462fa..7ce1733 100644 --- a/dlls/slbcsp/slbcsp.spec +++ b/dlls/slbcsp/slbcsp.spec @@ -23,5 +23,5 @@ @ stub CPReleaseContext @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Paul Chitescu : initpki: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: a921e0743a79dc9bb93c25ab177ab2e7f75f3b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921e0743a79dc9bb93c25ab1… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:34 2009 +0200 initpki: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/initpki/initpki.spec | 4 ++-- dlls/initpki/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/initpki/initpki.spec b/dlls/initpki/initpki.spec index 51d80bc..e9db624 100644 --- a/dlls/initpki/initpki.spec +++ b/dlls/initpki/initpki.spec @@ -1,4 +1,4 @@ @ stub DllInstall -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub InitializePKI diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c index d936dd8..caa0036 100644 --- a/dlls/initpki/main.c +++ b/dlls/initpki/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (INITPKI.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (INITPKI.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Paul Chitescu : dssenh: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 0b76859f06b8a5740c092d3774361ea359c4036c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b76859f06b8a5740c092d377… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:27 2009 +0200 dssenh: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/dssenh/dssenh.spec | 4 ++-- dlls/dssenh/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 037be06..c5c2545 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -23,5 +23,5 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 9578d1b..4c55ff8 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (DSSENH.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (DSSENH.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Paul Chitescu : mssip32: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: e5e6547ddcbbff0c48ab935d9867c9fb0260a550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e6547ddcbbff0c48ab935d9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:36 2009 +0200 mssip32: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/mssip32/main.c | 18 ++++++++++++++++++ dlls/mssip32/mssip32.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mssip32/main.c b/dlls/mssip32/main.c index 91ec17f..7d13701 100644 --- a/dlls/mssip32/main.c +++ b/dlls/mssip32/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (MSSIP32.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (MSSIP32.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/mssip32/mssip32.spec b/dlls/mssip32/mssip32.spec index 0c09bfb..b7fd869 100644 --- a/dlls/mssip32/mssip32.spec +++ b/dlls/mssip32/mssip32.spec @@ -5,5 +5,5 @@ @ stub CryptSIPPutSignedDataMsg @ stub CryptSIPRemoveSignedDataMsg @ stub CryptSIPVerifyIndirectData -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Paul Chitescu : sccbase: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: b24fb8bfcfa0c14f0759bcbb08c9c4b246937a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24fb8bfcfa0c14f0759bcbb0… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:51 2009 +0200 sccbase: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/sccbase/main.c | 18 ++++++++++++++++++ dlls/sccbase/sccbase.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/sccbase/main.c b/dlls/sccbase/main.c index 37abe5f..7a012f5 100644 --- a/dlls/sccbase/main.c +++ b/dlls/sccbase/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/sccbase/sccbase.spec b/dlls/sccbase/sccbase.spec index c63d06b..ffc2111 100644 --- a/dlls/sccbase/sccbase.spec +++ b/dlls/sccbase/sccbase.spec @@ -22,5 +22,5 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Mikey Alexander : shell32/tests: Add Program Manager DDE conformance tests.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 91bf659dd6fd958cd70fa16dd9c51b155b1e47c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bf659dd6fd958cd70fa16dd… Author: Mikey Alexander <firesword14(a)yahoo.com> Date: Mon Nov 2 19:23:16 2009 -0800 shell32/tests: Add Program Manager DDE conformance tests. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/progman_dde.c | 566 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 567 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91bf659dd6fd958cd70fa…

1 0

Ilya Shpigor : user32: Fix switching focus to parent after child hiding.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: e6f040407647a3047ca4d1fa3afa137271c658cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f040407647a3047ca4d1fa3… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Wed Nov 4 15:49:11 2009 +0300 user32: Fix switching focus to parent after child hiding. --- dlls/user32/tests/win.c | 11 ++++++++++- dlls/user32/winpos.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0bd6fbf..24e6ac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2298,7 +2298,7 @@ static LRESULT WINAPI set_focus_on_activate_proc(HWND hwnd, UINT msg, WPARAM wp, static void test_SetFocus(HWND hwnd) { - HWND child; + HWND child, child2; WNDPROC old_wnd_proc; /* check if we can set focus to non-visible windows */ @@ -2325,6 +2325,14 @@ static void test_SetFocus(HWND hwnd) ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); ok( GetFocus() == hwnd, "Focus should be on parent %p, not %p\n", hwnd, GetFocus() ); ShowWindow(child, SW_SHOW); + child2 = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 0, 0, child, 0, 0, NULL); + assert(child2); + ShowWindow(child2, SW_SHOW); + SetFocus(child2); + ShowWindow(child, SW_HIDE); + ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); + ok( GetFocus() == child2, "Focus should be on %p, not %p\n", child2, GetFocus() ); + ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); SetWindowPos(child,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_HIDEWINDOW); @@ -2368,6 +2376,7 @@ todo_wine SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); + DestroyWindow( child2 ); DestroyWindow( child ); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c62fdaa..915cb59 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1056,7 +1056,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* Revert focus to parent */ hFocus = GetFocus(); - if (hwnd == hFocus || IsChild(hwnd, hFocus)) + if (hwnd == hFocus) { HWND parent = GetAncestor(hwnd, GA_PARENT); if (parent == GetDesktopWindow()) parent = 0;

1 0

Damjan Jovanovic : wiaservc: Add self registration.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 3ec06f8082bcb987dff588a6e9758c140721886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec06f8082bcb987dff588a6e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 4 20:51:19 2009 +0200 wiaservc: Add self registration. --- dlls/wiaservc/Makefile.in | 2 + dlls/wiaservc/rsrc.rc | 20 +++++++ dlls/wiaservc/wiaservc.inf | 28 +++++++++ dlls/wiaservc/wiaservc.spec | 4 +- dlls/wiaservc/wiaservc_main.c | 117 ++++++++++++++++++++++++++++++++++++++ dlls/wiaservc/wiaservc_private.h | 9 +++ tools/wine.inf.in | 1 + 7 files changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 67db949..f73e8dd 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -11,6 +11,8 @@ C_SRCS = \ wiadevmgr.c \ wiaservc_main.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wiaservc/rsrc.rc b/dlls/wiaservc/rsrc.rc new file mode 100644 index 0000000..d54734b --- /dev/null +++ b/dlls/wiaservc/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wiaservc.inf */ +REGINST REGINST wiaservc.inf diff --git a/dlls/wiaservc/wiaservc.inf b/dlls/wiaservc/wiaservc.inf new file mode 100644 index 0000000..c181a60 --- /dev/null +++ b/dlls/wiaservc/wiaservc.inf @@ -0,0 +1,28 @@ +[version] +Signature="$CHICAGO$" + +[RegisterDll] +AddReg = WiaServc.Reg + +[UnregisterDll] +DelReg = WiaServc.Reg + +[WiaServc.Reg] +HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" +HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc" + +HKCR,"CLSID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" +HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%" +HKCR,"CLSID\%CLSID_WiaDevMgr%\ProgID",,,"WiaDevMgr.1" +HKCR,"CLSID\%CLSID_WiaDevMgr%\VersionIndependentProgID",,,"WiaDevMgr" + +HKCR,"WiaDevMgr.1",,,"WIA Device Manager" +HKCR,"WiaDevMgr.1\CLSID",,,"%CLSID_WiaDevMgr%" + +HKCR,"WiaDevMgr",,,"WIA Device Manager" +HKCR,"WiaDevMgr\CLSID",,,"%CLSID_WiaDevMgr%" +HKCR,"WiaDevMgr\CurVer",,,"WiaDevMgr.1" + +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","imgsvc",0x00010000,"StiSvc" + +HKLM,"System\CurrentControlSet\Services\stisvc\Parameters","ServiceDll",0x00020000,"wiaservc.dll" diff --git a/dlls/wiaservc/wiaservc.spec b/dlls/wiaservc/wiaservc.spec index afd2426..510e3e9 100644 --- a/dlls/wiaservc/wiaservc.spec +++ b/dlls/wiaservc/wiaservc.spec @@ -1,6 +1,6 @@ @ stdcall -private ServiceMain(long ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub wiasCreateChildAppItem @ stub wiasCreateDrvItem @ stub wiasCreateLogInstance diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index 2d30f9d..ce979a2 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #include "objbase.h" #include "winuser.h" #include "winreg.h" @@ -28,6 +30,8 @@ #include "wia_lh.h" #include "initguid.h" +#include "wiaservc_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wia); @@ -54,3 +58,116 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +static HRESULT init_register_strtable(STRTABLEA *strtable) +{ +#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } + static const struct { + const char *name; + const CLSID *clsid; + } expns[] = { + CLSID_EXPANSION_ENTRY(WiaDevMgr) + }; +#undef CLSID_EXPANSION_ENTRY + static STRENTRYA pse[sizeof expns / sizeof expns[0]]; + DWORD i; + + strtable->cEntries = sizeof pse / sizeof pse[0]; + strtable->pse = pse; + for (i = 0; i < strtable->cEntries; i++) { + static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; + const CLSID *clsid = expns[i].clsid; + pse[i].pszName = wiaservc_strdup(expns[i].name); + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); + if (!pse[i].pszName || !pse[i].pszValue) + return E_OUTOFMEMORY; + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], + clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); + } + + return S_OK; +} + +static void cleanup_register_strtable(STRTABLEA *strtable) +{ + DWORD i; + for (i = 0; i < strtable->cEntries; i++) { + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); + if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) + return; + } +} + +static HRESULT register_service(BOOL do_register) +{ + static const WCHAR name[] = { 's','t','i','s','v','c', 0 }; + static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', + ' ','-','k',' ','i','m','g','s','v','c', 0 }; + SC_HANDLE scm, service; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!scm) + return SELFREG_E_CLASS; + + if (do_register) + service = CreateServiceW(scm, name, name, SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + path, NULL, NULL, NULL, NULL, NULL); + else + service = OpenServiceW(scm, name, DELETE); + + + CloseServiceHandle(scm); + if (service) + { + if (!do_register) DeleteService(service); + CloseServiceHandle(service); + } + return S_OK; +} + +/* Use an INF file to register or unregister the DLL */ +static HRESULT register_server(BOOL do_register) +{ + HRESULT hr; + STRTABLEA strtable; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + TRACE("(%x)\n", do_register); + + hr = register_service(do_register); + if (FAILED(hr)) { + ERR("register_service failed: %d\n", GetLastError()); + return hr; + } + + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + + hr = init_register_strtable(&strtable); + if (SUCCEEDED(hr)) + hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", + &strtable); + cleanup_register_strtable(&strtable); + + if (FAILED(hr)) + ERR("RegInstall failed: %08x\n", hr); + + return hr; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return register_server(TRUE); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return register_server(FALSE); +} diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index d822958..1032819 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -36,4 +36,13 @@ typedef struct HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj); +/* Little helper functions */ +static inline char * +wiaservc_strdup(const char *s) +{ + size_t n = strlen(s) + 1; + char *d = HeapAlloc(GetProcessHeap(), 0, n); + return d ? memcpy(d, s, n) : NULL; +} + #endif /* __WIASERVC_PRIVATE__ */ diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ac8742b..1550919 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2425,6 +2425,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,sti.dll,1 11,,urlmon.dll,1 11,,wbemprox.dll,1 +11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,wintrust.dll,1 11,,wmiutils.dll,1

1 0

Paul Vriens : advapi32/tests: Fix a test failure on Vista+.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 6a5f67167871ce0f72f7471d4aaf993b8599abee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5f67167871ce0f72f7471d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 5 11:33:43 2009 +0100 advapi32/tests: Fix a test failure on Vista+. --- dlls/advapi32/tests/eventlog.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3c932ea..702fc43 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -44,6 +44,9 @@ static void create_backup(const char *filename) handle = OpenEventLogA(NULL, "Application"); BackupEventLogA(handle, filename); CloseEventLog(handle); + + todo_wine + ok(GetFileAttributesA(filename) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); } static void test_open_close(void) @@ -561,6 +564,7 @@ static void test_clear(void) HANDLE handle; BOOL ret; const char backup[] = "backup.evt"; + const char backup2[] = "backup2.evt"; SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, NULL); @@ -583,16 +587,28 @@ static void test_clear(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, backup); ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + /* The eventlog service runs under an account that doesn't have the necessary + * permissions on the users home directory on a default Vista+ system. + */ + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_ACCESS_DENIED, /* Vista+ */ + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* Show that ClearEventLog only works for real eventlogs. */ SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, backup2); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetFileAttributesA(backup2) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); + + SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); CloseEventLog(handle); - DeleteFileA(backup); + todo_wine + ok(DeleteFileA(backup), "Could not delete the backup file\n"); } START_TEST(eventlog)

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
91
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 2009