Hopefully make some things nicer in code

Author: Morilli

IDropTarget.c

@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <shlobj.h>
 
+#include "treeview_extension.h"
 #include "utility.h"
 #include "bnk-extract/defs.h"
 
@@ -99,17 +100,7 @@ static HRESULT STDMETHODCALLTYPE DragOver(IDropTarget* This, DWORD grfKeyState,
 
     // early return in case DragEnter determined that this data is not drag-drop supported
     if (!idropTarget->dragValid) return S_OK;
-    printf("x: %ld, y: %ld\n", pt.x, pt.y);
-    // The POINT structure is identical to the POINTL structure.
-    POINT point = {
-        .x = pt.x,
-        .y = pt.y
-    };
-    printf("screentoclient return: %d\n", ScreenToClient(treeview, &point));
-    printf("x: %ld, y: %ld\n", point.x, point.y);
-    TVHITTESTINFO hitTestInfo = {.pt = point};
-    HTREEITEM hoveredItem = TreeView_HitTest(treeview, &hitTestInfo);
-    printf("hovered Item: %p\n", hoveredItem);
+    HTREEITEM hoveredItem = TreeView_PerformHitTest(pt.x, pt.y, NULL);
     if (hoveredItem) *pdwEffect = DROPEFFECT_COPY;
 
     return S_OK;
@@ -167,13 +158,14 @@ static HRESULT STDMETHODCALLTYPE Drop(IDropTarget* This, IDataObject* pDataObj,
                     UINT fileNameSize = DragQueryFile(hDropInfo, index, NULL, 0);
                     char fileNameBuffer[fileNameSize + 1];
                     DragQueryFile(hDropInfo, index, fileNameBuffer, fileNameSize + 1);
-                    uint32_t current_file_id = strtol(rstrstr(fileNameBuffer, "\\") + 1, NULL, 0);
+                    uint32_t current_file_id = strtol(strrchr(fileNameBuffer, '\\') + 1, NULL, 0);
                     AudioData* wemData = NULL;
                     printf("wemDataList: %p\n", wemDataList);
                     printf("length of list: %llu\n", wemDataList->length);
                     for (uint32_t i = 0; i < wemDataList->length; i++) {
                         printf("objects[%d]: %u\n", i, wemDataList->objects[i].id);
                     }
+                    // relies on the fact this list is inherently sorted, which it always is in practice.
                     find_object_s(wemDataList, wemData, id, current_file_id);
                     printf("wemData: %p\n", wemData);
                     if (wemData) {

Makefile

@@ -32,7 +32,7 @@ object_files := gui.o utility.o IDropTarget.o settings.o treeview_extension.o re
 gui.o: IDropTarget.h resource.h settings.h treeview_extension.h utility.h
 utility.o: utility.h settings.h treeview_extension.h
 settings.o: settings.h resource.h
-IDropTarget.o: utility.h
+IDropTarget.o: treeview_extension.h utility.h
 resource.res: resource.h icon.ico
 manifest.res: gui.exe.manifest
 

gui.c

@@ -151,17 +151,16 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             {
                 case NM_RCLICK: {
                     DWORD position = GetMessagePos();
-                    POINTS mousePosition = MAKEPOINTS(position);
                     HMENU hPopupMenu = CreatePopupMenu();
                     InsertMenu(hPopupMenu, 0, MF_BYPOSITION, 1, "Play audio");
                     InsertMenu(hPopupMenu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
                     InsertMenu(hPopupMenu, 2, MF_BYPOSITION, 2, "Extract selection");
                     InsertMenu(hPopupMenu, 3, MF_BYPOSITION, 3, "Replace wem data");
-                    uint64_t selectedId = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, mousePosition.x, mousePosition.y, 0, hwnd, NULL);
+                    uint64_t selectedId = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, GET_X_LPARAM(position), GET_Y_LPARAM(position), 0, hwnd, NULL);
                     switch (selectedId)
                     {
                         case 1:
-                            rightClickedItem = TreeView_PerformHitTest(position, NULL);
+                            rightClickedItem = TreeView_PerformHitTest(GET_X_LPARAM(position), GET_Y_LPARAM(position), NULL);
                             return SendMessage(PlayAudioButton, BM_CLICK, 0, 0);
                         case 2:
                             return SendMessage(ExtractButton, BM_CLICK, 0, 0);
@@ -173,7 +172,8 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                 case NM_CLICK:
                     if (settings[ID_MULTISELECT_ENABLED-SETTINGS_OFFSET]) {
                         UINT flags;
-                        HTREEITEM hItem = TreeView_PerformHitTest(GetMessagePos(), &flags);
+                        DWORD position = GetMessagePos();
+                        HTREEITEM hItem = TreeView_PerformHitTest(GET_X_LPARAM(position), GET_Y_LPARAM(position), &flags);
                         if (hItem && (flags & TVHT_ONITEM)) return HandleMultiSelectionClick(hItem);
                     }
                     break;

treeview_extension.c

@@ -4,10 +4,9 @@
 
 HWND treeview;
 
-HTREEITEM TreeView_PerformHitTest(DWORD screenPosition, UINT* outFlags)
+HTREEITEM TreeView_PerformHitTest(int screenX, int screenY, UINT* outFlags)
 {
-    POINTS mousePosition = MAKEPOINTS(screenPosition);
-    POINT point = {.x = mousePosition.x, .y = mousePosition.y};
+    POINT point = {.x = screenX, .y = screenY};
     ScreenToClient(treeview, &point);
     TVHITTESTINFO hitTestInfo = {.pt = point};
     HTREEITEM hItem = TreeView_HitTest(treeview, &hitTestInfo);

treeview_extension.h

@@ -5,7 +5,7 @@ extern HWND treeview;
 
 #define TreeView_IsRootItem(hItem) !TreeView_GetParent(treeview, hItem)
 
-HTREEITEM TreeView_PerformHitTest(DWORD screenPosition, UINT* outFlags);
+HTREEITEM TreeView_PerformHitTest(int screenX, int screenY, UINT* outFlags);
 
 void TreeView_ClearAllSelectedItems();
 

utility.c

@@ -186,7 +186,7 @@ void SaveBnkOrWpk(HWND window, HTREEITEM root)
     };
     if (GetSaveFileName(&fileNameInfo)) {
         char* selectedFile = fileNameInfo.lpstrFile;
-        printf("selceted file: \"%s\"\n", selectedFile);
+        printf("selected file: \"%s\"\n", selectedFile);
         if (strstr(selectedFile, ".wpk")) {
             write_wpk_file((AudioDataList*) tvItem.lParam, selectedFile);
         } else {
@@ -210,13 +210,13 @@ void ReplaceWemData(HWND window)
             .hItem = currentItem
         };
         TreeView_GetItem(treeview, &tvItem);
-        if (tvItem.lParam && !TreeView_IsRootItem(currentItem)) {
+        if (tvItem.lParam && !TreeView_IsRootItem(currentItem)) { // add child items only
             bool found = false;
             for (uint32_t i = 0; i < selectedChildItemsDataList.length; i++) {
                 if (selectedChildItemsDataList.objects[i] == (AudioData*) tvItem.lParam)
-                    found = true;
+                    found = true; // the same audio files can appear in the treeview multiple times, so don't use them multiple times
             }
-            if (!found) add_object(&selectedChildItemsDataList, &(AudioData*) {(AudioData*) tvItem.lParam}); // add child items only
+            if (!found) add_object(&selectedChildItemsDataList, &(AudioData*) {(AudioData*) tvItem.lParam});
         }
     }
 
@@ -415,21 +415,3 @@ uint8_t* WavFromOgg(ReadableBinaryData* oggData)
 
     return rawPcmDataFromOgg;
 }
-
-// https://stackoverflow.com/questions/1634359/is-there-a-reverse-function-for-strstr
-char* rstrstr(const char* haystack, const char* needle)
-{
-    if (*needle == '\0')
-        return (char*) haystack;
-
-    char* result = NULL;
-    while (true) {
-        char* p = strstr(haystack, needle);
-        if (p == NULL)
-            break;
-        result = p;
-        haystack = p + 1;
-    }
-
-    return result;
-}

utility.h

@@ -23,6 +23,4 @@ void* FillProgressBar(void* _args);
 
 uint8_t* WavFromOgg(ReadableBinaryData* oggData);
 
-char* rstrstr(const char* haystack, const char* needle);
-
 #endif