Add UserData as struct, clear for storage, memory alloc/free functions

Meetem · Jan 13, 2022 · de16207 · de16207
1 parent 70538c7
commit de16207
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 3 deletions.
diff --git a/BladeStructs.h b/BladeStructs.h
@@ -67,6 +67,13 @@ typedef struct UsbHandle_s{
     void *handle;
 }UsbHandle;
 
+typedef struct UserData_s
+{
+    void *ptr;
+    int32_t length;
+    int32_t autoFree;
+}UserData;
+
 typedef struct KeyboardRow_s
 {
     uint8_t rowid; // Row ID (0-5) used by the EC to update each row

diff --git a/DescriptionStorage.cpp b/DescriptionStorage.cpp
@@ -146,4 +146,15 @@ namespace librazerblade {
             this->put(d);
         }
     }
+
+    void DescriptionStorage::clear()
+    {
+        for(auto &d : descriptions){
+            if(d.userData.ptr != nullptr && d.userData.autoFree > 0){
+                free(d.userData.ptr);
+            }
+        }
+
+        descriptions.clear();
+    }
 }
diff --git a/DescriptionStorage.h b/DescriptionStorage.h
@@ -17,6 +17,7 @@ namespace librazerblade {
         void put(LaptopDescription description);
         LaptopDescription *getAll(int32_t *size);
         void set(int32_t idx, LaptopDescription description);
+        void clear();
 
         void initializeWithDefault();
     protected:

diff --git a/LaptopDescription.h b/LaptopDescription.h
@@ -32,7 +32,7 @@ typedef struct LaptopDescription_s
     char name[256];
     LaptopFan fan;
     BladeCapabilities capabilities;
-    void* userData;
+    UserData userData;
 } LaptopDescription;
 
 typedef struct LaptopState_s

diff --git a/build/msvc/bin/librazerblade.dll b/build/msvc/bin/librazerblade.dll
diff --git a/build/msvc/include/BladeStructs.h b/build/msvc/include/BladeStructs.h
@@ -67,6 +67,13 @@ typedef struct UsbHandle_s{
     void *handle;
 }UsbHandle;
 
+typedef struct UserData_s
+{
+    void *ptr;
+    int32_t length;
+    int32_t autoFree;
+}UserData;
+
 typedef struct KeyboardRow_s
 {
     uint8_t rowid; // Row ID (0-5) used by the EC to update each row

diff --git a/build/msvc/include/LaptopDescription.h b/build/msvc/include/LaptopDescription.h
@@ -32,7 +32,7 @@ typedef struct LaptopDescription_s
     char name[256];
     LaptopFan fan;
     BladeCapabilities capabilities;
-    void* userData;
+    UserData userData;
 } LaptopDescription;
 
 typedef struct LaptopState_s

diff --git a/build/msvc/include/librazerblade.h b/build/msvc/include/librazerblade.h
@@ -119,8 +119,14 @@ CallType librazerblade_DescriptionStorage_get(uint16_t vendor, uint16_t product,
 DllExport void CallType librazerblade_DescriptionStorage_put(LaptopDescription description);
 DllExport LaptopDescription* CallType librazerblade_DescriptionStorage_getAll(int32_t* size);
 DllExport void CallType librazerblade_DescriptionStorage_set(int32_t idx, LaptopDescription description);
+DllExport void CallType librazerblade_DescriptionStorage_clear();
 //#endregion
 
+//#region Memory
+DllExport void* CallType librazerblade_malloc(int32_t size);
+DllExport UserData CallType librazerblade_UserData_fromMemory(void *ptr, int32_t size, int32_t autoFree);
+DllExport void CallType librazerblade_free(void *ptr);
+//#endregion
 #ifdef __cplusplus
 }
 #endif

diff --git a/build/msvc/lib/librazerblade.lib b/build/msvc/lib/librazerblade.lib
diff --git a/librazerblade.cpp b/librazerblade.cpp
@@ -177,6 +177,8 @@ DllExport void CallType librazerblade_deinitialize()
 #ifdef LIBUSB_DEFAULT_IMPLEMENTATION
     closeLibUsb();
 #endif
+
+    librazerblade::gStorage.clear();
 }
 
 
@@ -311,7 +313,8 @@ DllExport KeyboardRow CallType librazerblade_PacketUtil_getRow(RazerPacket* pkt)
 //#endregion
 
 //#region Laptop
-DllExport LaptopPtr CallType librazerblade_Laptop_new(LaptopDescription description, UsbHandle usbHandle, UsbDevice device)
+DllExport LaptopPtr
+CallType librazerblade_Laptop_new(LaptopDescription description, UsbHandle usbHandle, UsbDevice device)
 {
     return new Laptop(description, usbHandle, device);
 }
@@ -531,6 +534,38 @@ DllExport void CallType librazerblade_DescriptionStorage_set(int32_t idx, Laptop
 {
     return gStorage.set(idx, description);
 }
+DllExport void CallType librazerblade_DescriptionStorage_clear()
+{
+    return gStorage.clear();
+}
 //#endregion
+
+//#region Memory
+DllExport void* CallType librazerblade_malloc(int32_t size)
+{
+    return malloc(size);
+}
+
+DllExport UserData CallType librazerblade_UserData_fromMemory(void* ptr, int32_t size, int32_t autoFree)
+{
+    if (ptr == nullptr) {
+        return UserData{nullptr, 0, 0};
+    }
+
+    auto mem = malloc(size);
+    if (mem == nullptr) {
+        return UserData{nullptr, 0, 0};
+    }
+
+    memcpy(mem, ptr, size);
+    return UserData{mem, size, autoFree};
+}
+
+DllExport void CallType librazerblade_free(void* ptr)
+{
+    free(ptr);
+}
+//#endregion
+
 }
 
diff --git a/librazerblade.h b/librazerblade.h
@@ -119,8 +119,14 @@ CallType librazerblade_DescriptionStorage_get(uint16_t vendor, uint16_t product,
 DllExport void CallType librazerblade_DescriptionStorage_put(LaptopDescription description);
 DllExport LaptopDescription* CallType librazerblade_DescriptionStorage_getAll(int32_t* size);
 DllExport void CallType librazerblade_DescriptionStorage_set(int32_t idx, LaptopDescription description);
+DllExport void CallType librazerblade_DescriptionStorage_clear();
 //#endregion
 
+//#region Memory
+DllExport void* CallType librazerblade_malloc(int32_t size);
+DllExport UserData CallType librazerblade_UserData_fromMemory(void *ptr, int32_t size, int32_t autoFree);
+DllExport void CallType librazerblade_free(void *ptr);
+//#endregion
 #ifdef __cplusplus
 }
 #endif