March 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : imm32/tests: Test ImmEscape with the installed IME.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: c959a58801183ef407cc2d2b4a149bafa8eb014c URL: https://gitlab.winehq.org/wine/wine/-/commit/c959a58801183ef407cc2d2b4a149b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 19:33:43 2023 +0100 imm32/tests: Test ImmEscape with the installed IME. --- dlls/imm32/tests/imm32.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d3eec2ab580..e57da7b7ff0 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -55,6 +55,18 @@ static const char *debugstr_ok( const char *cond ) t v = (r); \ ok( v == (e), "%s " f "\n", debugstr_ok( #r ), v, ##__VA_ARGS__ ); \ } while (0) +#define ok_wcs( e, r ) \ + do \ + { \ + const WCHAR *v = (r); \ + ok( !wcscmp( v, (e) ), "%s %s\n", debugstr_ok(#r), debugstr_w(v) ); \ + } while (0) +#define ok_str( e, r ) \ + do \ + { \ + const char *v = (r); \ + ok( !strcmp( v, (e) ), "%s %s\n", debugstr_ok(#r), debugstr_a(v) ); \ + } while (0) #define ok_ret( e, r ) ok_eq( e, r, UINT_PTR, "%Iu, error %ld", GetLastError() ) BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); @@ -2459,6 +2471,7 @@ static BOOL todo_ImeInquire; DEFINE_EXPECT( ImeInquire ); static BOOL todo_ImeDestroy; DEFINE_EXPECT( ImeDestroy ); +DEFINE_EXPECT( ImeEscape ); static BOOL todo_IME_DLL_PROCESS_ATTACH; DEFINE_EXPECT( IME_DLL_PROCESS_ATTACH ); static BOOL todo_IME_DLL_PROCESS_DETACH; @@ -2522,7 +2535,40 @@ static UINT WINAPI ime_ImeEnumRegisterWord( REGISTERWORDENUMPROCW proc, const WC static LRESULT WINAPI ime_ImeEscape( HIMC himc, UINT escape, void *data ) { ime_trace( "himc %p, escape %#x, data %p\n", himc, escape, data ); - ok( 0, "unexpected call\n" ); + + CHECK_EXPECT( ImeEscape ); + + switch (escape) + { + case IME_ESC_SET_EUDC_DICTIONARY: + if (!data) return 4; + if (ime_info.fdwProperty & IME_PROP_UNICODE) + { + todo_wine_if(*(WCHAR *)data != 'E') + ok_wcs( L"EscapeIme", data ); + } + else + { + todo_wine_if(*(char *)data != 'E') + ok_str( "EscapeIme", data ); + } + /* fallthrough */ + case IME_ESC_QUERY_SUPPORT: + case IME_ESC_SEQUENCE_TO_INTERNAL: + case IME_ESC_GET_EUDC_DICTIONARY: + case IME_ESC_MAX_KEY: + case IME_ESC_IME_NAME: + case IME_ESC_HANJA_MODE: + case IME_ESC_GETHELPFILENAME: + if (!data) return 4; + if (ime_info.fdwProperty & IME_PROP_UNICODE) wcscpy( data, L"ImeEscape" ); + else strcpy( data, "ImeEscape" ); + return 4; + } + + ok_eq( 0xdeadbeef, escape, UINT, "%#x" ); + ok_eq( NULL, data, void *, "%p" ); + return TRUE; } @@ -3144,6 +3190,116 @@ cleanup: SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); } +static void test_ImmEscape( BOOL unicode ) +{ + HKL hkl = GetKeyboardLayout( 0 ); + DWORD i, codes[] = + { + IME_ESC_QUERY_SUPPORT, + IME_ESC_SEQUENCE_TO_INTERNAL, + IME_ESC_GET_EUDC_DICTIONARY, + IME_ESC_SET_EUDC_DICTIONARY, + IME_ESC_MAX_KEY, + IME_ESC_IME_NAME, + IME_ESC_HANJA_MODE, + IME_ESC_GETHELPFILENAME, + }; + WCHAR bufferW[512]; + char bufferA[512]; + + SET_ENABLE( ImeEscape, TRUE ); + + winetest_push_context( unicode ? "unicode" : "ansi" ); + + SetLastError( 0xdeadbeef ); + ok_ret( 0, ImmEscapeW( hkl, 0, 0, NULL ) ); + ok_ret( 0, ImmEscapeA( hkl, 0, 0, NULL ) ); + todo_wine + ok_ret( 0xdeadbeef, GetLastError() ); + + /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ + ime_info.fdwProperty = IME_PROP_END_UNLOAD; + if (unicode) ime_info.fdwProperty |= IME_PROP_UNICODE; + + if (!(hkl = ime_install())) goto cleanup; + + for (i = 0; i < ARRAY_SIZE(codes); ++i) + { + winetest_push_context( "esc %#lx", codes[i] ); + + SET_EXPECT( ImeEscape ); + ok_ret( 4, ImmEscapeW( hkl, 0, codes[i], NULL ) ); + CHECK_CALLED( ImeEscape ); + + SET_EXPECT( ImeEscape ); + memset( bufferW, 0xcd, sizeof(bufferW) ); + if (codes[i] == IME_ESC_SET_EUDC_DICTIONARY) wcscpy( bufferW, L"EscapeIme" ); + ok_ret( 4, ImmEscapeW( hkl, 0, codes[i], bufferW ) ); + if (unicode || codes[i] == IME_ESC_GET_EUDC_DICTIONARY || codes[i] == IME_ESC_IME_NAME || + codes[i] == IME_ESC_GETHELPFILENAME) + { + ok_wcs( L"ImeEscape", bufferW ); + ok_eq( 0xcdcd, bufferW[10], WORD, "%#x" ); + } + else if (codes[i] == IME_ESC_SET_EUDC_DICTIONARY) + { + ok_wcs( L"EscapeIme", bufferW ); + ok_eq( 0xcdcd, bufferW[10], WORD, "%#x" ); + } + else if (codes[i] == IME_ESC_HANJA_MODE) + { + todo_wine + ok_eq( 0xcdcd, bufferW[0], WORD, "%#x" ); + } + else + { + ok( !memcmp( bufferW, "ImeEscape", 10 ), "got bufferW %s\n", debugstr_w(bufferW) ); + ok_eq( 0xcdcd, bufferW[5], WORD, "%#x" ); + } + CHECK_CALLED( ImeEscape ); + + SET_EXPECT( ImeEscape ); + ok_ret( 4, ImmEscapeA( hkl, 0, codes[i], NULL ) ); + CHECK_CALLED( ImeEscape ); + + SET_EXPECT( ImeEscape ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + if (codes[i] == IME_ESC_SET_EUDC_DICTIONARY) strcpy( bufferA, "EscapeIme" ); + ok_ret( 4, ImmEscapeA( hkl, 0, codes[i], bufferA ) ); + if (!unicode || codes[i] == IME_ESC_GET_EUDC_DICTIONARY || codes[i] == IME_ESC_IME_NAME || + codes[i] == IME_ESC_GETHELPFILENAME) + { + ok_str( "ImeEscape", bufferA ); + ok_eq( 0xcd, bufferA[10], BYTE, "%#x" ); + } + else if (codes[i] == IME_ESC_SET_EUDC_DICTIONARY) + { + ok_str( "EscapeIme", bufferA ); + ok_eq( 0xcd, bufferA[10], BYTE, "%#x" ); + } + else if (codes[i] == IME_ESC_HANJA_MODE) + { + todo_wine + ok_eq( 0xcd, bufferA[0], BYTE, "%#x" ); + } + else + { + ok( !memcmp( bufferA, L"ImeEscape", 10 * sizeof(WCHAR) ), "got bufferA %s\n", debugstr_a(bufferA) ); + ok_eq( 0xcd, bufferA[20], BYTE, "%#x" ); + } + CHECK_CALLED( ImeEscape ); + + winetest_pop_context(); + } + + ime_cleanup( hkl ); + +cleanup: + SET_ENABLE( ImeEscape, FALSE ); + + winetest_pop_context(); +} + START_TEST(imm32) { if (!is_ime_enabled()) @@ -3160,6 +3316,9 @@ START_TEST(imm32) test_ImmIsIME(); test_ImmGetProperty(); + test_ImmEscape( FALSE ); + test_ImmEscape( TRUE ); + if (init()) { test_ImmNotifyIME();

1 0

Rémi Bernon : imm32/tests: Test ImmIsIME with the installed IME.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: bb8bcf492c80dcd24cd0469d6da01a4837eeaa29 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb8bcf492c80dcd24cd0469d6da01a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 22:46:00 2023 +0100 imm32/tests: Test ImmIsIME with the installed IME. --- dlls/imm32/tests/imm32.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3d12043b0c4..31b02d7ca1b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -35,6 +35,28 @@ #include "ime_test.h" +static const char *debugstr_ok( const char *cond ) +{ + int c, n = 0; + /* skip possible casts */ + while ((c = *cond++)) + { + if (c == '(') n++; + if (!n) break; + if (c == ')') n--; + } + if (!strchr( cond - 1, '(' )) return wine_dbg_sprintf( "got %s", cond - 1 ); + return wine_dbg_sprintf( "%.*s returned", (int)strcspn( cond - 1, "( " ), cond - 1 ); +} + +#define ok_eq( e, r, t, f, ... ) \ + do \ + { \ + t v = (r); \ + ok( v == (e), "%s " f "\n", debugstr_ok( #r ), v, ##__VA_ARGS__ ); \ + } while (0) +#define ok_ret( e, r ) ok_eq( e, r, UINT_PTR, "%Iu, error %ld", GetLastError() ) + BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); @@ -2433,9 +2455,13 @@ static void test_ImmDisableIME(void) #define ime_trace( msg, ... ) if (winetest_debug > 1) trace( "%04lx:%s " msg, GetCurrentThreadId(), __func__, ## __VA_ARGS__ ) +static BOOL todo_ImeInquire; DEFINE_EXPECT( ImeInquire ); +static BOOL todo_ImeDestroy; DEFINE_EXPECT( ImeDestroy ); +static BOOL todo_IME_DLL_PROCESS_ATTACH; DEFINE_EXPECT( IME_DLL_PROCESS_ATTACH ); +static BOOL todo_IME_DLL_PROCESS_DETACH; DEFINE_EXPECT( IME_DLL_PROCESS_DETACH ); static IMEINFO ime_info; @@ -2476,6 +2502,7 @@ static BOOL WINAPI ime_ImeDestroy( UINT force ) { ime_trace( "force %u\n", force ); + todo_wine_if( todo_ImeDestroy ) CHECK_EXPECT( ImeDestroy ); ok( !force, "got force %u\n", force ); @@ -2519,6 +2546,7 @@ static BOOL WINAPI ime_ImeInquire( IMEINFO *info, WCHAR *ui_class, DWORD flags ) { ime_trace( "info %p, ui_class %p, flags %#lx\n", info, ui_class, flags ); + todo_wine_if( todo_ImeInquire ) CHECK_EXPECT( ImeInquire ); ok( !!info, "got info %p\n", info ); @@ -2606,11 +2634,13 @@ static BOOL WINAPI ime_DllMain( HINSTANCE instance, DWORD reason, LPVOID reserve DisableThreadLibraryCalls( instance ); ime_ui_class.hInstance = instance; RegisterClassExW( &ime_ui_class ); + todo_wine_if(todo_IME_DLL_PROCESS_ATTACH) CHECK_EXPECT( IME_DLL_PROCESS_ATTACH ); break; case DLL_PROCESS_DETACH: UnregisterClassW( ime_ui_class.lpszClassName, instance ); + todo_wine_if(todo_IME_DLL_PROCESS_DETACH) CHECK_EXPECT( IME_DLL_PROCESS_DETACH ); break; } @@ -2829,6 +2859,45 @@ cleanup: SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); } +static void test_ImmIsIME(void) +{ + HKL hkl = GetKeyboardLayout( 0 ); + + SET_ENABLE( IME_DLL_PROCESS_ATTACH, TRUE ); + SET_ENABLE( ImeInquire, TRUE ); + SET_ENABLE( ImeDestroy, TRUE ); + SET_ENABLE( IME_DLL_PROCESS_DETACH, TRUE ); + + SetLastError( 0xdeadbeef ); + todo_wine + ok_ret( 0, ImmIsIME( 0 ) ); + ok_ret( 0xdeadbeef, GetLastError() ); + ok_ret( 1, ImmIsIME( hkl ) ); + + /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ + ime_info.fdwProperty = IME_PROP_END_UNLOAD; + + if (!(hkl = ime_install())) goto cleanup; + + todo_ImeInquire = TRUE; + todo_ImeDestroy = TRUE; + todo_IME_DLL_PROCESS_ATTACH = TRUE; + todo_IME_DLL_PROCESS_DETACH = TRUE; + ok_ret( 1, ImmIsIME( hkl ) ); + todo_IME_DLL_PROCESS_ATTACH = FALSE; + todo_IME_DLL_PROCESS_DETACH = FALSE; + todo_ImeInquire = FALSE; + todo_ImeDestroy = FALSE; + + ime_cleanup( hkl ); + +cleanup: + SET_ENABLE( IME_DLL_PROCESS_ATTACH, FALSE ); + SET_ENABLE( ImeInquire, FALSE ); + SET_ENABLE( ImeDestroy, FALSE ); + SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); +} + static void test_ImmGetDescription(void) { HKL hkl = GetKeyboardLayout( 0 ); @@ -2996,6 +3065,7 @@ START_TEST(imm32) test_ImmInstallIME(); test_ImmGetDescription(); test_ImmGetIMEFileName(); + test_ImmIsIME(); if (init()) {

1 0

Rémi Bernon : imm32/tests: Test ImmRegisterWord with the installed IME.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: eab785a358debb4a08c0657df6cd097fed6b4bcc URL: https://gitlab.winehq.org/wine/wine/-/commit/eab785a358debb4a08c0657df6cd09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 19 11:55:56 2023 +0100 imm32/tests: Test ImmRegisterWord with the installed IME. --- dlls/imm32/tests/imm32.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b480923ede8..59cab52588e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2473,6 +2473,7 @@ static BOOL todo_ImeDestroy; DEFINE_EXPECT( ImeDestroy ); DEFINE_EXPECT( ImeEscape ); DEFINE_EXPECT( ImeEnumRegisterWord ); +DEFINE_EXPECT( ImeRegisterWord ); static BOOL todo_IME_DLL_PROCESS_ATTACH; DEFINE_EXPECT( IME_DLL_PROCESS_ATTACH ); static BOOL todo_IME_DLL_PROCESS_DETACH; @@ -2643,7 +2644,21 @@ static BOOL WINAPI ime_ImeProcessKey( HIMC himc, UINT vkey, LPARAM key_data, BYT static BOOL WINAPI ime_ImeRegisterWord( const WCHAR *reading, DWORD style, const WCHAR *string ) { ime_trace( "reading %s, style %lu, string %s\n", debugstr_w(reading), style, debugstr_w(string) ); - ok( 0, "unexpected call\n" ); + + CHECK_EXPECT( ImeRegisterWord ); + + if (style) ok_eq( 0xdeadbeef, style, UINT, "%#x" ); + if (ime_info.fdwProperty & IME_PROP_UNICODE) + { + if (reading) ok_wcs( L"Reading", reading ); + if (string) ok_wcs( L"String", string ); + } + else + { + if (reading) ok_str( "Reading", (char *)reading ); + if (string) ok_str( "String", (char *)string ); + } + return FALSE; } @@ -3394,6 +3409,68 @@ cleanup: winetest_pop_context(); } +static void test_ImmRegisterWord( BOOL unicode ) +{ + HKL hkl = GetKeyboardLayout( 0 ); + + SET_ENABLE( ImeRegisterWord, TRUE ); + + winetest_push_context( unicode ? "unicode" : "ansi" ); + + SetLastError( 0xdeadbeef ); + ok_ret( 0, ImmRegisterWordW( NULL, NULL, 0, NULL ) ); + ok_ret( 0, ImmRegisterWordA( NULL, NULL, 0, NULL ) ); + ok_ret( 0, ImmRegisterWordW( hkl, NULL, 0, NULL ) ); + ok_ret( 0, ImmRegisterWordA( hkl, NULL, 0, NULL ) ); + todo_wine + ok_ret( 0xdeadbeef, GetLastError() ); + + /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ + ime_info.fdwProperty = IME_PROP_END_UNLOAD; + if (unicode) ime_info.fdwProperty |= IME_PROP_UNICODE; + + if (!(hkl = ime_install())) goto cleanup; + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordW( hkl, NULL, 0, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordA( hkl, NULL, 0, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordW( hkl, L"Reading", 0, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordA( hkl, "Reading", 0, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordW( hkl, NULL, 0xdeadbeef, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordA( hkl, NULL, 0xdeadbeef, NULL ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordW( hkl, NULL, 0, L"String" ) ); + CHECK_CALLED( ImeRegisterWord ); + + SET_EXPECT( ImeRegisterWord ); + ok_ret( 0, ImmRegisterWordA( hkl, NULL, 0, "String" ) ); + CHECK_CALLED( ImeRegisterWord ); + + ime_cleanup( hkl ); + +cleanup: + SET_ENABLE( ImeRegisterWord, FALSE ); + + winetest_pop_context(); +} + START_TEST(imm32) { if (!is_ime_enabled()) @@ -3414,6 +3491,8 @@ START_TEST(imm32) test_ImmEscape( TRUE ); test_ImmEnumRegisterWord( FALSE ); test_ImmEnumRegisterWord( TRUE ); + test_ImmRegisterWord( FALSE ); + test_ImmRegisterWord( TRUE ); if (init()) {

1 0

Rémi Bernon : imm32/tests: Use LANG_INVARIANT for the installed IME.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 7f5007f19737449a147d7c4ae356a515df264854 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f5007f19737449a147d7c4ae356a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 11:25:34 2023 +0100 imm32/tests: Use LANG_INVARIANT for the installed IME. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54669 --- dlls/imm32/tests/ime_wrapper.rc | 2 +- dlls/imm32/tests/imm32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/ime_wrapper.rc b/dlls/imm32/tests/ime_wrapper.rc index 6844b62195b..812754ce4ce 100644 --- a/dlls/imm32/tests/ime_wrapper.rc +++ b/dlls/imm32/tests/ime_wrapper.rc @@ -18,7 +18,7 @@ #pragma makedep testdll -#define WINE_LANGID 0400 +#define WINE_LANGID 047f #define WINE_FILETYPE VFT_DRV #define WINE_FILESUBTYPE VFT2_DRV_INPUTMETHOD #define WINE_FILENAME "ime_wrapper" diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7c376287993..3d12043b0c4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2683,7 +2683,7 @@ static HKL ime_install(void) hkl = ImmInstallIMEW( ime_path, L"WineTest IME" ); todo_wine - ok( hkl == (HKL)(int)0xe0200400, "ImmInstallIMEW returned %p, error %lu\n", hkl, GetLastError() ); + ok( hkl == (HKL)(int)0xe020047f, "ImmInstallIMEW returned %p, error %lu\n", hkl, GetLastError() ); swprintf( buffer, ARRAY_SIZE(buffer), L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08x", hkl ); ret = RegOpenKeyW( HKEY_LOCAL_MACHINE, buffer, &hkey );

1 0

Rémi Bernon : widl: Use open_input_file to open the main input.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 7ebf75f92d3a2a198e3144fca5a08ff305d7dac6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ebf75f92d3a2a198e3144fca5a08f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use open_input_file to open the main input. --- tools/widl/widl.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 513fbe507f7..2cb1b59ac45 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -701,7 +701,6 @@ int main(int argc,char *argv[]) int i; int ret = 0; struct strarray files; - char *input; init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); @@ -835,27 +834,8 @@ int main(int argc,char *argv[]) wpp_add_cmdline_define("_WIN32=1"); atexit(rm_tempfile); - input = input_name; if (preprocess_only) exit( wpp_parse( input_name, stdout ) ); - - if (!no_preprocess) - { - FILE *output; - char *name; - - name = make_temp_file( header_name, NULL ); - if (!(output = fopen( name, "wt" ))) error( "Could not open fd %s for writing\n", name ); - ret = wpp_parse( input_name, output ); - fclose( output ); - input = name; - - if (ret) exit( 1 ); - } - - if(!(parser_in = fopen(input, "r"))) { - fprintf(stderr, "Could not open %s for input\n", input); - return 1; - } + parser_in = open_input_file( input_name ); header_token = make_token(header_name);

1 0

Rémi Bernon : widl: Introduce new (open|close)_input_file helpers.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 39da05201273a72f72a2ac9d011b84685869225d URL: https://gitlab.winehq.org/wine/wine/-/commit/39da05201273a72f72a2ac9d011b84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 09:48:20 2023 +0100 widl: Introduce new (open|close)_input_file helpers. --- tools/widl/parser.h | 3 ++- tools/widl/parser.l | 51 +++++++++++---------------------------------------- tools/widl/widl.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index abe215de02f..81418fca160 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -37,6 +37,7 @@ int is_type(const char *name); int do_warning(const char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); -extern char *temp_name; +extern char *find_input_file( const char *name, const char *parent ); +extern FILE *open_input_file( const char *path ); #endif diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 89383fe810e..92955516e9e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -524,6 +524,7 @@ void pop_import(void) if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( state->buffer ); + free( input_name ); input_name = state->input_name; line_number = state->line_number; free( state ); @@ -532,10 +533,8 @@ void pop_import(void) void push_import( char *import_name ) { struct import_state *state; - FILE *f; - char *path, *name; struct import *import; - int ret; + FILE *file; state = xmalloc( sizeof(struct import_state )); list_add_head( &import_stack, &state->entry ); @@ -556,55 +555,27 @@ void push_import( char *import_name ) import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( import_name, '/' ) || strchr( import_name, '\\' )) - path = xstrdup( import_name ); - else if (!(path = wpp_find_include( import_name, input_name ))) - error_loc( "Unable to open include file %s\n", import_name ); - - input_name = path; + input_name = find_input_file( import_name, input_name ); + file = open_input_file( input_name ); line_number = 1; - name = make_temp_file( "widl-pp", NULL ); - if (!(f = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); - - if((f = fopen(name, "r")) == NULL) - error_loc("Unable to open %s\n", name); - - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } static void switch_to_acf(void) { - char *name; - int ret; - FILE *f; + FILE *file; if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); + free( input_name ); - input_name = acf_name; - acf_name = NULL; + input_name = xstrdup( acf_name ); + file = open_input_file( input_name ); line_number = 1; + acf_name = NULL; - name = make_temp_file( "widl-acf", NULL ); - if (!(f = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse(input_name, f); - fclose(f); - if (ret) exit(1); - - if((f = fopen(name, "r")) == NULL) - error_loc("Unable to open %s\n", name); - - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } static void warning_disable(int warning) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7ed3bfd1f8c..7c83b4b3ac0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -893,3 +893,30 @@ static void rm_tempfile(void) unlink(typelib_name); remove_temp_files(); } + +char *find_input_file( const char *name, const char *parent ) +{ + char *path; + + /* don't search for a file name with a path in the include directories, for compatibility with MIDL */ + if (strchr( name, '/' ) || strchr( name, '\\' )) path = xstrdup( name ); + else if (!(path = wpp_find_include( name, parent ))) error_loc( "Unable to open include file %s\n", name ); + + return path; +} + +FILE *open_input_file( const char *path ) +{ + FILE *file; + char *name; + int ret; + + name = make_temp_file( "widl", NULL ); + if (!(file = fopen( name, "wt" ))) error_loc( "Could not open %s for writing\n", name ); + ret = wpp_parse( path, file ); + fclose( file ); + if (ret) exit( 1 ); + + if (!(file = fopen( name, "r" ))) error_loc( "Unable to open %s\n", name ); + return file; +}

1 0

Rémi Bernon : widl: Respect -N flag for imported files preprocessing.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 1a0a61785058b63ad46617d21e6a0a530b003618 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a0a61785058b63ad46617d21e6a0a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:23:45 2023 +0100 widl: Respect -N flag for imported files preprocessing. --- tools/widl/widl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7c83b4b3ac0..513fbe507f7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -911,6 +911,12 @@ FILE *open_input_file( const char *path ) char *name; int ret; + if (no_preprocess) + { + if (!(file = fopen( path, "r" ))) error_loc( "Unable to open %s\n", path ); + return file; + } + name = make_temp_file( "widl", NULL ); if (!(file = fopen( name, "wt" ))) error_loc( "Could not open %s for writing\n", name ); ret = wpp_parse( path, file );

1 0

Rémi Bernon : widl: Use a struct list for the import stack.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 9d537999e315a74ef559fabb79d5b632b8a00208 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d537999e315a74ef559fabb79d5b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:05:44 2023 +0100 widl: Use a struct list for the import stack. --- tools/widl/parser.h | 4 +--- tools/widl/parser.l | 66 ++++++++++++++++++++++++++++++----------------------- tools/widl/widl.c | 2 -- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index f465fafa03c..abe215de02f 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -28,12 +28,10 @@ extern char *parser_text; extern int parser_debug; extern int yy_flex_debug; -extern int import_stack_ptr; +extern int parse_only; void push_import( char *import_name ); void pop_import(void); -#define parse_only import_stack_ptr - int is_type(const char *name); int do_warning(const char *toggle, warning_list_t *wnum); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 47783cbacb3..89383fe810e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -81,13 +81,15 @@ static void switch_to_acf(void); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 20 -struct { - YY_BUFFER_STATE state; - char *input_name; - int line_number; -} import_stack[MAX_IMPORT_DEPTH]; -int import_stack_ptr = 0; +struct import_state +{ + YY_BUFFER_STATE buffer; + char *input_name; + int line_number; + struct list entry; +}; +static struct list import_stack = LIST_INIT( import_stack ); +int parse_only = 0; struct import { @@ -159,7 +161,8 @@ struct uuid *parse_uuid(const char *u) } <PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; <PP_PRAGMA>winrt[^\n]* { - if(import_stack_ptr) { + if (!list_empty( &import_stack )) + { if(!winrt_mode) error_loc("winrt IDL file imported in non-winrt mode\n"); }else { @@ -234,7 +237,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) + if (!list_empty( &import_stack )) return aEOF; if (acf_name) { @@ -510,32 +513,38 @@ static char *get_buffered_cstring(void) void pop_import(void) { - int ptr = import_stack_ptr-1; - - if (yyin) fclose( yyin ); - yy_delete_buffer( YY_CURRENT_BUFFER ); - yy_switch_to_buffer( import_stack[ptr].state ); - input_name = import_stack[ptr].input_name; - line_number = import_stack[ptr].line_number; - import_stack_ptr--; + struct list *entry = list_head( &import_stack ); + struct import_state *state; + assert( entry ); + + state = LIST_ENTRY( entry, struct import_state, entry ); + list_remove( &state->entry ); + parse_only = !list_empty( &import_stack ); + + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer( state->buffer ); + input_name = state->input_name; + line_number = state->line_number; + free( state ); } void push_import( char *import_name ) { + struct import_state *state; FILE *f; char *path, *name; struct import *import; - int ptr = import_stack_ptr; int ret; - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); + state = xmalloc( sizeof(struct import_state )); + list_add_head( &import_stack, &state->entry ); + parse_only = !list_empty( &import_stack ); - import_stack[ptr].state = YY_CURRENT_BUFFER; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - yyin = NULL; + state->buffer = YY_CURRENT_BUFFER; + state->input_name = input_name; + state->line_number = line_number; + input_name = NULL; /* reset buffer for <<EOF>>, in case import fails or already imported */ yy_scan_string( "" ); @@ -573,12 +582,12 @@ void push_import( char *import_name ) static void switch_to_acf(void) { - int ptr = import_stack_ptr; - int ret; char *name; + int ret; FILE *f; - assert(import_stack_ptr == 0); + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); input_name = acf_name; acf_name = NULL; @@ -595,7 +604,6 @@ static void switch_to_acf(void) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1bc52a2a3a2..f259f0abe20 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -871,8 +871,6 @@ int main(int argc,char *argv[]) init_types(); ret = parser_parse(); - fclose(parser_in); - if(ret) { exit(1); }

1 0

Rémi Bernon : widl: Handle preprocess-only case separately.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: a6ab03dcd58a5ea954072aff36d310fb578f8031 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6ab03dcd58a5ea954072aff36d310… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Handle preprocess-only case separately. --- tools/widl/widl.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f259f0abe20..7ed3bfd1f8c 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -836,29 +836,20 @@ int main(int argc,char *argv[]) atexit(rm_tempfile); input = input_name; + if (preprocess_only) exit( wpp_parse( input_name, stdout ) ); + if (!no_preprocess) { - chat("Starting preprocess\n"); - - if (!preprocess_only) - { - FILE *output; - char *name = make_temp_file( header_name, NULL ); - - if (!(output = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); + FILE *output; + char *name; - ret = wpp_parse( input_name, output ); - fclose( output ); - input = name; - } - else - { - ret = wpp_parse( input_name, stdout ); - } + name = make_temp_file( header_name, NULL ); + if (!(output = fopen( name, "wt" ))) error( "Could not open fd %s for writing\n", name ); + ret = wpp_parse( input_name, output ); + fclose( output ); + input = name; - if(ret) exit(1); - if(preprocess_only) exit(0); + if (ret) exit( 1 ); } if(!(parser_in = fopen(input, "r"))) {

1 0

Rémi Bernon : widl: Simplify handling of already parsed imports.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 5deda2de3fb6ddcf8d84ed8245597a7b46020df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5deda2de3fb6ddcf8d84ed8245597a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:02:38 2023 +0100 widl: Simplify handling of already parsed imports. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 36 ++++++++++++++++++++---------------- tools/widl/parser.y | 15 ++++----------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 83832ecfcd8..f465fafa03c 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -29,7 +29,7 @@ extern int parser_debug; extern int yy_flex_debug; extern int import_stack_ptr; -int do_import(char *fname); +void push_import( char *import_name ); void pop_import(void); #define parse_only import_stack_ptr diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 710b6e37636..47783cbacb3 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -512,7 +512,7 @@ void pop_import(void) { int ptr = import_stack_ptr-1; - fclose(yyin); + if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( import_stack[ptr].state ); input_name = import_stack[ptr].input_name; @@ -520,7 +520,7 @@ void pop_import(void) import_stack_ptr--; } -int do_import(char *fname) +void push_import( char *import_name ) { FILE *f; char *path, *name; @@ -528,26 +528,32 @@ int do_import(char *fname) int ptr = import_stack_ptr; int ret; + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + yyin = NULL; + + /* reset buffer for <<EOF>>, in case import fails or already imported */ + yy_scan_string( "" ); + LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) - if (!strcmp( import->name, fname )) return 0; /* already imported */ + if (!strcmp( import->name, import_name )) return; /* already imported */ import = xmalloc( sizeof(struct import) ); - import->name = xstrdup( fname ); + import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); + if (strchr( import_name, '/' ) || strchr( import_name, '\\' )) + path = xstrdup( import_name ); + else if (!(path = wpp_find_include( import_name, input_name ))) + error_loc( "Unable to open include file %s\n", import_name ); - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); - - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; input_name = path; line_number = 1; @@ -562,9 +568,7 @@ int do_import(char *fname) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; } static void switch_to_acf(void) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6777a281ec7..031e5482792 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -331,7 +331,7 @@ int parser_lex( PARSER_STYPE *yylval ); %type <str> libraryhdr callconv cppquote importlib import %type <str> typename m_typename %type <uuid> uuid_string -%type <import> import_start +%type <str> import_start %type <typelib> library_start librarydef %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements @@ -504,17 +504,10 @@ typedecl: cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } ; -import_start: tIMPORT aSTRING ';' { $$ = xmalloc(sizeof(struct _import_t)); - $$->name = $2; - $$->import_performed = do_import($2); - if (!$$->import_performed) yychar = aEOF; - } - ; -import: import_start imp_statements aEOF { $$ = $1->name; - if ($1->import_performed) pop_import(); - free($1); - } +import_start: tIMPORT aSTRING ';' { $$ = $2; push_import($2); } + ; +import: import_start imp_statements aEOF { pop_import(); } ; importlib: tIMPORTLIB '(' aSTRING ')'

1 0