Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Windows installer always register ocx files #7979

Merged
merged 1 commit into from
May 8, 2020

Conversation

mjwitte
Copy link
Contributor

@mjwitte mjwitte commented May 8, 2020

Pull request overview

  • Fixes OCX file not registered errors - again #7973 - previously, the windows installer only registered ocx files newly added to the target system. Now they are always registered, even if already present on the target system, to ensure they are properly registered for use by EP-Launch and IDF Editor.

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  • Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  • Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
  • Author should provide a "walkthrough" of relevant code changes using a GitHub code review comment process
  • If any diffs are expected, author must demonstrate they are justified using plots and descriptions
  • If changes fix a defect, the fix should be demonstrated in plots and descriptions
  • If any defect files are updated to a more recent version, upload new versions here or on DevSupport
  • If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  • If structural output changes, add to output rules file and add OutputChange label
  • If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies

Reviewer

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • If branch is behind develop, merge develop and build locally to check for side effects of the merge
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified
  • Check that performance is not impacted (CI Linux results include performance check)
  • Run Unit Test(s) locally
  • Check any new function arguments for performance impacts
  • Verify IDF naming conventions and styles, memos and notes and defaults
  • If new idf included, locally check the err file and other outputs

@mjwitte mjwitte added the Defect Includes code to repair a defect in EnergyPlus label May 8, 2020
@mjwitte mjwitte added this to the EnergyPlus 9.3.0 BugFix milestone May 8, 2020
@Myoldmopar
Copy link
Member

👍 👍 👍 👍

@mjwitte
Copy link
Contributor Author

mjwitte commented May 8, 2020

@Myoldmopar @jmarrec Tested this locally, which only proves it did not break anything. Tried to have a user test this fix on a system which exhibited the missing ocx problem, but there were security problems with downloading the package exe so the user was not able to test. Unless another user shows up with the problem, I'm not sure if we'll be able to really prove this works.

@rraustad
Copy link
Contributor

rraustad commented May 8, 2020

Can you unregister an ocx file and then test.

@mjwitte
Copy link
Contributor Author

mjwitte commented May 8, 2020

Tested locally by unregistering MSCOMCTL.ocx, confirmed that ep-launch would not open (missing ocx error). Then ran this installer, and confirmed that EP-Launch runs now.

@mjwitte
Copy link
Contributor Author

mjwitte commented May 8, 2020

@rraustad Thanks.

@mjwitte mjwitte requested a review from Myoldmopar May 8, 2020 14:44
Comment on lines +56 to +60
// Register it: Only for "OCX"
// On some systems these files may be present but not properly registered, so always register here
// If it's a .ocx (case insensitive), we save it to be registered
if (systemArray[i].toLowerCase().indexOf(".ocx") !== -1) {
dllsToReg.push(targetFile);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this out of the if (!installer.fileExists(targetFile)) { block so that the ocx files are always registered, even if they already were present.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great change.

Comment on lines +56 to +60
// Register it: Only for "OCX"
// On some systems these files may be present but not properly registered, so always register here
// If it's a .ocx (case insensitive), we save it to be registered
if (systemArray[i].toLowerCase().indexOf(".ocx") !== -1) {
dllsToReg.push(targetFile);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great change.

@Myoldmopar
Copy link
Member

Your testing results are sufficient, changes look good, and CI won't show anything on this anyway. Merging. Thanks @mjwitte !

@Myoldmopar Myoldmopar merged commit 1457e3b into develop May 8, 2020
@Myoldmopar Myoldmopar deleted the Branch_v9.3.0WithOCXInstallerFix7973 branch May 8, 2020 14:56
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OCX file not registered errors - again
8 participants