Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 11:38:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Set parent window for the wizard

Browse source 
- Call DisableThreadLibraryCalls for DLL_PROCESS_ATTACH case

svn path=/trunk/; revision=38626
This commit is contained in:
Dmitry Chapyshev 2009-01-07 10:58:29 +00:00
parent eff0bbf89b
commit bcb9050940
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/dll/cpl/hdwwiz/hdwwiz.c
View file

@ -45,11 +45,7 @@ HFONT hTitleFont;
typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD);
BOOL CALLBACK /* STATIC FUNCTIONS *********************************************************/
InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot)
{
return FALSE;
}
static HFONT static HFONT
CreateTitleFont(VOID) CreateTitleFont(VOID)
@ -224,7 +220,7 @@ HardwareWizardInit(HWND hwnd)
psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwSize = sizeof(PROPSHEETHEADER);
psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER;
psh.hInstance = hApplet; psh.hInstance = hApplet;
psh.hwndParent = NULL; psh.hwndParent = hwnd;
psh.nPages = nPages; psh.nPages = nPages;
psh.nStartPage = 0; psh.nStartPage = 0;
psh.phpage = ahpsp; psh.phpage = ahpsp;
@ -240,7 +236,15 @@ HardwareWizardInit(HWND hwnd)
DeleteObject(hTitleFont); DeleteObject(hTitleFont);
} }
VOID CALLBACK /* FUNCTIONS ****************************************************************/
BOOL WINAPI
InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot)
{
return FALSE;
}
VOID WINAPI
AddHardwareWizard(HWND hwnd, LPWSTR lpName) AddHardwareWizard(HWND hwnd, LPWSTR lpName)
{ {
if (lpName != NULL) if (lpName != NULL)
@ -254,10 +258,7 @@ AddHardwareWizard(HWND hwnd, LPWSTR lpName)
/* Control Panel Callback */ /* Control Panel Callback */
LONG CALLBACK LONG CALLBACK
CPlApplet(HWND hwndCpl, CPlApplet(HWND hwndCpl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
UINT uMsg,
LPARAM lParam1,
LPARAM lParam2)
{ {
switch (uMsg) switch (uMsg)
{ {
@ -285,7 +286,6 @@ CPlApplet(HWND hwndCpl,
return FALSE; return FALSE;
} }
BOOL WINAPI BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
@ -295,6 +295,7 @@ DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
hApplet = hinstDLL; hApplet = hinstDLL;
DisableThreadLibraryCalls(hinstDLL);
break; break;
} }