Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ jobs:
uses: actions/checkout@v4

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: Setup NuGet
uses: NuGet/setup-nuget@v1
uses: NuGet/setup-nuget@v2

- name: Restore Packages
run: nuget restore ${{ env.solutionFile }}

- name: Get version from update.xml
id: getVersion
uses: mavrosxristoforos/get-xml-info@1.2.1
uses: mavrosxristoforos/get-xml-info@2.0
with:
xml-file: update.xml
xpath: //update/@version
Expand All @@ -61,7 +61,7 @@ jobs:
run: msbuild ${{ env.solutionFile }} -t:rebuild -property:Configuration=${{ matrix.configuration }}

- name: Upload the build results as an artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ env.projectFolder }}/bin/${{ matrix.configuration }}/*
name: ${{ env.projectName }}.Nightly.${{ matrix.configuration }}
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ jobs:
git config user.email "<>"

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: Setup NuGet
uses: NuGet/setup-nuget@v1
uses: NuGet/setup-nuget@v2

- name: Restore Packages
run: nuget restore ${{ env.solutionFile }}

- name: Get version from release name
id: version
uses: mad9000/actions-find-and-replace-string@4
uses: mad9000/actions-find-and-replace-string@5
with:
source: "${{ github.event.release.tag_name }}"
find: "v"
Expand All @@ -68,7 +68,7 @@ jobs:
run: msbuild ${{ env.solutionFile }} -t:rebuild -property:Configuration=${{ matrix.configuration }}

- name: Upload the build results as an artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ env.projectFolder }}/bin/${{ matrix.configuration }}/*
name: ${{ env.projectName }}.${{ github.event.release.tag_name }}.${{ matrix.configuration }}
Expand Down
44 changes: 22 additions & 22 deletions FunkeySelector/CustomFManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,34 +70,34 @@ public static void SendFunkeyViaMB(string funkeyID)
if (gamePtr == IntPtr.Zero)
{
MessageBox.Show("There is no instance of U.B. Funkeys currently running.", "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
else

IntPtr ptrCopyData = IntPtr.Zero;
try
{
IntPtr ptrCopyData = IntPtr.Zero;
try
COPYDATASTRUCT copyData = new()
{
COPYDATASTRUCT copyData = new COPYDATASTRUCT
{
dwData = new IntPtr(238164658), //A strange data type that's required for the game to switch the Bitty.
cbData = idtosend.Length + 1,
lpData = Marshal.StringToHGlobalAnsi(idtosend)
};
dwData = new IntPtr(238164658), // A strange data type that's required for the game to switch the Bitty.
cbData = idtosend.Length + 1,
lpData = Marshal.StringToHGlobalAnsi(idtosend)
};

ptrCopyData = Marshal.AllocCoTaskMem(Marshal.SizeOf(copyData));
Marshal.StructureToPtr(copyData, ptrCopyData, false);
ptrCopyData = Marshal.AllocCoTaskMem(Marshal.SizeOf(copyData));
Marshal.StructureToPtr(copyData, ptrCopyData, false);

SendMessage(gamePtr, WM_COPYDATA, IntPtr.Zero, ptrCopyData);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
finally
{
if (ptrCopyData != IntPtr.Zero)
Marshal.FreeCoTaskMem(ptrCopyData);
}
SendMessage(gamePtr, WM_COPYDATA, IntPtr.Zero, ptrCopyData);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
finally
{
if (ptrCopyData != IntPtr.Zero)
Marshal.FreeCoTaskMem(ptrCopyData);
}

}
}
}
4 changes: 2 additions & 2 deletions FunkeySelector/CustomFunkeys.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/DaydreamOasis.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/FunkikiIsland.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/HiddenRealm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/LaputtaStation.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/MagmaGorge.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/NightmareRift.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/ParadoxGreen.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion FunkeySelector/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static void Main(string[] args)
}
}

Application.EnableVisualStyles();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1());
}
Expand Down
4 changes: 2 additions & 2 deletions FunkeySelector/RoyaltonRacingComplex.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions FunkeySelector/UnusedFunkeys.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.