wine-devel June 2020

75 participants
814 discussions

[PATCH v2 1/2] kernel32: Call PROFILE_DeleteSection directly from WritePrivateProfile* functions.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/profile.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index dfda24446cb..63a400cce64 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -503,11 +503,12 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) *section = to_del->next; to_del->next = NULL; PROFILE_Free( to_del ); + CurProfile->changed = TRUE; return TRUE; } section = &(*section)->next; } - return FALSE; + return TRUE; } @@ -971,15 +972,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, LPCWSTR value, BOOL create_always ) { - if (!key_name) /* Delete a whole section */ - { - TRACE("(%s)\n", debugstr_w(section_name)); - CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section, - section_name ); - return TRUE; /* Even if PROFILE_DeleteSection() has failed, - this is not an error on application's level.*/ - } - else if (!value) /* Delete a key */ + if (!value) /* Delete a key */ { TRACE("(%s,%s)\n", debugstr_w(section_name), debugstr_w(key_name) ); CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section, @@ -1335,12 +1328,13 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } else if (PROFILE_Open( filename, TRUE )) { - if (!section) { + if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - } else { + else if (!entry) + ret = PROFILE_DeleteSection( &CurProfile->section, section ); + else ret = PROFILE_SetString( section, entry, string, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1393,8 +1387,9 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } } else if (PROFILE_Open( filename, TRUE )) { - if (!string) {/* delete the named section*/ - ret = PROFILE_SetString(section,NULL,NULL, FALSE); + if (!string) + { + ret = PROFILE_DeleteSection( &CurProfile->section, section ); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; -- 2.27.0

3 years, 11 months

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.【请注意，邮件由[email protected]代发】

by Jiajin Cui

Window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com>

3 years, 11 months

[PATCH v5 1/2] kernel32/tests: Add test suite to modify the thread, order of toolhelp.

by Changping Yu

3 years, 11 months

[PATCH v5 2/2] kernel32: Adjust toolhelp thread return order.

by Changping Yu

3 years, 11 months

[PATCH v2 1/2] user32/tests: Add test for ShowWindow with SW_SHOWNOACTIVATE option.

by Haidong Yu

3 years, 11 months

[PATCH v2 2/2] user32: Fix a pop-up window is not visible when its owned window showed with SW_SHOWNOACTIVATE option.

by Haidong Yu

3 years, 11 months

[PATCH] winecfg: Pass correct font family through to font chooser.

by Mark Harmstone

GetSystemMetrics returns the "full name" of the font, which is not necessarily what appears in the font picker, causing it to default to the first entry in the list. See for example the family "Renner*", which calls its Regular version "Renner* Book". Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- programs/winecfg/theme.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b38b2ff26d..1f004c7e0e 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1151,20 +1151,43 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) } } +static INT CALLBACK fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) +{ + LOGFONTW *orig_lf = (LOGFONTW *)lparam; + + memcpy(orig_lf->lfFaceName, lf->lfFaceName, sizeof(lf->lfFaceName)); + + return 0; +} + static void on_select_font(HWND hDlg) { CHOOSEFONTW cf; + LOGFONTW lf; + HDC hdc; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + memcpy(&lf, &metrics[index].lf, sizeof(LOGFONTW)); + + /* GetSystemMetrics returns the "full name" of the font - run it through + * EnumFontFamiliesExW in order to get the family name, which is what + * appears in the font chooser list. */ + hdc = GetDC(hDlg); + EnumFontFamiliesExW(hdc, &lf, fontname_proc, (LPARAM)&lf, 0); + ReleaseDC(hDlg, hdc); + ZeroMemory(&cf, sizeof(cf)); cf.lStructSize = sizeof(CHOOSEFONTW); cf.hwndOwner = hDlg; - cf.lpLogFont = &(metrics[index].lf); + cf.lpLogFont = &lf; cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; - if (ChooseFontW(&cf)) + if (ChooseFontW(&cf)) { + memcpy(&(metrics[index].lf), &lf, sizeof(LOGFONTW)); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); + } } static void init_mime_types(HWND hDlg) -- 2.26.2

3 years, 11 months

[PATCH] ntoskrnl.exe: null initialize context.handle and context.irp

by Jefferson Carpenter

Should prevent close_handle getting called with random data from the stack. thanks, Jefferson

3 years, 11 months

[PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer functions.

by Vijay Kiran Kamuju

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 years, 11 months

[PATCH 1/3] include: Add xact3.h

by Vijay Kiran Kamuju

Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2020