test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-01 19:49:11 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix windows gcc 14.x build errors

Browse Source
This commit is contained in:
lixianjing 2024-08-16 18:47:15 +08:00
parent 1c2937e4d1
commit 947b4f57ae
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rd/nativefiledialog/src/nfd_win.cpp
View File

@ -367,7 +367,7 @@ static nfdresult_t SetDefaultPath( IFileDialog *dialog, const char *defaultPath
if ( !SUCCEEDED(result) )
{
printf("%08x %08x\n", (int)result, GetLastError());
printf("%08x %08lx\n", (int)result, GetLastError());
NFDi_SetError("Error creating ShellItem");
NFDi_Free( defaultPathW );
return NFD_ERROR;
@ -484,6 +484,7 @@ nfdresult_t NFD_OpenDialogMultiple( const nfdchar_t *filterList,
HRESULT coResult = COMInit();
HWND parent_window = GetActiveWindow();
if (!COMIsInitialized(coResult))
{
NFDi_SetError("Could not initialize COM.");
@ -531,7 +532,6 @@ nfdresult_t NFD_OpenDialogMultiple( const nfdchar_t *filterList,
}
// Show the dialog.
HWND parent_window = GetActiveWindow();
result = fileOpenDialog->Show(parent_window);
if ( SUCCEEDED(result) )
{

1
docs/changes.md
View File

@ -4,6 +4,7 @@
* 修复编译警告。
* 修复cppcheck报告的警告。
* 修复脚本绑定时遇到的一些问题。
* 修复windows gcc 14.x 编译问题。
* 修复桌面模式对话框没有指定父窗口句柄的问题(感谢颖健提供补丁)
2024/08/15

2
src/charset/encoding.c
View File

@ -82,7 +82,7 @@ static ret_t encoding_convert_impl(encoding_name_t from, const char* from_str, u
memset(to_str, 0, to_size);
if (iconv(icv, pin, &inlen, pout, &outlen) < 0) {
if (iconv(icv, (const char**)pin, &inlen, pout, &outlen) < 0) {
ret = RET_FAIL;
}

2
src/streams/process/process_helper.c
View File

@ -239,7 +239,7 @@ int32_t process_read(process_handle_t handle, uint8_t* buff, uint32_t max_size)
}
int32_t process_write(process_handle_t handle, const uint8_t* buff, uint32_t max_size) {
uint32_t size = 0;
DWORD size = 0;
return_value_if_fail(handle != NULL && buff != NULL, -1);
goto_error_if_fail(WriteFile(handle->h_std_in_wr, buff, max_size, &size, NULL));