Index: in_xsfcfg.cpp
===================================================================
--- in_xsfcfg.cpp	(revision 4283)
+++ in_xsfcfg.cpp	(working copy)
@@ -572,6 +572,16 @@
 	case WM_COMMAND:
 		switch (GET_WM_COMMAND_ID(wParam, lParam))
 		{
+		case IDOK:
+			CFGUpdate(pcfg, hwndDlg);
+			CFGSave(pcfg);
+			::EndDialog(hwndDlg, IDOK);
+			break;
+
+		case IDCANCEL:
+			::EndDialog(hwndDlg, IDCANCEL);
+			break;
+
 		case IDC_BUTTON_VIEWSPU:
 			if(soundViewCallbacks.doOpenSoundView) soundViewCallbacks.doOpenSoundView(hDLL);
 			break;
@@ -622,6 +632,9 @@
 		break;
 	case WM_INITDIALOG:
 		initialized = false;
+		::SetWindowTextA(hwndDlg, WINAMPPLUGIN_NAME);
+		::ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+		::ShowWindow(GetDlgItem(hwndDlg, IDCANCEL), SW_SHOWNA);
 		CFGLoad(pcfg);
 		CFGReset(pcfg, hwndDlg);
 		initialized = true;
@@ -703,10 +716,12 @@

 	::CopyMemory(lpResource, hGlobal, dwSize);

-	lpResource[0] = '\xc0';
-	lpResource[1] = '\x08';
-	lpResource[2] = '\xc8';
-	lpResource[3] = '\x80';
-
-	xsfc::TWin32::DlgInvoke(::GetModuleHandleA(NULL), lpResource, NULL, DialogProc, NULL);
+  // handle DLGTEMPLATEEX
+  int idx = ((lpResource[2] == 0xff) && (lpResource[3] == 0xff))? 12 : 0;
+	lpResource[idx] = '\xc0';
+	lpResource[idx+1] = '\x08';
+	lpResource[idx+2] = '\xc8';
+	lpResource[idx+3] = '\x80';
+
+	xsfc::TWin32::DlgInvoke(::GetModuleHandleA(NULL), lpResource, NULL, DialogProcPref, NULL);
 }
\ No newline at end of file