September 2021 - Wine-commits

Nikolay Sivov : ole32/classmoniker: Always use generic composition in ComposeWith().
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: b7e4a5bcbd1357f908358dbf341f3d04e789876b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e4a5bcbd1357f908358dbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 15:51:43 2021 +0300 ole32/classmoniker: Always use generic composition in ComposeWith(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 78 +++++++---------------------------------------- 1 file changed, 11 insertions(+), 67 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 03c7f773e29..8fe60c6ba71 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -298,79 +298,23 @@ static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, return MK_S_REDUCED_TO_SELF; } -/****************************************************************************** - * ClassMoniker_ComposeWith - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_ComposeWith(IMoniker* iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) -{ - HRESULT res=S_OK; - DWORD mkSys,mkSys2; - IEnumMoniker* penumMk=0; - IMoniker *pmostLeftMk=0; - IMoniker* tempMkComposite=0; - - TRACE("(%p,%d,%p)\n", pmkRight, fOnlyIfNotGeneric, ppmkComposite); - - if ((ppmkComposite==NULL)||(pmkRight==NULL)) - return E_POINTER; - - *ppmkComposite=0; - - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - - /* If pmkRight is an anti-moniker, the returned moniker is NULL */ - if(mkSys==MKSYS_ANTIMONIKER) - return res; - - else - /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ - /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ - if(mkSys==MKSYS_GENERICCOMPOSITE){ - - res=IMoniker_Enum(pmkRight,TRUE,&penumMk); - - if (FAILED(res)) - return res; - - res=IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL); - - IMoniker_IsSystemMoniker(pmostLeftMk,&mkSys2); - - if(mkSys2==MKSYS_ANTIMONIKER){ - - IMoniker_Release(pmostLeftMk); - - tempMkComposite=iface; - IMoniker_AddRef(iface); +static HRESULT WINAPI ClassMoniker_ComposeWith(IMoniker *iface, IMoniker *right, + BOOL only_if_not_generic, IMoniker **result) +{ + DWORD order; - while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){ + TRACE("%p, %p, %d, %p.\n", iface, right, only_if_not_generic, result); - res=CreateGenericComposite(tempMkComposite,pmostLeftMk,ppmkComposite); + if (!result || !right) + return E_POINTER; - IMoniker_Release(tempMkComposite); - IMoniker_Release(pmostLeftMk); + *result = NULL; - tempMkComposite=*ppmkComposite; - IMoniker_AddRef(tempMkComposite); - } - return res; - } - else - return CreateGenericComposite(iface,pmkRight,ppmkComposite); - } - /* If pmkRight is not an anti-moniker, the method combines the two monikers into a generic - composite if fOnlyIfNotGeneric is FALSE; if fOnlyIfNotGeneric is TRUE, the method returns - a NULL moniker and a return value of MK_E_NEEDGENERIC */ - else - if (!fOnlyIfNotGeneric) - return CreateGenericComposite(iface,pmkRight,ppmkComposite); + if (is_anti_moniker(right, &order)) + return S_OK; - else - return MK_E_NEEDGENERIC; + return only_if_not_generic ? MK_E_NEEDGENERIC : CreateGenericComposite(iface, right, result); } /******************************************************************************

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_SetWindowRgn() message sequences.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 38729cbdffe768f779010c7ed8ed2b9de692e8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=38729cbdffe768f779010c7e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 23 19:19:02 2021 -0400 user32/tests: Fix existing winevents in test_SetWindowRgn() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6825c1d74d4..63834725a54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13340,7 +13340,7 @@ static const struct message WmSetWindowRgn[] = { { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0xf }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -13349,7 +13349,7 @@ static const struct message WmSetWindowRgn_no_redraw[] = { |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0 }, { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0xf }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -13376,8 +13376,8 @@ static const struct message WmSetWindowRgn_clear[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Not always sent. */ { 0 } };

1 0

Connor McAdams : user32/tests: Add missing winevents to test_SetWindowRgn() message sequences.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 327fb19184e2b9b16c373fb60301075106d502a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=327fb19184e2b9b16c373fb6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 23 19:19:03 2021 -0400 user32/tests: Add missing winevents to test_SetWindowRgn() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 63834725a54..b2dac964a2a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13366,6 +13366,8 @@ static const struct message WmSetWindowRgn_clear[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|optional }, { WM_NCCALCSIZE, sent|optional|wparam, 1 }, { WM_NCPAINT, sent|optional }, @@ -18583,6 +18585,9 @@ START_TEST(msg) else test_TrackMouseEvent(); + test_SetWindowRgn(); + test_sys_menu(); + /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) { @@ -18592,8 +18597,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_SetWindowRgn(); - test_sys_menu(); test_dialog_messages(); test_EndDialog(); test_nullCallback();

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_dialog_messages() message sequences.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 72d2bf3cf3dce50246cac1d2ea155e4d9587ecb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d2bf3cf3dce50246cac1d2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 23 19:19:04 2021 -0400 user32/tests: Fix existing winevents in test_dialog_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b2dac964a2a..12064c9509a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1855,26 +1855,26 @@ static const struct message WmModalDialogSeq[] = { static const struct message WmModalDialogSeq_2[] = { { WM_CANCELMODE, sent }, { HCBT_SETFOCUS, hook }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent }, { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENABLE, sent|wparam, 0 }, { HCBT_CREATEWND, hook }, - { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, { WM_CHANGEUISTATE, sent|optional }, { WM_UPDATEUISTATE, sent|optional }, { WM_ENABLE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_CHANGEUISTATE, sent|optional }, { WM_UPDATEUISTATE, sent|optional }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -14083,14 +14083,14 @@ static const struct message WmDefDlgSetFocus_1[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, { WM_CTLCOLOREDIT, sent }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|wparam, MAKEWPARAM(1, EN_SETFOCUS) }, { 0 } }; @@ -14100,9 +14100,9 @@ static const struct message WmDefDlgSetFocus_2[] = { { WM_GETTEXT, sent|wparam|optional, 6 }, /* XP */ { WM_GETTEXT, sent|wparam|optional, 12 }, /* XP */ { EM_SETSEL, sent|wparam, 0 }, /* XP sets lparam to text length, Win9x to -2 */ - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_CTLCOLOREDIT, sent|optional }, /* XP */ - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { 0 } }; /* Creation of a dialog */ @@ -14111,7 +14111,7 @@ static const struct message WmCreateDialogParamSeq_0[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { WM_SETFONT, sent }, @@ -14125,7 +14125,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { WM_SETFONT, sent }, @@ -14150,7 +14150,7 @@ static const struct message WmCreateDialogParamSeq_2[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { WM_CHANGEUISTATE, sent|optional }, @@ -14188,7 +14188,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { { WM_NCCREATE, sent|parent }, { WM_NCCALCSIZE, sent|parent|wparam, 0 }, { WM_CREATE, sent|parent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|parent|wparam, SIZE_RESTORED }, { WM_MOVE, sent|parent }, { WM_SETFONT, sent|parent },

1 0

Jacek Caban : gdi32: Directly use ntdll in add_font_list.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 484aad56c8a5b38597e5316e6ca98fc781dbf15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=484aad56c8a5b38597e5316e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:10 2021 +0100 gdi32: Directly use ntdll in add_font_list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1e3c70550a3..4b3c93d9853 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -132,6 +132,13 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return (p - dst) * sizeof(WCHAR); +} + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -504,6 +511,13 @@ static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void * NtSetValueKey( hkey, &nameW, 0, type, value, count ); } +static void set_reg_ascii_value( HKEY hkey, const char *name, const char *value ) +{ + WCHAR nameW[64], valueW[128]; + asciiz_to_unicode( nameW, name ); + set_reg_value( hkey, nameW, REG_SZ, valueW, asciiz_to_unicode( valueW, value )); +} + static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { @@ -2458,10 +2472,10 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int { const char *sserif = (dpi <= 108) ? fl->sserif_96 : fl->sserif_120; - RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); - RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); - RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)sserif, strlen(sserif)+1); - RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); + set_reg_ascii_value( hkey, "Courier", fl->courier ); + set_reg_ascii_value( hkey, "MS Serif", fl->serif ); + set_reg_ascii_value( hkey, "MS Sans Serif", sserif ); + set_reg_ascii_value( hkey, "Small Fonts", fl->small ); } static void set_value_key(HKEY hkey, const char *name, const char *value)

1 0

Jacek Caban : gdi32: Directly use ntdll in update_font_association_info.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: b645d4f5b3d1b66b81b6ae4cd77fc3800a4adade URL: https://source.winehq.org/git/wine.git/?a=commit;h=b645d4f5b3d1b66b81b6ae4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:11 2021 +0100 gdi32: Directly use ntdll in update_font_association_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4b3c93d9853..274c1d83aba 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2481,20 +2481,28 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int static void set_value_key(HKEY hkey, const char *name, const char *value) { if (value) - RegSetValueExA(hkey, name, 0, REG_SZ, (const BYTE *)value, strlen(value) + 1); + set_reg_ascii_value( hkey, name, value ); else if (name) - RegDeleteValueA(hkey, name); + { + WCHAR nameW[64]; + asciiz_to_unicode( nameW, name ); + reg_delete_value( hkey, nameW ); + } } static void update_font_association_info(UINT current_ansi_codepage) { + static const WCHAR associated_charsetW[] = + { 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t' }; + if (is_dbcs_ansi_cp(current_ansi_codepage)) { HKEY hkey; - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc", &hkey) == ERROR_SUCCESS) + if ((hkey = reg_create_key( NULL, font_assoc_keyW, sizeof(font_assoc_keyW), 0, NULL ))) { HKEY hsubkey; - if (RegCreateKeyW(hkey, L"Associated Charset", &hsubkey) == ERROR_SUCCESS) + if ((hsubkey = reg_create_key( hkey, associated_charsetW, sizeof(associated_charsetW), + 0, NULL ))) { switch (current_ansi_codepage) { @@ -2511,12 +2519,12 @@ static void update_font_association_info(UINT current_ansi_codepage) set_value_key(hsubkey, "SYMBOL(02)", "NO"); break; } - RegCloseKey(hsubkey); + NtClose( hsubkey ); } /* TODO: Associated DefaultFonts */ - RegCloseKey(hkey); + NtClose( hkey ); } } else

1 0

Hans Leidekker : winhttp: Call read_data() at least once in drain_content().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 239964ce86ab3761c86862784c94461e5f9f516c URL: https://source.winehq.org/git/wine.git/?a=commit;h=239964ce86ab3761c8686278… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:26 2021 +0200 winhttp: Call read_data() at least once in drain_content(). This ensures that response headers are processed even if there's no data to read. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50244 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8e390de549e..e229bdbfd31 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1877,11 +1877,8 @@ static void drain_content( struct request *request ) for (;;) { if (request->read_chunked) size = sizeof(buffer); - else - { - if (bytes_total >= bytes_left) return; - size = min( sizeof(buffer), bytes_left - bytes_total ); - } + else size = min( sizeof(buffer), bytes_left - bytes_total ); + if (read_data( request, buffer, size, &bytes_read, FALSE ) || !bytes_read) return; bytes_total += bytes_read; }

1 0

Hans Leidekker : winhttp: Call drain_content() before clear_response_headers().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 5da1d5924186312ab2fcdea2f8305c3ce5455950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da1d5924186312ab2fcdea2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:27 2021 +0200 winhttp: Call drain_content() before clear_response_headers(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e229bdbfd31..dce3232c0e3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2082,8 +2082,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; - clear_response_headers( request ); drain_content( request ); + clear_response_headers( request ); if (session->agent) process_header( request, L"User-Agent", session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE );

1 0

Hans Leidekker : winhttp: Fix return value for relative redirects.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: ec46607ee0b215544aa8acd3c3bb30405ed5579e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec46607ee0b215544aa8acd3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:28 2021 +0200 winhttp: Fix return value for relative redirects. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dce3232c0e3..0155d5780fe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2575,6 +2575,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) } free( request->path ); request->path = path; + ret = ERROR_SUCCESS; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); }

1 0

Hans Leidekker : winhttp: Don't remove content-type/length headers in handle_redirect().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: badc64b42c56f7a16494eedd2a8add9ef3254af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badc64b42c56f7a16494eedd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:29 2021 +0200 winhttp: Don't remove content-type/length headers in handle_redirect(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50272 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0155d5780fe..2c064bb767b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2544,7 +2544,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location = NULL; - int index; if ((ret = get_redirect_url( request, &location, &len_loc ))) return ret; @@ -2643,10 +2642,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else request->path = strdupW( L"/" ); } - /* remove content-type/length headers */ - if ((index = get_header_index( request, L"Content-Type", 0, TRUE )) >= 0) delete_header( request, index ); - if ((index = get_header_index( request, L"Content-Length", 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { free( request->verb );

1 0