- Better Win32 stuff organization.

- Added NSIS special directory.
- Added icon file to this directory.

5 files changed, 3 insertions, 486 deletions

diff --git a/Makefile.am b/Makefile.am
index 0e72b2dc..ff1b226d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 dll:
-	-/usr/bin/windres -i lasso/lasso.rc -o lasso/lasso.rc.o
-	-/usr/bin/dllwrap.exe --target=i386-mingw32 --def lasso/lasso.def -o lasso/.libs/liblasso.dll -mno-cygwin --add-stdcall-alias -mwindows -s lasso/lasso.o lasso/lasso.rc.o lasso/xml/.libs/liblasso-xml.al lasso/protocols/.libs/liblasso-protocols.al lasso/environs/.libs/liblasso-environs.al -L/usr/local/lib /usr/local/lib/libglib-2.0-0.dll /usr/local/lib/libxmlsec-openssl.dll /usr/local/lib/libxmlsec.dll -lssl -lcrypto /usr/local/lib/libxslt.dll /usr/local/lib/libxml2.dll -lpthread -lz -lm /usr/local/lib/libgobject-2.0-0.dll
+	-/usr/bin/windres -i win32/lasso.rc -o win32/lasso.rc.o
+	-/usr/bin/dllwrap.exe --target=i386-mingw32 --def win32/lasso.def -o lasso/.libs/liblasso.dll -mno-cygwin --add-stdcall-alias -mwindows -s lasso/lasso.o win32/lasso.rc.o lasso/xml/.libs/liblasso-xml.al lasso/protocols/.libs/liblasso-protocols.al lasso/environs/.libs/liblasso-environs.al -L/usr/local/lib /usr/local/lib/libglib-2.0-0.dll /usr/local/lib/libxmlsec-openssl.dll /usr/local/lib/libxmlsec.dll -lssl -lcrypto /usr/local/lib/libxslt.dll /usr/local/lib/libxml2.dll -lpthread -lz -lm /usr/local/lib/libgobject-2.0-0.dll
 install-dll:        
 	-cp -f lasso/.libs/liblasso.dll /usr/local/lib
 	-cp -f lasso/.libs/liblasso.a /usr/local/lib/liblasso.dll.a
diff --git a/lasso/lasso.def b/lasso/lasso.def
deleted file mode 100644
index 022243eb..00000000
--- a/lasso/lasso.def
+++ /dev/null
@@ -1,483 +0,0 @@
-LIBRARY lasso
-
-DESCRIPTION "Free implementation of the Liberty Alliance specifications."
-
-EXPORTS
-; Functions exports
-    lasso_artifact_get_assertionHandle
-    lasso_artifact_get_byteCode
-    lasso_artifact_get_identityProviderSuccinctID
-    lasso_artifact_get_relayState
-    lasso_artifact_get_samlArt
-    lasso_artifact_get_type
-    lasso_artifact_new
-    lasso_artifact_new_from_lares
-    lasso_artifact_new_from_query
-    lasso_assertion_get_type
-    lasso_assertion_new
-    lasso_authentication_statement_get_type
-    lasso_authentication_statement_new
-    lasso_authn_request_get_protocolProfile
-    lasso_authn_request_get_type
-    lasso_authn_request_new
-    lasso_authn_request_new_from_export
-    lasso_authn_request_set_requestAuthnContext
-    lasso_authn_request_set_scoping
-    lasso_authn_response_get_status
-    lasso_authn_response_get_type
-    lasso_authn_response_new
-    lasso_authn_response_new_from_export
-    lasso_build_random_sequence
-    lasso_build_unique_id
-    lasso_check_version_ext
-    lasso_doc_get_node_content
-    lasso_ds_signature_get_type
-    lasso_ds_signature_new
-    lasso_ds_signature_sign
-    lasso_federation_termination_build_notification_msg
-    lasso_federation_termination_dump
-    lasso_federation_termination_get_type
-    lasso_federation_termination_init_notification
-    lasso_federation_termination_new
-    lasso_federation_termination_notification_get_type
-    lasso_federation_termination_notification_new
-    lasso_federation_termination_notification_new_from_query
-    lasso_federation_termination_notification_new_from_soap
-    lasso_federation_termination_process_notification_msg
-    lasso_get_current_time
-    lasso_g_ptr_array_index
-    lasso_identity_dump
-    lasso_identity_get_local_nameIdentifier
-    lasso_identity_get_remote_nameIdentifier
-    lasso_identity_get_type
-    lasso_identity_new
-    lasso_identity_new_from_dump
-    lasso_identity_set_local_nameIdentifier
-    lasso_identity_set_remote_nameIdentifier
-    lasso_identity_verify_nameIdentifier
-    lasso_init
-    lasso_lib_assertion_get_type
-    lasso_lib_assertion_new
-    lasso_lib_assertion_set_inResponseTo
-    lasso_lib_authentication_statement_get_type
-    lasso_lib_authentication_statement_new
-    lasso_lib_authentication_statement_set_authnContext
-    lasso_lib_authentication_statement_set_reauthenticateOnOrAfter
-    lasso_lib_authentication_statement_set_sessionIndex
-    lasso_lib_authn_context_get_type
-    lasso_lib_authn_context_new
-    lasso_lib_authn_context_set_authnContextClassRef
-    lasso_lib_authn_context_set_authnContextStatementRef
-    lasso_lib_authn_request_get_type
-    lasso_lib_authn_request_new
-    lasso_lib_authn_request_set_affiliationID
-    lasso_lib_authn_request_set_assertionConsumerServiceID
-    lasso_lib_authn_request_set_consent
-    lasso_lib_authn_request_set_forceAuthn
-    lasso_lib_authn_request_set_isPassive
-    lasso_lib_authn_request_set_nameIDPolicy
-    lasso_lib_authn_request_set_protocolProfile
-    lasso_lib_authn_request_set_providerID
-    lasso_lib_authn_request_set_relayState
-    lasso_lib_authn_request_set_requestAuthnContext
-    lasso_lib_authn_request_set_scoping
-    lasso_lib_authn_response_get_type
-    lasso_lib_authn_response_new
-    lasso_lib_authn_response_set_consent
-    lasso_lib_authn_response_set_providerID
-    lasso_lib_authn_response_set_relayState
-    lasso_lib_federation_termination_notification_get_type
-    lasso_lib_federation_termination_notification_new
-    lasso_lib_federation_termination_notification_set_consent
-    lasso_lib_federation_termination_notification_set_nameIdentifier
-    lasso_lib_federation_termination_notification_set_providerID
-    lasso_lib_idp_entries_add_idpEntry
-    lasso_lib_idp_entries_get_type
-    lasso_lib_idp_entries_new
-    lasso_lib_idp_entry_get_type
-    lasso_lib_idp_entry_new
-    lasso_lib_idp_entry_set_loc
-    lasso_lib_idp_entry_set_providerID
-    lasso_lib_idp_entry_set_providerName
-    lasso_lib_idp_list_get_type
-    lasso_lib_idp_list_new
-    lasso_lib_idp_list_set_getComplete
-    lasso_lib_idp_list_set_idpEntries
-    lasso_lib_idp_provided_name_identifier_get_type
-    lasso_lib_idp_provided_name_identifier_new
-    lasso_lib_logout_request_get_type
-    lasso_lib_logout_request_new
-    lasso_lib_logout_request_set_consent
-    lasso_lib_logout_request_set_nameIdentifier
-    lasso_lib_logout_request_set_providerID
-    lasso_lib_logout_request_set_relayState
-    lasso_lib_logout_request_set_sessionIndex
-    lasso_lib_logout_response_get_type
-    lasso_lib_logout_response_new
-    lasso_lib_name_identifier_mapping_request_get_type
-    lasso_lib_name_identifier_mapping_request_new
-    lasso_lib_name_identifier_mapping_request_set_consent
-    lasso_lib_name_identifier_mapping_request_set_nameIdentifier
-    lasso_lib_name_identifier_mapping_request_set_providerID
-    lasso_lib_name_identifier_mapping_response_get_type
-    lasso_lib_name_identifier_mapping_response_new
-    lasso_lib_name_identifier_mapping_response_set_nameIdentifier
-    lasso_lib_name_identifier_mapping_response_set_providerID
-    lasso_lib_name_identifier_mapping_response_set_status
-    lasso_lib_old_provided_name_identifier_get_type
-    lasso_lib_old_provided_name_identifier_new
-    lasso_lib_register_name_identifier_request_get_type
-    lasso_lib_register_name_identifier_request_new
-    lasso_lib_register_name_identifier_request_set_idpProvidedNameIdentifier
-    lasso_lib_register_name_identifier_request_set_oldProvidedNameIdentifier
-    lasso_lib_register_name_identifier_request_set_providerID
-    lasso_lib_register_name_identifier_request_set_relayState
-    lasso_lib_register_name_identifier_request_set_spProvidedNameIdentifier
-    lasso_lib_register_name_identifier_response_get_type
-    lasso_lib_register_name_identifier_response_new
-    lasso_lib_request_authn_context_add_authnContextClassRef
-    lasso_lib_request_authn_context_add_authnContextStatementRef
-    lasso_lib_request_authn_context_get_type
-    lasso_lib_request_authn_context_new
-    lasso_lib_request_authn_context_set_authnContextComparison
-    lasso_lib_scoping_get_type
-    lasso_lib_scoping_new
-    lasso_lib_scoping_set_idpList
-    lasso_lib_scoping_set_proxyCount
-    lasso_lib_sp_provided_name_identifier_get_type
-    lasso_lib_sp_provided_name_identifier_new
-    lasso_lib_status_response_get_type
-    lasso_lib_status_response_new
-    lasso_lib_status_response_set_providerID
-    lasso_lib_status_response_set_relayState
-    lasso_lib_status_response_set_status
-    lasso_lib_subject_get_type
-    lasso_lib_subject_new
-    lasso_lib_subject_set_idpProvidedNameIdentifier
-    lasso_login_build_artifact_msg
-    lasso_login_build_authn_request_msg
-    lasso_login_build_authn_response_msg
-    lasso_login_build_request_msg
-    lasso_login_create_user
-    lasso_login_destroy
-    lasso_login_dump
-    lasso_login_get_type
-    lasso_login_init_authn_request
-    lasso_login_init_from_authn_request_msg
-    lasso_login_init_request
-    lasso_login_must_authenticate
-    lasso_login_new
-    lasso_login_new_from_dump
-    lasso_login_process_authn_response_msg
-    lasso_login_process_request_msg
-    lasso_login_process_response_msg
-    lasso_logout_build_request_msg
-    lasso_logout_build_response_msg
-    lasso_logout_dump
-    lasso_logout_get_type
-    lasso_logout_init_request
-    lasso_logout_new
-    lasso_logout_process_request_msg
-    lasso_logout_process_response_msg
-    lasso_logout_request_get_type
-    lasso_logout_request_new
-    lasso_logout_request_new_from_query
-    lasso_logout_request_new_from_soap
-    lasso_logout_response_get_status_code_value
-    lasso_logout_response_get_type
-    lasso_logout_response_new
-    lasso_logout_response_new_from_dump
-    lasso_logout_response_new_from_query
-    lasso_logout_response_new_from_request_query
-    lasso_logout_response_new_from_request_soap
-    lasso_logout_response_new_from_soap
-    lasso_name_identifier_mapping_build_request_msg
-    lasso_name_identifier_mapping_build_response_msg
-    lasso_name_identifier_mapping_dump
-    lasso_name_identifier_mapping_get_type
-    lasso_name_identifier_mapping_init_request
-    lasso_name_identifier_mapping_new
-    lasso_name_identifier_mapping_process_request_msg
-    lasso_name_identifier_mapping_process_response_msg
-    lasso_name_identifier_mapping_request_get_type
-    lasso_name_identifier_mapping_request_new
-    lasso_name_identifier_mapping_request_new_from_query
-    lasso_name_identifier_mapping_request_new_from_soap
-    lasso_name_identifier_mapping_response_get_type
-    lasso_name_identifier_mapping_response_new
-    lasso_name_identifier_mapping_response_new_from_dump
-    lasso_name_identifier_mapping_response_new_from_query
-    lasso_name_identifier_mapping_response_new_from_request_query
-    lasso_name_identifier_mapping_response_new_from_request_soap
-    lasso_name_identifier_mapping_response_new_from_soap
-    lasso_node_copy
-    lasso_node_destroy
-    lasso_node_dump
-    lasso_node_export
-    lasso_node_export_to_base64
-    lasso_node_export_to_query
-    lasso_node_export_to_soap
-    lasso_node_get_attr
-    lasso_node_get_attrs
-    lasso_node_get_attr_value
-    lasso_node_get_child
-    lasso_node_get_child_content
-    lasso_node_get_children
-    lasso_node_get_content
-    lasso_node_get_name
-    lasso_node_get_type
-    lasso_node_import
-    lasso_node_new
-    lasso_node_new_from_dump
-    lasso_node_new_from_xmlNode
-    lasso_node_rename_prop
-    lasso_node_verify_signature
-    lasso_profile_context_dump
-    lasso_profile_context_get_type
-    lasso_profile_context_new
-    lasso_profile_context_set_remote_providerID
-    lasso_profile_context_set_response_status
-    lasso_provider_dump
-    lasso_provider_get_assertionConsumerServiceURL
-    lasso_provider_get_federationTerminationNotificationProtocolProfile
-    lasso_provider_get_federationTerminationNotificationServiceURL
-    lasso_provider_get_nameIdentifierMappingProtocolProfile
-    lasso_provider_get_nameIdentifierMappingServiceReturnURL
-    lasso_provider_get_nameIdentifierMappingServiceURL
-    lasso_provider_get_providerID
-    lasso_provider_get_registerNameIdentifierProtocolProfile
-    lasso_provider_get_registerNameIdentifierServiceURL
-    lasso_provider_get_singleLogoutProtocolProfile
-    lasso_provider_get_singleLogoutServiceReturnURL
-    lasso_provider_get_singleLogoutServiceURL
-    lasso_provider_get_singleSignOnProtocolProfile
-    lasso_provider_get_singleSignOnServiceURL
-    lasso_provider_get_soapEndpoint
-    lasso_provider_get_type
-    lasso_provider_new
-    lasso_provider_new_from_metadata_node
-    lasso_provider_new_metadata_filename
-    lasso_provider_set_ca_certificate
-    lasso_provider_set_public_key
-    lasso_query_get_value
-    lasso_query_to_dict
-    lasso_query_verify_signature
-    lasso_register_name_identifier_build_request_msg
-    lasso_register_name_identifier_build_response_msg
-    lasso_register_name_identifier_dump
-    lasso_register_name_identifier_get_type
-    lasso_register_name_identifier_handle_request_msg
-    lasso_register_name_identifier_handle_response_msg
-    lasso_register_name_identifier_init_request
-    lasso_register_name_identifier_new
-    lasso_register_name_identifier_rename_attributes_for_query
-    lasso_register_name_identifier_request_get_type
-    lasso_register_name_identifier_request_new
-    lasso_register_name_identifier_request_new_from_query
-    lasso_register_name_identifier_request_new_from_soap
-    lasso_register_name_identifier_response_get_type
-    lasso_register_name_identifier_response_new
-    lasso_register_name_identifier_response_new_from_dump
-    lasso_register_name_identifier_response_new_from_query
-    lasso_register_name_identifier_response_new_from_request_query
-    lasso_register_name_identifier_response_new_from_request_soap
-    lasso_register_name_identifier_response_new_from_soap
-    lasso_request_get_type
-    lasso_request_new
-    lasso_response_get_type
-    lasso_response_new
-    lasso_response_new_from_export
-    lasso_saml_advice_add_assertion
-    lasso_saml_advice_add_assertionIDReference
-    lasso_saml_advice_get_type
-    lasso_saml_advice_new
-    lasso_saml_assertion_add_authenticationStatement
-    lasso_saml_assertion_add_statement
-    lasso_saml_assertion_add_subjectStatement
-    lasso_saml_assertion_get_type
-    lasso_saml_assertion_new
-    lasso_saml_assertion_set_advice
-    lasso_saml_assertion_set_assertionID
-    lasso_saml_assertion_set_conditions
-    lasso_saml_assertion_set_issueInstance
-    lasso_saml_assertion_set_issuer
-    lasso_saml_assertion_set_majorVersion
-    lasso_saml_assertion_set_minorVersion
-    lasso_saml_assertion_set_signature
-    lasso_saml_audience_restriction_condition_add_audience
-    lasso_saml_audience_restriction_condition_get_type
-    lasso_saml_audience_restriction_condition_new
-    lasso_saml_authentication_statement_add_authorityBinding
-    lasso_saml_authentication_statement_get_type
-    lasso_saml_authentication_statement_new
-    lasso_saml_authentication_statement_set_authenticationInstant
-    lasso_saml_authentication_statement_set_authenticationMethod
-    lasso_saml_authentication_statement_set_subjectLocality
-    lasso_saml_authority_binding_get_type
-    lasso_saml_authority_binding_new
-    lasso_saml_authority_binding_set_authorityKind
-    lasso_saml_authority_binding_set_binding
-    lasso_saml_authority_binding_set_location
-    lasso_saml_condition_abstract_get_type
-    lasso_saml_condition_abstract_new
-    lasso_saml_conditions_add_audienceRestrictionCondition
-    lasso_saml_conditions_add_condition
-    lasso_saml_conditions_get_type
-    lasso_saml_conditions_new
-    lasso_saml_conditions_set_notBefore
-    lasso_saml_conditions_set_notOnOrAfter
-    lasso_saml_name_identifier_get_type
-    lasso_saml_name_identifier_new
-    lasso_saml_name_identifier_set_format
-    lasso_saml_name_identifier_set_nameQualifier
-    lasso_samlp_request_abstract_add_respondWith
-    lasso_samlp_request_abstract_get_type
-    lasso_samlp_request_abstract_new
-    lasso_samlp_request_abstract_set_issueInstance
-    lasso_samlp_request_abstract_set_majorVersion
-    lasso_samlp_request_abstract_set_minorVersion
-    lasso_samlp_request_abstract_set_requestID
-    lasso_samlp_request_abstract_set_signature
-    lasso_samlp_request_get_type
-    lasso_samlp_request_new
-    lasso_samlp_request_set_assertionArtifact
-    lasso_samlp_response_abstract_get_type
-    lasso_samlp_response_abstract_new
-    lasso_samlp_response_abstract_set_inResponseTo
-    lasso_samlp_response_abstract_set_issueInstance
-    lasso_samlp_response_abstract_set_majorVersion
-    lasso_samlp_response_abstract_set_minorVersion
-    lasso_samlp_response_abstract_set_recipient
-    lasso_samlp_response_abstract_set_responseID
-    lasso_samlp_response_abstract_set_signature
-    lasso_samlp_response_add_assertion
-    lasso_samlp_response_get_type
-    lasso_samlp_response_new
-    lasso_samlp_response_set_status
-    lasso_samlp_status_code_get_type
-    lasso_samlp_status_code_new
-    lasso_samlp_status_code_set_value
-    lasso_samlp_status_get_type
-    lasso_samlp_status_new
-    lasso_samlp_status_set_statusCode
-    lasso_samlp_status_set_statusMessage
-    lasso_saml_statement_abstract_get_type
-    lasso_saml_statement_abstract_new
-    lasso_saml_subject_confirmation_add_confirmationMethod
-    lasso_saml_subject_confirmation_get_type
-    lasso_saml_subject_confirmation_new
-    lasso_saml_subject_confirmation_set_subjectConfirmationMethod
-    lasso_saml_subject_get_type
-    lasso_saml_subject_locality_get_type
-    lasso_saml_subject_locality_new
-    lasso_saml_subject_locality_set_dnsAddress
-    lasso_saml_subject_locality_set_ipAddress
-    lasso_saml_subject_new
-    lasso_saml_subject_set_nameIdentifier
-    lasso_saml_subject_set_subjectConfirmation
-    lasso_saml_subject_statement_abstract_get_type
-    lasso_saml_subject_statement_abstract_new
-    lasso_saml_subject_statement_abstract_set_subject
-    lasso_server_add_lasso_provider
-    lasso_server_add_provider
-    lasso_server_destroy
-    lasso_server_dump
-    lasso_server_get_provider
-    lasso_server_get_providerID_from_hash
-    lasso_server_get_type
-    lasso_server_new
-    lasso_server_new_from_dump
-    lasso_shutdown
-    lasso_soap_env_body_add_child
-    lasso_soap_env_body_get_type
-    lasso_soap_env_body_new
-    lasso_soap_env_envelope_get_type
-    lasso_soap_env_envelope_new
-    lasso_soap_env_envelope_set_body
-    lasso_str_escape
-    lasso_str_hash
-    lasso_str_sign
-    lasso_str_unescape
-    lasso_user_add_assertion
-    lasso_user_add_identity
-    lasso_user_dump
-    lasso_user_get_assertion
-    lasso_user_get_identity
-    lasso_user_get_next_providerID
-    lasso_user_get_type
-    lasso_user_new
-    lasso_user_new_from_dump
-    lasso_user_remove_assertion
-    set_debug_info
-
-; Var exports.
-    lassoLassoHRef
-    lassoLassoPrefix
-    lassoLibHRef
-    lassoLibPrefix
-    lassoLibMajorVersion
-    lassoLibMinorVersion
-    lassoLibNameIDPolicyTypeNone
-    lassoLibNameIDPolicyTypeOneTime
-    lassoLibNameIDPolicyTypeFederated
-    lassoLibNameIDPolicyTypeAny
-    lassoLibAuthnContextComparisonExact
-    lassoLibAuthnContextComparisonMinimum
-    lassoLibAuthnContextComparisonBetter
-    lassoLibStatusCodeFederationDoesNotExist
-    lassoLibStatusCodeInvalidAssertionConsumerServiceIndex
-    lassoLibStatusCodeInvalidSignature
-    lassoLibStatusCodeNoAuthnContext
-    lassoLibStatusCodeNoAvailableIDP
-    lassoLibStatusCodeNoPassive
-    lassoLibStatusCodeNoSupportedIDP
-    lassoLibStatusCodeProxyCountExceeded
-    lassoLibStatusCodeUnknownPrincipal
-    lassoLibStatusCodeUnsignedAuthnRequest
-    lassoLibProtocolProfileSSOGet
-    lassoLibProtocolProfileSSOPost
-    lassoLibProtocolProfileBrwsArt
-    lassoLibProtocolProfileBrwsPost
-    lassoLibProtocolProfileFedTermIdpHttp
-    lassoLibProtocolProfileFedTermIdpSoap
-    lassoLibProtocolProfileFedTermSpHttp
-    lassoLibProtocolProfileFedTermSpSoap
-    lassoLibProtocolProfileRniIdpHttp
-    lassoLibProtocolProfileRniIdpSoap
-    lassoLibProtocolProfileRniSpHttp
-    lassoLibProtocolProfileRniSpSoap
-    lassoLibProtocolProfileSloSpHttp
-    lassoLibProtocolProfileSloSpSoap
-    lassoLibProtocolProfileSloIdpHttp
-    lassoLibProtocolProfileSloIdpSoap
-    lassoLibNameIdentifierFormatFederated
-    lassoLibNameIdentifierFormatOneTime
-    lassoLibNameIdentifierFormatEncrypted
-    lassoLibNameIdentifierFormatEntityID
-    lassoMetadataHRef
-    lassoMetadataPrefix
-    lassoSamlAssertionHRef
-    lassoSamlAssertionPrefix
-    lassoSamlProtocolHRef
-    lassoSamlProtocolPrefix
-    lassoSamlMajorVersion
-    lassoSamlMinorVersion
-    lassoSamlStatusCodeRequestDenied
-    lassoSamlStatusCodeSuccess
-    lassoSamlAuthenticationMethodPassword
-    lassoSamlAuthenticationMethodKerberos
-    lassoSamlAuthenticationMethodSecureRemotePassword
-    lassoSamlAuthenticationMethodHardwareToken
-    lassoSamlAuthenticationMethodSmartcardPki
-    lassoSamlAuthenticationMethodSoftwarePki
-    lassoSamlAuthenticationMethodPgp
-    lassoSamlAuthenticationMethodSPki
-    lassoSamlAuthenticationMethodXkms
-    lassoSamlAuthenticationMethodXmlDSig
-    lassoSamlAuthenticationMethodUnspecified
-    lassoSamlConfirmationMethodArtifact01
-    lassoSamlConfirmationMethodBearer
-    lassoSamlConfirmationMethodHolderOfKey
-    lassoSamlConfirmationMethodSenderVouches
-    lassoSoapEnvHRef
-    lassoSoapEnvPrefix
diff --git a/win32/create_lasso.def.py b/win32/create_lasso.def.py
index e7227278..01228659 100755
--- a/win32/create_lasso.def.py
+++ b/win32/create_lasso.def.py
@@ -9,7 +9,7 @@ cmd = "nm -B " + sys.argv[1]
 output = commands.getoutput(cmd)
 lines = output.split("\n")
 
-print "LIBRARY lasso\n"
+print "LIBRARY liblasso.dll\n"
 print "DESCRIPTION \"Free implementation of the Liberty Alliance specifications.\"\n"
 print "EXPORTS\n"
 
diff --git a/lasso/lasso.rc b/win32/lasso.rc
index 39fbaf3d..39fbaf3d 100644
--- a/lasso/lasso.rc
+++ b/win32/lasso.rc
diff --git a/win32/nsis/lasso.ico b/win32/nsis/lasso.ico
new file mode 100644
index 00000000..7c296885
--- /dev/null
+++ b/win32/nsis/lasso.ico