v1.0.0.8

- Fix export, save and saveas to output correct text based json using cJSON_PrintBuffered
- Ignore shortcut keys for Save and SaveAs if no json data.

Signed-off-by: mrfearless <[email protected]>

Author: mrfearless

README.md

@@ -2,6 +2,11 @@
 
 Application that utilizes cJSON (https://github.com/DaveGamble/cJSON) for reading .json files and displaying the nodes in a treeview control.
 
-Built with statically compiled json v1.7.12 x86 library (https://github.com/mrfearless/libraries/tree/master/cJSON)
+Built with the following statically compiled libraries:
+
+- json v1.7.12 x86 (https://github.com/mrfearless/libraries/tree/master/cJSON)
+- VirtualStack x86 (https://github.com/mrfearless/libraries/tree/master/VirtualStack)
+- Treeview x86 (https://github.com/mrfearless/libraries/tree/master/Treeview)
+- Masm32 x86 (http://masm32.com/download.htm)
 
 From a post on tuts4you.com: https://forum.tuts4you.com/topic/39996-how-to-read-json-correctly/

Res/cjsontreeMnu.Rc

@@ -7,12 +7,12 @@
 #define IDM_FILE_EXIT 10001
 #define IDM_EDIT_COPY 10201
 #define IDM_EDIT_COPY_VALUE 10202
-#define IDM_EDIT_COPY_ITEM 10203
-#define IDM_EDIT_COPY_BRANCH 10204
-#define IDM_EDIT_PASTE_ITEM 10205
-#define IDM_EDIT_PASTE_BRANCH 10206
-#define IDM_EDIT_PASTE_JSON 10207
-#define IDM_EDIT_FIND 10208
+#define IDM_EDIT_COPY_ITEM 10205
+#define IDM_EDIT_COPY_BRANCH 10206
+#define IDM_EDIT_PASTE_ITEM 10207
+#define IDM_EDIT_PASTE_BRANCH 10208
+#define IDM_EDIT_PASTE_JSON 10209
+#define IDM_EDIT_FIND 10210
 #define IDM_OPTIONS_EXPANDALL 10301
 #define IDM_OPTIONS_CASESEARCH 10302
 #define IDM_HELP_ABOUT 10101

Res/cjsontreeVer.rc

@@ -1,7 +1,7 @@
 #define VERINF1 1
 VERINF1 VERSIONINFO
-FILEVERSION 1,0,0,6
-PRODUCTVERSION 1,0,0,6
+FILEVERSION 1,0,0,8
+PRODUCTVERSION 1,0,0,8
 FILEOS 0x00000004
 FILETYPE 0x00000001
 BEGIN
@@ -10,14 +10,14 @@ BEGIN
     BLOCK "040904B0"
     BEGIN
       VALUE "CompanyName", "fearless\0"
-      VALUE "FileVersion", "1.0.0.6\0"
+      VALUE "FileVersion", "1.0.0.8\0"
       VALUE "FileDescription", "cjsontree x86\0"
       VALUE "InternalName", "cjsontree\0"
       VALUE "LegalCopyright", "fearless\0"
       VALUE "LegalTrademarks", "fearless\0"
       VALUE "OriginalFilename", "cjsontree\0"
       VALUE "ProductName", "cjsontree x86\0"
-      VALUE "ProductVersion", "1.0.0.6\0"
+      VALUE "ProductVersion", "1.0.0.8\0"
     END
   END
   BLOCK "VarFileInfo"

Treeview.lib

@@ -0,0 +1,304 @@
+;
+;  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+;
+;  Permission is hereby granted, free of charge, to any person obtaining a copy
+;  of this software and associated documentation files (the "Software"), to deal
+;  in the Software without restriction, including without limitation the rights
+;  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;  copies of the Software, and to permit persons to whom the Software is
+;  furnished to do so, subject to the following conditions:
+;
+;  The above copyright notice and this permission notice shall be included in
+;  all copies or substantial portions of the Software.
+;
+;  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+;  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+;  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+;  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+;  THE SOFTWARE.
+;
+; https://github.com/DaveGamble/cJSON
+;
+; cjson.inc converted from cJSON.h 1.7.12 for masm by fearless 2019
+;
+; https://github.com/mrfearless/libraries/tree/master/cJSON
+
+
+include msvcrt.inc
+includelib msvcrt.lib
+includelib msvcrt14.lib
+
+; cJSON project version
+CJSON_VERSION_MAJOR             EQU 1
+CJSON_VERSION_MINOR             EQU 7
+CJSON_VERSION_PATCH             EQU 12
+
+; cJSON Types:
+cJSON_Invalid                   EQU 0; (0)
+cJSON_False                     EQU 1; (1 << 0)
+cJSON_True                      EQU 2; (1 << 1)
+cJSON_NULL                      EQU 4; (1 << 2)
+cJSON_Number                    EQU 8; (1 << 3)
+cJSON_String                    EQU 16; (1 << 4)
+cJSON_Array                     EQU 32; (1 << 5)
+cJSON_Object                    EQU 64; (1 << 6)
+cJSON_Raw                       EQU 128; (1 << 7) - raw json
+
+cJSON_IsReference               EQU 256
+cJSON_StringIsConst             EQU 512
+
+
+
+; The cJSON structure:
+cJSON                           STRUCT
+    next                        DWORD ?
+    prev                        DWORD ?
+    child                       DWORD ?
+    itemtype                    DWORD ?
+    valuestring                 DWORD ?
+    valueint                    DWORD ?
+    valuedouble                 QWORD ?
+    itemstring                  DWORD ?
+cJSON                           ENDS
+
+cJSON_Hooks                     STRUCT
+    malloc_fn                   DWORD ?
+    free_fn                     DWORD ?
+cJSON_Hooks                     ENDS
+
+cJSON_bool                      TYPEDEF DWORD
+
+CJSON_NESTING_LIMIT             EQU 1000
+
+
+cJSON_Version                   PROTO 
+cJSON_InitHooks                 PROTO :DWORD ; (cJSON_Hooks* hooks);
+cJSON_Parse                     PROTO :DWORD ; (const char *value);
+cJSON_ParseWithOpts             PROTO :DWORD, :DWORD, :DWORD ; (const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+cJSON_Print                     PROTO :DWORD ; (const cJSON *item);
+cJSON_PrintUnformatted          PROTO :DWORD ; (const cJSON *item);
+cJSON_PrintBuffered             PROTO :DWORD, :DWORD, :DWORD ; (const cJSON *item, int prebuffer, cJSON_bool fmt);
+cJSON_PrintPreallocated         PROTO :DWORD, :DWORD, :DWORD, :DWORD ; (cJSON *item, char *buffer, const int length, const cJSON_bool format);
+cJSON_Delete                    PROTO :DWORD ; (cJSON *c);
+cJSON_GetArraySize              PROTO :DWORD ; (const cJSON *array);
+cJSON_GetArrayItem              PROTO :DWORD, :DWORD ; (const cJSON *array, int index);
+cJSON_GetObjectItem             PROTO :DWORD, :DWORD ; (const cJSON * const object, const char * const string);
+cJSON_GetObjectItemCaseSensitive PROTO :DWORD, :DWORD ; (const cJSON * const object, const char * const string);
+cJSON_HasObjectItem             PROTO :DWORD, :DWORD ; (const cJSON *object, const char *string);
+cJSON_GetErrorPtr               PROTO
+
+cJSON_GetStringValue            PROTO :DWORD ; (cJSON *item);
+
+
+; These functions check the type of an item
+cJSON_IsInvalid                 PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsFalse                   PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsTrue                    PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsBool                    PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsNull                    PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsNumber                  PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsString                  PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsArray                   PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsObject                  PROTO :DWORD ; (const cJSON * const item);
+cJSON_IsRaw                     PROTO :DWORD ; (const cJSON * const item);
+
+; These calls create a cJSON item of the appropriate type.
+cJSON_CreateNull                PROTO
+cJSON_CreateTrue                PROTO
+cJSON_CreateFalse               PROTO
+cJSON_CreateBool                PROTO :DWORD ; (cJSON_bool boolean);
+cJSON_CreateNumber              PROTO :QWORD ; (double num);
+cJSON_CreateString              PROTO :DWORD ; (const char *string);
+; raw json 
+cJSON_CreateRaw                 PROTO :DWORD ; (const char *raw);
+cJSON_CreateArray               PROTO
+cJSON_CreateObject              PROTO
+
+; Create a string where valuestring references a string so it will not be freed by cJSON_Delete
+cJSON_CreateStringReference     PROTO :DWORD ; (const char *string);
+
+; Create an object/arrray that only references it's elements so they will not be freed by cJSON_Delete
+cJSON_CreateObjectReference     PROTO :DWORD ; (const cJSON *child);
+cJSON_CreateArrayReference      PROTO :DWORD ; (const cJSON *child);
+
+; These utilities create an Array of count items.
+cJSON_CreateIntArray            PROTO :DWORD, :DWORD ; (const int *numbers, int count);
+cJSON_CreateFloatArray          PROTO :DWORD, :DWORD ; (const float *numbers, int count);
+cJSON_CreateDoubleArray         PROTO :DWORD, :DWORD ; (const double *numbers, int count);
+cJSON_CreateStringArray         PROTO :DWORD, :DWORD ; (const char **strings, int count);
+
+; Append item to the specified array/object.
+cJSON_AddItemToArray            PROTO :DWORD, :DWORD ; (cJSON *array, cJSON *item);
+cJSON_AddItemToObject           PROTO :DWORD, :DWORD, :DWORD ; (cJSON *object, const char *string, cJSON *item);
+; Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the; cJSON object.
+; WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst); is zero before writing to `item->string`
+cJSON_AddItemToObjectCS         PROTO :DWORD, :DWORD, :DWORD ; (cJSON *object, const char *string, cJSON *item);
+; Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON.
+cJSON_AddItemReferenceToArray   PROTO :DWORD, :DWORD ; (cJSON *array, cJSON *item);
+cJSON_AddItemReferenceToObject  PROTO :DWORD, :DWORD, :DWORD ; (cJSON *object, const char *string, cJSON *item);
+
+; Remove/Detatch items from Arrays/Objects.
+cJSON_DetachItemViaPointer      PROTO :DWORD, :DWORD ; (cJSON *parent, cJSON * const item);
+cJSON_DetachItemFromArray       PROTO :DWORD, :DWORD ; (cJSON *array, int which);
+cJSON_DeleteItemFromArray       PROTO :DWORD, :DWORD ; (cJSON *array, int which);
+cJSON_DetachItemFromObject      PROTO :DWORD, :DWORD ; (cJSON *object, const char *string);
+cJSON_DetachItemFromObjectCaseSensitive PROTO :DWORD, :DWORD ; (cJSON *object, const char *string);
+cJSON_DeleteItemFromObject      PROTO :DWORD, :DWORD ; (cJSON *object, const char *string);
+cJSON_DeleteItemFromObjectCaseSensitive PROTO :DWORD, :DWORD ; (cJSON *object, const char *string);
+
+; Update array items.
+cJSON_InsertItemInArray         PROTO :DWORD, :DWORD, :DWORD ; (cJSON *array, int which, cJSON *newitem);  Shifts pre-existing items to the right.
+cJSON_ReplaceItemViaPointer     PROTO :DWORD, :DWORD, :DWORD ; (cJSON * const parent, cJSON * const item, cJSON * replacement);
+cJSON_ReplaceItemInArray        PROTO :DWORD, :DWORD, :DWORD ; (cJSON *array, int which, cJSON *newitem);
+cJSON_ReplaceItemInObject       PROTO :DWORD, :DWORD, :DWORD ; (cJSON *object,const char *string,cJSON *newitem);
+cJSON_ReplaceItemInObjectCaseSensitive PROTO :DWORD, :DWORD, :DWORD ; (cJSON *object,const char *string,cJSON *newitem);
+
+
+cJSON_Duplicate                 PROTO :DWORD, :DWORD ; (const cJSON *item, cJSON_bool recurse);
+cJSON_Compare                   PROTO :DWORD, :DWORD, :DWORD ; (const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+cJSON_Minify                    PROTO :DWORD ; (char *json);
+
+; Helper functions for creating and adding items to an object at the same time.
+; They return the added item or NULL on failure. */
+cJSON_AddNullToObject           PROTO :DWORD,:DWORD ; (cJSON * const object, const char * const name);
+cJSON_AddTrueToObject           PROTO :DWORD,:DWORD ; (cJSON * const object, const char * const name);
+cJSON_AddFalseToObject          PROTO :DWORD,:DWORD ; (cJSON * const object, const char * const name);
+cJSON_AddBoolToObject           PROTO :DWORD,:DWORD,:DWORD ; (cJSON * const object, const char * const name, const cJSON_bool boolean);
+cJSON_AddNumberToObject         PROTO :DWORD,:DWORD,:DWORD,:DWORD ; (cJSON * const object, const char * const name, const double number);
+cJSON_AddStringToObject         PROTO :DWORD,:DWORD,:DWORD ; (cJSON * const object, const char * const name, const char * const string);
+cJSON_AddRawToObject            PROTO :DWORD,:DWORD,:DWORD ; (cJSON * const object, const char * const name, const char * const raw);
+cJSON_AddObjectToObject         PROTO :DWORD,:DWORD ; (cJSON * const object, const char * const name);
+cJSON_AddArrayToObject          PROTO :DWORD,:DWORD ; (cJSON * const object, const char * const name);
+
+cJSON_SetNumberHelper           PROTO :DWORD,:DWORD,:DWORD ; (cJSON *object, double number);
+
+cJSON_malloc                    PROTO :DWORD ; (size_t size);
+cJSON_free                      PROTO :DWORD ; (void *object);
+
+
+cJSON_AddObjectToArray          PROTO :DWORD
+cJSON_AddArrayToArray           PROTO :DWORD
+cJSON_AddNullToArray            PROTO :DWORD
+cJSON_AddTrueToArray            PROTO :DWORD
+cJSON_AddFalseToArray           PROTO :DWORD
+cJSON_AddBoolToArray            PROTO :DWORD, :DWORD
+cJSON_AddNumberToArray          PROTO :DWORD, :DWORD
+cJSON_AddStringToArray          PROTO :DWORD, :DWORD
+cJSON_AddRawToArray             PROTO :DWORD, :DWORD
+
+
+; .CODE
+
+; ; Add To Array
+; cJSON_AddObjectToArray PROC hJSON:DWORD
+    ; LOCAL hJSONObject:DWORD
+    ; Invoke cJSON_CreateObject
+    ; mov hJSONObject, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObject
+    ; mov eax, hJSONObject
+    ; ret
+; cJSON_AddObjectToArray ENDP
+
+; cJSON_AddArrayToArray PROC hJSON:DWORD
+    ; LOCAL hJSONObjectArray:DWORD
+    ; Invoke cJSON_CreateArray
+    ; mov hJSONObjectArray, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectArray
+    ; mov eax, hJSONObjectArray
+    ; ret
+; cJSON_AddArrayToArray ENDP
+
+; cJSON_AddNullToArray PROC hJSON:DWORD
+    ; LOCAL hJSONObjectNull:DWORD
+    ; Invoke cJSON_CreateNull
+    ; mov hJSONObjectNull, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectNull
+    ; mov eax, hJSONObjectNull
+    ; ret
+; cJSON_AddNullToArray ENDP
+
+; cJSON_AddTrueToArray PROC hJSON:DWORD
+    ; LOCAL hJSONObjectTrue:DWORD
+    ; Invoke cJSON_CreateTrue
+    ; mov hJSONObjectTrue, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectTrue
+    ; mov eax, hJSONObjectTrue
+    ; ret
+; cJSON_AddTrueToArray ENDP
+
+; cJSON_AddFalseToArray PROC hJSON:DWORD
+    ; LOCAL hJSONObjectFalse:DWORD
+    ; Invoke cJSON_CreateFalse
+    ; mov hJSONObjectFalse, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectFalse
+    ; mov eax, hJSONObjectFalse
+    ; ret
+; cJSON_AddFalseToArray ENDP
+
+; cJSON_AddBoolToArray PROC hJSON:DWORD, dwBoolValue:DWORD
+    ; LOCAL hJSONObjectBool:DWORD
+    ; Invoke cJSON_CreateBool, dwBoolValue
+    ; mov hJSONObjectBool, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectBool
+    ; mov eax, hJSONObjectBool
+    ; ret
+; cJSON_AddBoolToArray ENDP
+
+; cJSON_AddNumberToArray PROC hJSON:DWORD, dwNumberValue:DWORD
+    ; LOCAL hJSONObjectNumber:DWORD
+    ; LOCAL qwNumberValue:QWORD
+    ; mov eax, dwNumberValue
+    ; mov dword ptr [qwNumberValue+0], eax
+    ; mov dword ptr [qwNumberValue+4], eax
+    ; Invoke cJSON_CreateNumber, qwNumberValue
+    ; mov hJSONObjectNumber, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectNumber
+    ; mov eax, hJSONObjectNumber
+    ; ret
+; cJSON_AddNumberToArray ENDP
+
+; cJSON_AddStringToArray PROC hJSON:DWORD, lpszString:DWORD
+    ; LOCAL hJSONObjectString:DWORD
+    ; Invoke cJSON_CreateString, lpszString
+    ; mov hJSONObjectString, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectString
+    ; mov eax, hJSONObjectString
+    ; ret
+; cJSON_AddStringToArray ENDP
+
+; cJSON_AddRawToArray PROC hJSON:DWORD, lpszRawJson:DWORD
+    ; LOCAL hJSONObjectRaw:DWORD
+    ; Invoke cJSON_CreateRaw, lpszRawJson
+    ; mov hJSONObjectRaw, eax
+    ; Invoke cJSON_AddItemToArray, hJSON, hJSONObjectRaw
+    ; mov eax, hJSONObjectRaw
+    ; ret
+; cJSON_AddRawToArray ENDP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+