August 2025 - Wine-gitlab - list.winehq.org

[PATCH 0/1] MR8787: po: Updaet Lithuanian translation.
by Aurimas Fišeras 19 Aug '25

19 Aug '25

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8787

1 1

[PATCH 0/3] MR7909: include: Fix IMAGE_OS2_HEADER structure
by Pali Rohár 19 Aug '25

19 Aug '25

This merge request contains fixes for the Windows New Executable structure IMAGE_OS2_HEADER defined in include file winnt.h and used by wine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7909

4 13

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > + sf = calloc( opt->size, sizeof(int) ); > + sane_option_get_value(opt->optno, sf ); > + if (opt->constraint.range.quant) > + pos = *sf / opt->constraint.range.quant; > + else > + pos = MulDiv( *sf, 100, 65536 ); > + option->type = opt->type; > + option->value.int_val = pos; > + free(sf); > + } > + } > +} > + > +static BOOL save_cfg_data(HWND hwnd, WCHAR file_path[128], int type, int optno) > +{ > + ScannerOption *options = malloc((cntOptionsExist + 1) * sizeof(ScannerOption)); This is never freed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113175

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > return FALSE; > } > > +static void set_value(struct option_descriptor* opt, ScannerOption* option) This is called `set_value` but it gets the value? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113174

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > + option->type = opt->type; > + option->value.int_val = pos; > + free(sf); > + } > + } > +} > + > +static BOOL save_cfg_data(HWND hwnd, WCHAR file_path[128], int type, int optno) > +{ > + ScannerOption *options = malloc((cntOptionsExist + 1) * sizeof(ScannerOption)); > + if (!options) { > + ERR("Failed to allocate memory for options array\n"); > + return FALSE; > + } > + > + switch(type) This reads to me like 2 entirely different functions with different interfaces that have been combined into 1 with a switch. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113176

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > + BOOL is_exist = load_from_file(path, opt.type, title, &b); > + > + if (is_exist) > + { > + sane_option_set_value( i, &b, NULL ); > + } > + > sane_option_get_value( i, &b ); > + > if (b) > + { > SendMessageA(control,BM_SETCHECK,BST_CHECKED,0); > - > + continue; > + } > + SendMessageA(control,BM_SETCHECK,BST_UNCHECKED,0); This could be simplified to `SendMessageA(control,BM_SETCHECK,b ? BST_CHECKED : BST_UNCHECKED,0);` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113177

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > + WideCharToMultiByte(CP_UTF8, 0, opt.title, -1, title, sizeof(title), NULL, NULL); > + > if (opt.type == TYPE_STRING && opt.constraint_type != CONSTRAINT_NONE) > { > CHAR buffer[255]; > WCHAR *p; > > + BOOL is_exist = load_from_file(path, opt.type, title, buffer); > + BOOL is_correct = FALSE; > + > for (p = opt.constraint.strings; *p; p += lstrlenW(p) + 1) > + { > + CHAR param[256]; > SendMessageW( control,CB_ADDSTRING,0, (LPARAM)p ); > + WideCharToMultiByte(CP_UTF8, 0, p, -1, param, sizeof(param), NULL, NULL); > + if (!strcmp(param, buffer)) This will access buffer uninitialized if the option is not in the file. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113178

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/ui.c: > + if (changed) > + { > + save_cfg_data(NULL, path, SINGLE, opt.optno); > + InitializeDialog(hwnd); > + } > free( value ); > } > > +LRESULT CALLBACK SaveWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_CREATE: > + { > + RECT rcClient; > + HWND tag, edit, btnSave, btnLoad; This seems like unnecessarily complicated UI to me. Why not just have Save and Load buttons in the main window that bring up standard Open/Save dialogs? (And maybe a "Save Defaults" that writes it to the default location. That could be added first, with the extra dialogs added in a later commit.) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113179

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/cfg.h: > +{ > + int type; > + CHAR name[64]; > + int optno; > + union > + { > + int int_val; > + BOOL bool_val; > + CHAR str_val[255]; > + int fixed_val; > + } value; > + BOOL is_enabled; > +} ScannerOption; > + > +BOOL save_to_file(WCHAR* path, ScannerOption *option); > +BOOL load_from_file(WCHAR* path, int type, CHAR* name, void* value); This interface seems like it would be inefficient - each setting saved is a complete read and write of the file, and each setting loaded is a complete read. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113173

1 0

Re: [PATCH v13 0/1] MR8778: sane.ds: Adding a window for loading and saving the scanner configuration
by Esme Povirk (＠madewokherd) 19 Aug '25

19 Aug '25

Esme Povirk (@madewokherd) commented about dlls/sane.ds/cfg.c: > + CloseHandle(hFile); > + > + sprintf(search, "%s=", name); > + context = NULL; > + line = strtok_s(content, "\n", &context); > + found = FALSE; > + > + while (line) > + { > + if (strstr(line, search) == line) > + { > + CHAR* val_start = line + strlen(search); > + CHAR* space = strchr(val_start, ' '); > + > + if (space) > + *space = '\0'; Ignoring anything after the first space in a string is odd. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8778#note_113168

1 0