mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

worked on the utf8 to utf16 conversions in the file track system

master
Allen Webster 2017-03-18 18:19:51 -04:00
parent 49d1f490d1
commit 8a7db02109
4 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
4ed_file_track.h
View File

@ -31,25 +31,25 @@ enum{
}; };
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
init_track_system(File_Track_System *system, void *table_memory, i32 table_memory_size, void *listener_memory, i32 listener_memory_size); init_track_system(File_Track_System *system, Partition *scratch, void *table_memory, i32 table_memory_size, void *listener_memory, i32 listener_memory_size);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
add_listener(File_Track_System *system, char *filename); add_listener(File_Track_System *system, Partition *scratch, u8 *filename);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
remove_listener(File_Track_System *system, char *filename); remove_listener(File_Track_System *system, Partition *scratch, u8 *filename);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
move_track_system(File_Track_System *system, void *mem, i32 size); move_track_system(File_Track_System *system, Partition *scratch, void *mem, i32 size);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
expand_track_system_listeners(File_Track_System *system, void *mem, i32 size); expand_track_system_listeners(File_Track_System *system, Partition *scratch, void *mem, i32 size);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
get_change_event(File_Track_System *system, u8 *buffer, i32 max); get_change_event(File_Track_System *system, Partition *scratch, u8 *buffer, i32 max);
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
shut_down_track_system(File_Track_System *system); shut_down_track_system(File_Track_System *system, Partition *scratch);
#endif #endif

4
4ed_rendering_helper.cpp
View File

@ -150,8 +150,8 @@ draw_string_base(System_Functions *system, Render_Target *target, Font_ID font_i
for (u32 i = 0; str < str_end; ++str, ++i){ for (u32 i = 0; str < str_end; ++str, ++i){
translating_fully_process_byte(system, font, &tran, *str, i, str_.size, &emits); translating_fully_process_byte(system, font, &tran, *str, i, str_.size, &emits);
for (TRANSLATION_DECL_EMIT_LOOP(j, emits)){ for (TRANSLATION_DECL_EMIT_LOOP(J, emits)){
TRANSLATION_DECL_GET_STEP(step, behavior, j, emits); TRANSLATION_DECL_GET_STEP(step, behavior, J, emits);
if (behavior.do_codepoint_advance){ if (behavior.do_codepoint_advance){
u32 codepoint = step.value; u32 codepoint = step.value;

3
win32_4ed.cpp
View File

@ -74,8 +74,7 @@
#include "4ed_file_track.h" #include "4ed_file_track.h"
#include "4ed_system_shared.h" #include "4ed_system_shared.h"
#include "4ed_file_track_general.cpp" #include "win32_4ed_file_track.cpp"
#include "4ed_file_track_win32.cpp"
// //
// Win32_Vars structs // Win32_Vars structs

42
4ed_file_track_win32.cpp → win32_4ed_file_track.cpp
View File

@ -10,12 +10,13 @@
// TOP // TOP
#include "4ed_file_track.h" #include "4ed_file_track.h"
#include "4ed_file_track_general.cpp"
#include <Windows.h> #include <Windows.h>
typedef struct { typedef struct {
OVERLAPPED overlapped; OVERLAPPED overlapped;
char result[2048]; u16 result[1024];
HANDLE dir; HANDLE dir;
i32 user_count; i32 user_count;
} Win32_Directory_Listener; } Win32_Directory_Listener;
@ -80,21 +81,20 @@ init_track_system(File_Track_System *system, void *table_memory, i32 table_memor
return(result); return(result);
} }
internal i32 internal umem
internal_get_parent_name(char *out, i32 max, char *name){ internal_utf8_file_to_utf16_parent(u16 *out, u32 max, u8 *name){
char *ptr = name; u8 *ptr = name;
for (; *ptr != 0; ++ptr); for (; *ptr != 0; ++ptr);
i32 len = (i32)(ptr - name); umem len = (umem)(ptr - name);
// TODO(allen): make this system real // TODO(allen): make this system real
Assert(len < max); Assert(len < max);
i32 slash_i = len-1; umem slash_i = len-1;
for (;slash_i > 0 && name[slash_i] != '\\' && name[slash_i] != '/';--slash_i); for (;slash_i > 0 && name[slash_i] != '\\' && name[slash_i] != '/';--slash_i);
for (i32 i = 0; i < slash_i; ++i){ b32 error = false;
out[i] = name[i]; slash_i = utf8_to_utf16_minimal_checking(out, max-1, name, len, &error);
}
out[slash_i] = 0; out[slash_i] = 0;
return(slash_i); return(slash_i);
@ -122,7 +122,7 @@ FILE_NOTIFY_CHANGE_CREATION | \
0) 0)
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
add_listener(File_Track_System *system, char *filename){ add_listener(File_Track_System *system, u8 *filename){
File_Track_Result result = FileTrack_Good; File_Track_Result result = FileTrack_Good;
Win32_File_Track_Vars *vars = to_vars(system); Win32_File_Track_Vars *vars = to_vars(system);
@ -131,10 +131,10 @@ add_listener(File_Track_System *system, char *filename){
File_Track_Tables *tables = to_tables(vars); File_Track_Tables *tables = to_tables(vars);
// TODO(allen): make this real! // TODO(allen): make this real!
char dir_name[1024]; u16 dir_name[1024];
internal_get_parent_name(dir_name, sizeof(dir_name), filename); internal_utf8_file_to_utf16_parent(dir_name, ArrayCount(dir_name), filename);
HANDLE dir = CreateFile(dir_name, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, 0); HANDLE dir = CreateFile((LPCWSTR)dir_name, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, 0);
if (dir != INVALID_HANDLE_VALUE){ if (dir != INVALID_HANDLE_VALUE){
BY_HANDLE_FILE_INFORMATION dir_info = {0}; BY_HANDLE_FILE_INFORMATION dir_info = {0};
@ -204,7 +204,7 @@ add_listener(File_Track_System *system, char *filename){
} }
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
remove_listener(File_Track_System *system, char *filename){ remove_listener(File_Track_System *system, u8 *filename){
File_Track_Result result = FileTrack_Good; File_Track_Result result = FileTrack_Good;
Win32_File_Track_Vars *vars = to_vars(system); Win32_File_Track_Vars *vars = to_vars(system);
@ -213,10 +213,10 @@ remove_listener(File_Track_System *system, char *filename){
File_Track_Tables *tables = to_tables(vars); File_Track_Tables *tables = to_tables(vars);
// TODO(allen): make this real! // TODO(allen): make this real!
char dir_name[1024]; u16 dir_name[1024];
internal_get_parent_name(dir_name, sizeof(dir_name), filename); internal_utf8_file_to_utf16_parent(dir_name, ArrayCount(dir_name), filename);
HANDLE dir = CreateFile(dir_name, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, 0); HANDLE dir = CreateFile((LPCWSTR)dir_name, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, 0);
if (dir != INVALID_HANDLE_VALUE){ if (dir != INVALID_HANDLE_VALUE){
BY_HANDLE_FILE_INFORMATION dir_info = {0}; BY_HANDLE_FILE_INFORMATION dir_info = {0};
@ -293,13 +293,13 @@ expand_track_system_listeners(File_Track_System *system, void *mem, i32 size){
} }
FILE_TRACK_LINK File_Track_Result FILE_TRACK_LINK File_Track_Result
get_change_event(File_Track_System *system, char *buffer, i32 max, i32 *size){ get_change_event(File_Track_System *system, u8 *buffer, i32 max, i32 *size){
File_Track_Result result = FileTrack_NoMoreEvents; File_Track_Result result = FileTrack_NoMoreEvents;
Win32_File_Track_Vars *vars = to_vars(system); Win32_File_Track_Vars *vars = to_vars(system);
local_persist i32 has_buffered_event = 0; local_persist i32 has_buffered_event = 0;
local_persist DWORD offset = 0; local_persist DWORD offset = 0;
local_persist Win32_Directory_Listener listener; local_persist Win32_Directory_Listener listener = {0};
EnterCriticalSection(&vars->table_lock); EnterCriticalSection(&vars->table_lock);
@ -339,9 +339,7 @@ get_change_event(File_Track_System *system, char *buffer, i32 max, i32 *size){
i32 req_size = dir_len + 1 + len; i32 req_size = dir_len + 1 + len;
*size = req_size; *size = req_size;
if (req_size < max){ if (req_size < max){
i32 pos = 0; i32 pos = GetFinalPathNameByHandle(listener.dir, buffer, max, FILE_NAME_NORMALIZED);
pos = GetFinalPathNameByHandle(listener.dir, buffer, max, FILE_NAME_NORMALIZED);
buffer[pos++] = '\\'; buffer[pos++] = '\\';
for (i32 i = 0; i < len; ++i, ++pos){ for (i32 i = 0; i < len; ++i, ++pos){