March 2026 - Wine-GitLab - list.winehq.org

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > DeleteFileA( long_path ); > } > > +static void test_getmodulefilename_string_termination(void) You could expand the test to cover basic `GetModuleFileName()` behaviors, and rename the function to `test_GetModuleFileName` accordingly. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132025

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > DeleteFileA( long_path ); > } > > +static void test_getmodulefilename_string_termination(void) > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); > + ok(dll_name_len > 0, "can't get path for NULL module\n"); > + ok(dll_name_len < MAX_PATH, "unterminated path for NULL module\n"); > + > + memset(dll_name, 0x9, sizeof(dll_name)); > + GetModuleFileNameW(NULL, dll_name, dll_name_len); Since the buffer is insufficient, you should check the value of `GetLastError()`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132024

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > + char dll_name_a[MAX_PATH]; > + HMODULE mod; > + > + nt_header.FileHeader.NumberOfSections = 1; > + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); > + > + nt_header.OptionalHeader.SectionAlignment = page_size; > + nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; > + nt_header.OptionalHeader.FileAlignment = page_size; > + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); > + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; > + > + create_test_dll( &dos_header, sizeof(dos_header), &nt_header, dll_name_a ); > + mod = LoadLibraryA( dll_name_a ); > + ok(mod != NULL, "can't load test dll\n"); > + if (mod != NULL) This `if` is redundant; the previous test already covers this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132023

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > + > + { > + IMAGE_NT_HEADERS nt_header = nt_header_template; > + char dll_name_a[MAX_PATH]; > + HMODULE mod; > + > + nt_header.FileHeader.NumberOfSections = 1; > + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); > + > + nt_header.OptionalHeader.SectionAlignment = page_size; > + nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; > + nt_header.OptionalHeader.FileAlignment = page_size; > + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); > + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; > + > + create_test_dll( &dos_header, sizeof(dos_header), &nt_header, dll_name_a ); I don't think it's necessary to create a new DLL file. How about using an existing one, such as shell32.dll? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132022

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); > + ok(dll_name_len > 0, "can't get path for NULL module\n"); > + ok(dll_name_len < MAX_PATH, "unterminated path for NULL module\n"); > + > + memset(dll_name, 0x9, sizeof(dll_name)); > + GetModuleFileNameW(NULL, dll_name, dll_name_len); > + for (i = 0; i < MAX_PATH && dll_name[i]; i++) > + ; > + ok(i > 0, "can't get path for NULL module with short buffer\n"); > + ok(i < MAX_PATH, "unterminated path for NULL module with short buffer\n"); > + if (i < MAX_PATH) It would be best to use the `todo_wine` keyword here instead of an `if` statement. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132021

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); > + ok(dll_name_len > 0, "can't get path for NULL module\n"); > + ok(dll_name_len < MAX_PATH, "unterminated path for NULL module\n"); > + > + memset(dll_name, 0x9, sizeof(dll_name)); > + GetModuleFileNameW(NULL, dll_name, dll_name_len); > + for (i = 0; i < MAX_PATH && dll_name[i]; i++) > + ; > + ok(i > 0, "can't get path for NULL module with short buffer\n"); > + ok(i < MAX_PATH, "unterminated path for NULL module with short buffer\n"); You might want to compare this with the return value here as well. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132020

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > > +static void test_getmodulefilename_string_termination(void) > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); > + ok(dll_name_len > 0, "can't get path for NULL module\n"); > + ok(dll_name_len < MAX_PATH, "unterminated path for NULL module\n"); > + > + memset(dll_name, 0x9, sizeof(dll_name)); > + GetModuleFileNameW(NULL, dll_name, dll_name_len); > + for (i = 0; i < MAX_PATH && dll_name[i]; i++) > + ; You can replace this implementation with `wcsnlen()`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132019

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > DeleteFileA( long_path ); > } > > +static void test_getmodulefilename_string_termination(void) > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); You might want to add a return‑value check and compare it with `wcslen()` result to determine success or failure. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132018

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > DeleteFileA( long_path ); > } > > +static void test_getmodulefilename_string_termination(void) > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; This assignment is redundant. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132016

1 0

Re: [PATCH v7 0/2] MR10291: Fix GetModuleFileName string termination
by Akihiro Sagawa (＠sgwaki) March 12, 2026

March 12, 2026

Akihiro Sagawa (@sgwaki) commented about dlls/kernel32/tests/loader.c: > DeleteFileA( long_path ); > } > > +static void test_getmodulefilename_string_termination(void) > +{ > + WCHAR dll_name[MAX_PATH]; > + int dll_name_len, i; > + > + dll_name[0] = 0; > + GetModuleFileNameW(NULL, dll_name, MAX_PATH); > + dll_name_len = wcslen(dll_name); > + ok(dll_name_len > 0, "can't get path for NULL module\n"); > + ok(dll_name_len < MAX_PATH, "unterminated path for NULL module\n"); It's unclear what the actual value of `dll_name_len` is. See [[Writing good error messages|Wine-Developer's-Guide/Writing-Conformance-Tests#writing-good-error-messages]] for details. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10291#note_132017

1 0