Skip to content

Commit 0ca8afe

Browse files
author
Ting Zhu
authored
Update for 6.4.0 release (#96)
1 parent b374182 commit 0ca8afe

File tree

93 files changed

+218
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+218
-193
lines changed

common/inc/gx_api.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/* APPLICATION INTERFACE DEFINITION RELEASE */
2525
/* */
2626
/* gx_api.h PORTABLE C */
27-
/* 6.3.0 */
27+
/* 6.4.0 */
2828
/* AUTHOR */
2929
/* */
3030
/* Kenneth Maxwell, Microsoft Corporation */
@@ -112,6 +112,9 @@
112112
/* added partial canvas buffer */
113113
/* support, */
114114
/* resulting in version 6.3.0 */
115+
/* 12-31-2023 Ting Zhu Modified comment(s), */
116+
/* updated patch version, */
117+
/* resulting in version 6.4.0 */
115118
/* */
116119
/**************************************************************************/
117120

@@ -134,7 +137,7 @@ extern "C" {
134137

135138
#define AZURE_RTOS_GUIX
136139
#define GUIX_MAJOR_VERSION 6
137-
#define GUIX_MINOR_VERSION 3
140+
#define GUIX_MINOR_VERSION 4
138141
#define GUIX_PATCH_VERSION 0
139142

140143
/* The following symbols are defined for backward compatibility reasons.*/

common/src/gx_horizontal_list_scroll_info_get.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _gx_horizontal_list_scroll_info_get PORTABLE C */
38-
/* 6.x */
38+
/* 6.4.0 */
3939
/* AUTHOR */
4040
/* */
4141
/* Kenneth Maxwell, Microsoft Corporation */
@@ -69,10 +69,10 @@
6969
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7070
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7171
/* resulting in version 6.1 */
72-
/* xx-xx-xxxx Ting Zhu Modified comments(s), */
72+
/* 12-31-2023 Ting Zhu Modified comments(s), */
7373
/* improved the calculation of */
7474
/* the maximum scrolling value.*/
75-
/* resulting in version 6.x */
75+
/* resulting in version 6.4.0 */
7676
/* */
7777
/**************************************************************************/
7878
VOID _gx_horizontal_list_scroll_info_get(GX_WINDOW *win, ULONG style, GX_SCROLL_INFO *info)

common/src/gx_single_line_text_input_event_process.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ GX_VALUE click_x;
238238
/* FUNCTION RELEASE */
239239
/* */
240240
/* _gx_single_line_text_input_event_process PORTABLE C */
241-
/* 6.x */
241+
/* 6.4.0 */
242242
/* AUTHOR */
243243
/* */
244244
/* Kenneth Maxwell, Microsoft Corporation */
@@ -294,11 +294,11 @@ GX_VALUE click_x;
294294
/* added logic to release */
295295
/* dynamic input buffer, */
296296
/* resulting in version 6.1.3 */
297-
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
297+
/* 12-31-2023 Ting Zhu Modified comment(s), */
298298
/* modified to always call */
299299
/* default widget event */
300300
/* process on a pen up event, */
301-
/* resulting in version 6.x */
301+
/* resulting in version 6.4.0 */
302302
/* */
303303
/**************************************************************************/
304304
UINT _gx_single_line_text_input_event_process(GX_SINGLE_LINE_TEXT_INPUT *text_input, GX_EVENT *event_ptr)

common/src/gx_vertical_list_scroll_info_get.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _gx_vertical_list_scroll_info_get PORTABLE C */
38-
/* 6.x */
38+
/* 6.4.0 */
3939
/* AUTHOR */
4040
/* */
4141
/* Kenneth Maxwell, Microsoft Corporation */
@@ -69,10 +69,10 @@
6969
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7070
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7171
/* resulting in version 6.1 */
72-
/* xx-xx-xxxx Ting Zhu Modified comments(s), */
72+
/* 12-31-2023 Ting Zhu Modified comments(s), */
7373
/* improved the calculation of */
7474
/* the maximum scrolling value.*/
75-
/* resulting in version 6.x */
75+
/* resulting in version 6.4.0 */
7676
/* */
7777
/**************************************************************************/
7878
VOID _gx_vertical_list_scroll_info_get(GX_VERTICAL_LIST *list, ULONG style, GX_SCROLL_INFO *info)

common/src/gx_widget_event_process.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ GX_WIDGET *end = GX_NULL;
127127
/* FUNCTION RELEASE */
128128
/* */
129129
/* _gx_widget_event_process PORTABLE C */
130-
/* 6.x */
130+
/* 6.4.0 */
131131
/* AUTHOR */
132132
/* */
133133
/* Kenneth Maxwell, Microsoft Corporation */
@@ -175,9 +175,9 @@ GX_WIDGET *end = GX_NULL;
175175
/* system input release logic */
176176
/* on widget hide event, */
177177
/* resulting in version 6.1.11 */
178-
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
178+
/* 12-31-2023 Ting Zhu Modified comment(s), */
179179
/* improved focus lose logic, */
180-
/* resulting in version 6.x */
180+
/* resulting in version 6.4.0 */
181181
/* */
182182
/**************************************************************************/
183183
UINT _gx_widget_event_process(GX_WIDGET *widget, GX_EVENT *event_ptr)

guix_studio/StudioXProject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define PROJECT_VERSION 56
1111

1212
// Sequential number of studio version
13-
#define STUDIOX_VERSION_NUMBER 1
13+
#define STUDIOX_VERSION_NUMBER 0
1414

1515
/* This enabled checking if the project was created by a newer version of Studio.
1616
Turn this off for testing when the Studio version number is not accurate

guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<Identity
1212
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
13-
Version="6.3.1.0" Name="Microsoft.AzureRTOSGUIXStudio"/>
13+
Version="6.4.0.0" Name="Microsoft.AzureRTOSGUIXStudio"/>
1414

1515
<Properties>
1616
<DisplayName>Azure RTOS GUIX Studio</DisplayName>

guix_studio/installer/guix_installer_release.iss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
88
AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF}
99
AppName= GUIX Studio
10-
AppVersion=6.3.0.1
10+
AppVersion=6.4.0.0
1111
;AppPublisher=
1212
AppPublisherURL=https://azure.com/rtos
1313
AppSupportURL=https://azure.com/rtos
1414
AppUpdatesURL=https://azure.com/rtos
15-
DefaultDirName={sd}\Azure_RTOS\GUIX_Studio_6.3
15+
DefaultDirName={sd}\Azure_RTOS\GUIX_Studio_6.4
1616
DefaultGroupName=Azure RTOS
1717
CloseApplications=no
1818
;LicenseFile=
19-
OutputBaseFilename=guix_studio_setup_version_6.3.0.1
19+
OutputBaseFilename=guix_studio_setup_version_6.4.0.0
2020
SetupIconFile=graphics\guix_1616icon.ico
2121
Compression=lzma
2222
SolidCompression=yes
@@ -46,11 +46,11 @@ Source: "build\vs_2019\Release\guix_studio.exe"; DestDir: "{app}\studio"; DestNa
4646
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
4747

4848
[Icons]
49-
Name: "{group}\GUIX Studio 6.3\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio.exe"
50-
Name: "{group}\GUIX Studio 6.3\GUIX Studio User's Guide"; Filename: "https://aka.ms/azrtos-guix-studio-user-guide"
51-
Name: "{group}\GUIX Studio 6.3\GUIX User's Guide"; Filename: "https://aka.ms/azrtos-guix-user-guide"
52-
Name: "{group}\GUIX Studio 6.3\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}"
53-
Name: "{commondesktop}\GUIX Studio 6.3.0.1"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon
49+
Name: "{group}\GUIX Studio 6.4\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio.exe"
50+
Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://aka.ms/azrtos-guix-studio-user-guide"
51+
Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://aka.ms/azrtos-guix-user-guide"
52+
Name: "{group}\GUIX Studio 6.4\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}"
53+
Name: "{commondesktop}\GUIX Studio 6.4.0.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon
5454

5555
[Registry]
5656
Root: HKCR; Subkey: ".gxp"; ValueType: string; ValueName: ""; ValueData: "GUIX_Studio_Project"; Flags: uninsdeletevalue; Tasks: associate

ports/arc_em/metaware/inc/gx_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef SHORT GX_VALUE;
139139

140140
#ifdef GX_SYSTEM_INIT
141141
CHAR _gx_version_id[] =
142-
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARCv2_EM/MetaWare Version 6.3.0 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARCv2_EM/MetaWare Version 6.4.0 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

ports/arc_hs/metaware/inc/gx_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef SHORT GX_VALUE;
139139

140140
#ifdef GX_SYSTEM_INIT
141141
CHAR _gx_version_id[] =
142-
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARC_HS/MetaWare Version 6.3.0 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARC_HS/MetaWare Version 6.4.0 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

0 commit comments

Comments
 (0)