mandatory after update bug fix

also bundle vcruntime140_1.dll in case someone doesnt have it

Author: slavvr

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "glorp"
-version = "0.7.5"
+version = "0.7.6"
 description = "krunker"
 authors = ["slav"]
 edition = "2024"

Cargo.toml

@@ -232,7 +232,13 @@ unsafe extern "system" fn wnd_proc_1(window: HWND, message: u32, wparam: WPARAM,
             ),
             WM_MOUSEMOVE => {
                 if LOCK_STATUS.load(std::sync::atomic::Ordering::Relaxed) {
-                    return LRESULT(1);
+                    return CallWindowProcW(
+                        PREV_WNDPROC_1,
+                        window,
+                        message,
+                        WPARAM(wparam.0 & !MK_LBUTTON.0 as usize),
+                        lparam,
+                    );
                 }
                 CallWindowProcW(PREV_WNDPROC_1, window, message, wparam, lparam)
             }

crates/webview-dll/src/lib.rs

@@ -20,7 +20,9 @@ function copyDirAll(source, destination) {
 		if (entry.isDirectory()) {
 			copyDirAll(sourcePath, destPath);
 		} else {
-			fs.copyFileSync(sourcePath, destPath);
+			if (!fs.existsSync(destPath)) {
+				fs.copyFileSync(sourcePath, destPath);
+			}
 		}
 	}
 }
@@ -30,14 +32,24 @@ try {
 
 	copyDirAll(webview2RuntimeDir, targetWebview2Dir);
 
-	const webviewDllPath = path.join(targetDir, "webview.dll");
-	if (fs.existsSync(webviewDllPath)) {
-		fs.copyFileSync(webviewDllPath, path.join(targetWebview2Dir, "XInput1_4.dll"));
+	const dllMappings = [
+		{ source: "webview.dll", target: "XInput1_4.dll" },
+		{ source: "render.dll", target: "vk_swiftshader.dll" },
+	];
+
+	for (const mapping of dllMappings) {
+		const sourceDllPath = path.join(targetDir, mapping.source);
+		if (fs.existsSync(sourceDllPath)) {
+			fs.copyFileSync(sourceDllPath, path.join(targetWebview2Dir, mapping.target));
+		}
 	}
 
-	const renderDllPath = path.join(targetDir, "render.dll");
-	if (fs.existsSync(renderDllPath)) {
-		fs.copyFileSync(renderDllPath, path.join(targetWebview2Dir, "vk_swiftshader.dll"));
+	const vcruntimePath = path.join(targetDir, "vcruntime140_1.dll");
+	if (!fs.existsSync(vcruntimePath)) {
+		const resourcesVcruntimePath = path.join(process.cwd(), "resources", "vcruntime140_1.dll");
+		if (fs.existsSync(resourcesVcruntimePath)) {
+			fs.copyFileSync(resourcesVcruntimePath, vcruntimePath);
+		}
 	}
 } catch (error) {
 	console.error("cannot copy", error);

postbuild.js

@@ -6,7 +6,7 @@
     Id="glorpPackage"
     Name="glorp"
     Manufacturer="slav"
-    Version="0.7.5"
+    Version="0.7.6"
     Scope="perUser"
     UpgradeCode="80b28117-cea0-4ef1-8d6f-5884f5ae7270">
         <util:CloseApplication
@@ -43,6 +43,7 @@
       <Component Id="MainExecutableComponent" Guid="305c2cca-2e2d-4d5a-ac43-84a3be86d148">
         <File Id="glorp.exe" Name="glorp.exe" Source="target\x86_64-pc-windows-msvc\release\glorp.exe" KeyPath="yes"/>
         <File Id="glorp.pdb" Name ="glorp.pdb" Source="target\x86_64-pc-windows-msvc\release\glorp.pdb"/>
+				<File Id="vcruntime140_1.dll" Name="vcruntime140_1.dll" Source="target\x86_64-pc-windows-msvc\release\vcruntime140_1.dll"/>
 
         <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="glorp" Target="[INSTALLFOLDER]glorp.exe" WorkingDirectory="INSTALLFOLDER" />
         <Shortcut Id="ProgramMenuShortcut" Directory="ProgramMenuFolder" Name="glorp" Target="[INSTALLFOLDER]glorp.exe" WorkingDirectory="INSTALLFOLDER" />

resources/installer_script.wxs

@@ -441,7 +441,6 @@
             const queueTimerDisplay = document.getElementById("queueTimerDisplay");
             const regionSelectors = document.getElementById("regionCheckboxes");
             const matchPopupOverlay = document.getElementById("matchPopupOverlay");
-            const closeButton = document.getElementById("closeMatch");
             const countdownTimer = document.getElementById("countDownTimer");
             const foundRegion = document.getElementById("foundRegion");
             const mapSelectorButton = document.getElementById("mapSelectorButton");
@@ -665,7 +664,6 @@
                     queueInterval = setInterval(updateQueueTimer, 1000);
                     queueButton.disabled = false;
                 };
-                window.matchFound = matchFound;
                 queueConnection.onmessage = (event) => {
                     const data = JSON.parse(event.data);
                     switch (data.type) {
@@ -733,16 +731,18 @@
 
                     if (remaining <= 0) window.close();
                 }, 1000);
-            }
 
-            function closeMatchPopup() {
-                clearInterval(countdownInterval);
-                stopNotificationSound();
-                matchPopupOverlay.classList.remove("active");
-            }
+                isQueued = false;
+                isConnecting = false;
+                clearInterval(queueInterval);
+                queueButton.textContent = "Start Queue";
+                queueButton.classList.remove("in-queue");
+                queueStatus.textContent = "Ready";
+                queueStatus.classList.remove("active");
+                statusArea.classList.remove("active");
+                queueTimerDisplay.textContent = "00:00:00";
+                queueButton.disabled = false;
 
-            if (closeButton) {
-                closeButton.onclick = () => closeMatchPopup();
             }
 
             if (mapSelectorButton) {
@@ -829,19 +829,18 @@
         </div>
         <div class="overlay" id="matchPopupOverlay">
             <div class="popup">
-                <button class="close-icon" id="closeMatch">×</button>
                 <h2>Match Found</h2>
                 <div class="popup-content">
-                    <div class="region-found" id="foundRegion">Region: NA</div>
+                    <div class="region-found" id="foundRegion">Region: </div>
                     <div id="matchFoundMessage" >open the client and rejoin the game from the ranked menu</div>
-                    <div class="countdown-large" id="countDownTimer">60</div>
+                    <div class="countdown-large" id="countDownTimer">00:60</div>
                 </div>
             </div>
         </div>
         <div class="overlay" id="mapSelectorOverlay">
             <div class="map-panel">
                 <button class="close-icon" id="closeMapSelector">×</button>
-                <h2>Select Map</h2>
+                <h2>Select Maps</h2>
                 <div class="map-grid" id="mapGrid"></div>
             </div>
         </div>