Refactor WindowId handling and implement MessageDialog

Replaces pointer casting with a unique ID allocator for WindowId in window_windows.cpp and updates window_manager_windows.cpp to use the new approach. Implements the MessageDialog for Windows using MessageBoxW in message_dialog_windows.cpp, including proper modality handling and macro cleanup. Adds necessary includes and minor code cleanups.

Author: lijy91

src/platform/windows/menu_windows.cpp

@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <cmath>
 #include <cstring>
 #include <functional>
 #include <iostream>

src/platform/windows/message_dialog_windows.cpp

@@ -1,44 +1,65 @@
+// clang-format off
+#include <windows.h>
+#include <windowsx.h>
+// clang-format on
+
+// Undefine Windows API macros that conflict with our method names
+#ifdef GetMessage
+#undef GetMessage
+#endif
+
+#include <memory>
+#include <string>
+
 #include "../../message_dialog.h"
 #include "../../dialog.h"
+#include "string_utils_windows.h"
 
 namespace nativeapi {
 
-// Private implementation class for MessageDialog (Windows stub)
+// Private implementation class for MessageDialog using Win32 MessageBox
 class MessageDialog::Impl {
  public:
   Impl(const std::string& title, const std::string& message)
-      : title_(title), message_(message) {
-    // TODO: Implement Windows MessageBox or Task Dialog
-  }
+      : title_(title), message_(message) {}
 
-  ~Impl() {
-    // TODO: Cleanup if needed
-  }
+  ~Impl() = default;
 
   void SetTitle(const std::string& title) {
     title_ = title;
   }
 
-  std::string GetTitle() const { 
-    return title_; 
+  std::string GetTitle() const {
+    return title_;
   }
 
   void SetMessage(const std::string& message) {
     message_ = message;
   }
 
-  std::string GetMessage() const { 
-    return message_; 
+  std::string GetMessage() const {
+    return message_;
   }
 
   bool Open(DialogModality modality) {
-    // TODO: Implement using MessageBox or TaskDialogIndirect
-    // For now, return false (not implemented)
-    return false;
+    std::wstring wtitle = StringToWString(title_);
+    std::wstring wmessage = StringToWString(message_);
+
+    UINT uType = MB_OK | MB_ICONINFORMATION;
+
+    // Set modality
+    if (modality == DialogModality::Application) {
+      uType |= MB_APPLMODAL;
+    } else if (modality == DialogModality::Window) {
+      uType |= MB_SYSTEMMODAL;  // Use system modal as approximation
+    }
+
+    int result = MessageBoxW(nullptr, wmessage.c_str(), wtitle.c_str(), uType);
+    return result != 0;
   }
 
   bool Close() {
-    // TODO: Implement closing logic
+    // MessageBox doesn't support programmatic closing
     return false;
   }
 
@@ -82,4 +103,3 @@ bool MessageDialog::Close() {
 }
 
 }  // namespace nativeapi
-

src/platform/windows/window_manager_windows.cpp

@@ -48,7 +48,9 @@ class WindowManager::Impl {
   }
 
   void OnWindowEvent(HWND hwnd, const std::string& event_type) {
-    WindowId window_id = reinterpret_cast<WindowId>(hwnd);
+    // Create a temporary Window object to get the proper WindowId
+    Window temp_window(hwnd);
+    WindowId window_id = temp_window.GetId();
 
     if (event_type == "focused") {
       WindowFocusedEvent event(window_id);
@@ -151,8 +153,8 @@ std::shared_ptr<Window> WindowManager::Create(const WindowOptions& options) {
   ShowWindow(hwnd, SW_SHOW);
   UpdateWindow(hwnd);
 
-  WindowId window_id = reinterpret_cast<WindowId>(hwnd);
   auto window = std::make_shared<Window>(hwnd);
+  WindowId window_id = window->GetId();
   windows_[window_id] = window;
 
   // Dispatch window created event
@@ -166,7 +168,7 @@ std::shared_ptr<Window> WindowManager::Create(const WindowOptions& options) {
 bool WindowManager::Destroy(WindowId id) {
   auto it = windows_.find(id);
   if (it != windows_.end()) {
-    HWND hwnd = reinterpret_cast<HWND>(id);
+    HWND hwnd = static_cast<HWND>(it->second->GetNativeObject());
     if (IsWindow(hwnd)) {
       DestroyWindow(hwnd);
     }
@@ -208,7 +210,8 @@ std::vector<std::shared_ptr<Window>> WindowManager::GetAll() {
 std::shared_ptr<Window> WindowManager::GetCurrent() {
   HWND hwnd = GetForegroundWindow();
   if (hwnd) {
-    WindowId window_id = reinterpret_cast<WindowId>(hwnd);
+    Window temp_window(hwnd);
+    WindowId window_id = temp_window.GetId();
     return Get(window_id);
   }
   return nullptr;

src/platform/windows/window_windows.cpp

@@ -1,5 +1,7 @@
 #include <windows.h>
 #include <iostream>
+#include <mutex>
+#include <unordered_map>
 #include "../../window.h"
 #include "../../window_manager.h"
 #include "dpi_utils_windows.h"
@@ -546,7 +548,27 @@ void Window::StartResizing() {
 }
 
 WindowId Window::GetId() const {
-  return pimpl_ && pimpl_->hwnd_ ? reinterpret_cast<WindowId>(pimpl_->hwnd_) : -1;
+  // Use IdAllocator to generate unique IDs instead of casting pointers
+  if (!pimpl_->hwnd_) {
+    return IdAllocator::kInvalidId;
+  }
+
+  // Store the allocated ID in a static map to ensure consistency
+  static std::unordered_map<HWND, WindowId> window_id_map;
+  static std::mutex map_mutex;
+
+  std::lock_guard<std::mutex> lock(map_mutex);
+  auto it = window_id_map.find(pimpl_->hwnd_);
+  if (it != window_id_map.end()) {
+    return it->second;
+  }
+
+  // Allocate new ID using the IdAllocator
+  WindowId new_id = IdAllocator::Allocate<Window>();
+  if (new_id != IdAllocator::kInvalidId) {
+    window_id_map[pimpl_->hwnd_] = new_id;
+  }
+  return new_id;
 }
 
 void* Window::GetNativeObjectInternal() const {