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

Hans Leidekker : msi: Only perform the media check if the label of the disk entry differs from the last.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: bc2095b94a2790efd50da6f739fb87b6c404efee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2095b94a2790efd50da6f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 7 08:55:15 2019 +0100 msi: Only perform the media check if the label of the disk entry differs from the last. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85fea53af80d324a4cf7f80a45f43fed8d8d65e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/media.c | 26 +++++++++++++++++--------- dlls/msi/msipriv.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5f8c26a..09aac09 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -664,6 +664,7 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); + msi_free(mi->last_volume); msi_free(mi); } @@ -898,20 +899,27 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label) { - WCHAR *source = msi_dup_property( package->db, szSourceDir ); - BOOL match = source_matches_volume( mi, source ); - msi_free( source ); - - if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) + /* assume first volume is in the drive */ + if (mi->last_volume && strcmpiW( mi->last_volume, mi->volume_label )) { - if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); + + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - msi_free( cabinet_file ); - return rc; + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + { + msi_free( cabinet_file ); + return rc; + } } } + + msi_free(mi->last_volume); + mi->last_volume = strdupW(mi->volume_label); } if (mi->cabinet) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 27d654b..fdafeec 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -170,6 +170,7 @@ typedef struct tagMSIMEDIAINFO LPWSTR disk_prompt; LPWSTR cabinet; LPWSTR volume_label; + LPWSTR last_volume; BOOL is_continuous; BOOL is_extracted; WCHAR sourcedir[MAX_PATH];

1 0

Paul Gofman : d3dx9: Return correct comment length from get_instr_length() .
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 373156d002fc5f3883fc1f8d7d08a5d3e8d0e73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=373156d002fc5f3883fc1f8d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 20:17:52 2019 +0100 d3dx9: Return correct comment length from get_instr_length(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 807e5fc04af7a7ea563af1e7da6ebe6662536e6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f372494..ac5b824 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2419,18 +2419,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46..b8363af 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6534,6 +6534,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */

1 0

Alexandre Julliard : commdlg: Add support for 16-bit file dialog hooks.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: ab37df3c3f2093a54b77bffc7111e05d76ceeac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab37df3c3f2093a54b77bffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 13:39:39 2018 +0100 commdlg: Add support for 16-bit file dialog hooks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59df6651b88456b38ac816de0a07a544aae346e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 408 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 404 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab37df3c3f2093a54b77…

1 0

Alexandre Julliard : commdlg: Implement custom template support in 16-bit file dialogs.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 7b4be95809569d0b41880ec08bc91432cc6ad3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4be95809569d0b41880ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 11:24:00 2018 +0100 commdlg: Implement custom template support in 16-bit file dialogs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e9cb103400c58480778894cb0e4a3d2dec9a3b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 136 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 7e2fda7..1238dc9 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -18,18 +18,120 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" +#include "winternl.h" #include "commdlg.h" #include "cdlg16.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +static inline WORD get_word( const char **ptr ) +{ + WORD ret = *(WORD *)*ptr; + *ptr += sizeof(WORD); + return ret; +} + +static inline void copy_string( WORD **out, const char **in, DWORD maxlen ) +{ + DWORD len = MultiByteToWideChar( CP_ACP, 0, *in, -1, *out, maxlen ); + *in += strlen(*in) + 1; + *out += len; +} + +static inline void copy_dword( WORD **out, const char **in ) +{ + *(DWORD *)*out = *(DWORD *)*in; + *in += sizeof(DWORD); + *out += sizeof(DWORD) / sizeof(WORD); +} + +static LPDLGTEMPLATEA convert_dialog( const char *p, DWORD size ) +{ + LPDLGTEMPLATEA dlg; + WORD len, count, *out, *end; + + if (!(dlg = HeapAlloc( GetProcessHeap(), 0, size * 2 ))) return NULL; + out = (WORD *)dlg; + end = out + size; + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = count = (BYTE)*p++; /* count */ + *out++ = get_word( &p ); /* x */ + *out++ = get_word( &p ); /* y */ + *out++ = get_word( &p ); /* cx */ + *out++ = get_word( &p ); /* cy */ + + if ((BYTE)*p == 0xff) /* menu */ + { + p++; + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + copy_string( &out, &p, end - out ); /* class */ + copy_string( &out, &p, end - out ); /* caption */ + + if (dlg->style & DS_SETFONT) + { + *out++ = get_word( &p ); /* point size */ + copy_string( &out, &p, end - out ); /* face name */ + } + + /* controls */ + while (count--) + { + WORD x = get_word( &p ); + WORD y = get_word( &p ); + WORD cx = get_word( &p ); + WORD cy = get_word( &p ); + WORD id = get_word( &p ); + + out = (WORD *)(((UINT_PTR)out + 3) & ~3); + + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = x; + *out++ = y; + *out++ = cx; + *out++ = cy; + *out++ = id; + + if (*p & 0x80) /* class */ + { + *out++ = 0xffff; + *out++ = (BYTE)*p++; + } + else copy_string( &out, &p, end - out ); + + if (*p & 0x80) /* window */ + { + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + len = (BYTE)*p++; /* data */ + *out++ = (len + 1) & ~1; + memcpy( out, p, len ); + p += len; + out += (len + 1) / sizeof(WORD); + } + + assert( out <= end ); + return dlg; +} + static UINT_PTR CALLBACK dummy_hook( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { return FALSE; @@ -68,6 +170,7 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -93,7 +196,20 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -103,6 +219,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; } @@ -121,6 +238,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -146,7 +264,20 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -156,6 +287,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; }

1 0

Alexandre Julliard : server: Reset hardware breakpoint sizes before setting them.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 5ac340358ab9a1a89ec23595c270207aefc7e2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ac340358ab9a1a89ec23595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 18 17:18:09 2018 +0100 server: Reset hardware breakpoint sizes before setting them. Workaround for kernel bug 200965. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53375be47c07c1aec7f97abaaea177b318f04e08) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/ptrace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 808328e..6be1591 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -628,6 +628,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (!suspend_for_ptrace( thread )) return; + /* force all breakpoint lengths to 1, workaround for kernel bug 200965 */ + ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0x11110055 ); + switch (context->cpu) { case CPU_x86:

1 0

Dmitry Timoshkov : gdi32: Improve detection of symbol charset for old truetype fonts.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: e4e4776291195adecec3eb1d1866eb7c4e64abb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e4776291195adecec3eb1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 29 12:28:15 2018 +0300 gdi32: Improve detection of symbol charset for old truetype fonts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33117 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57c44885e57dee810814bb9bdf39f53cb8250d93) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3244ad3..28d63cc 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2010,7 +2010,6 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TT_OS2 *os2; - FT_UInt dummy; CHARSETINFO csi; FT_WinFNT_HeaderRec winfnt_header; int i; @@ -2027,10 +2026,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) if (os2->version == 0) { - if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs->fsCsb[0] = FS_LATIN1; - else + if (os2->usFirstCharIndex >= 0xf000 && os2->usFirstCharIndex < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else + fs->fsCsb[0] = FS_LATIN1; } else {

1 0

Dmitry Timoshkov : user32/tests: Add a test for navigating a group of buttons using keyboard events.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 95d7597f117b507a5125ac814383ef43676d2cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95d7597f117b507a5125ac81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 27 09:11:13 2018 +0300 user32/tests: Add a test for navigating a group of buttons using keyboard events. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf55f167b9c9714dcb03e90cc4cea3093e15ceb7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 316 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 11 ++ 2 files changed, 327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95d7597f117b507a5125…

1 0

Frédéric Fauberteau : wineserver: Support debug registers on NetBSD.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 7e5541cb4776fea1b0e33f8262bf881821eab178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e5541cb4776fea1b0e33f82… Author: Frédéric Fauberteau <triaxx(a)NetBSD.org> Date: Tue Dec 4 12:54:43 2018 +0100 wineserver: Support debug registers on NetBSD. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 708a2c991f8efab99663adaa2bbb963b9dff4f17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8eb..808328e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1;

1 0

André Hentschel : ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 71c9a0f604c534af060c8fd175ffec21db0596ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c9a0f604c534af060c8fd1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 22:29:27 2018 +0100 ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46089 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 95fa795fa1f8b416af097b6186859ec32ea316d9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 53 +++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/loader.c | 18 +++++++++++++-- include/delayloadhandler.h | 1 + 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7066bca..2551d48 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -47,7 +47,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE }; static LONG *child_failures; -static WORD cb_count; +static WORD cb_count, cb_count_sys; static DWORD page_size; static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, @@ -67,7 +67,8 @@ static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, - PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, + PDELAYLOAD_FAILURE_DLL_CALLBACK, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); @@ -2986,6 +2987,14 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) return (void*)0xdeadbeef; } +static PVOID WINAPI failuresyshook(const char *dll, const char *function) +{ + ok(!strcmp(dll, "secur32.dll"), "wrong dll: %s\n", dll); + ok(!((ULONG_PTR)function >> 16), "expected ordinal, got %p\n", function); + cb_count_sys++; + return (void*)0x12345678; +} + static void test_ResolveDelayLoadedAPI(void) { static const char test_dll[] = "secur32.dll"; @@ -3220,8 +3229,9 @@ static void test_ResolveDelayLoadedAPI(void) load = (void *)GetProcAddress(htarget, (char*)iibn->Name); } - cb_count = 0; - ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[i], 0); + /* test without failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, NULL, failuresyshook, &itda[i], 0); if (td[i].succeeds) { ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); @@ -3229,11 +3239,42 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", i, ret, (void*)itda[i].u1.AddressOfData); ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); } else { - ok(ret == (void*)0xdeadbeef, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); - ok(cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(ret == (void*)0x12345678, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(cb_count_sys == 1, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + + /* test with failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, failuresyshook, &itda[i], 0); + if (td[i].succeeds) + { + ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); + ok(ret == load, "Test %u: expected %p, got %p\n", i, load, ret); + ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", + i, ret, (void*)itda[i].u1.AddressOfData); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + { + if (ret == (void*)0x12345678) + { + /* Win10+ sometimes buffers the address of the stub function */ + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else if (ret == (void*)0xdeadbeef) + { + ok(cb_count == 1, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + ok(0, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); } } delaydir++; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 53280a4..3972ac6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2683,7 +2683,8 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) * LdrResolveDelayLoadedAPI (NTDLL.@) */ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, - PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, void* syshook, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, IMAGE_THUNK_DATA* addr, ULONG flags ) { IMAGE_THUNK_DATA *pIAT, *pINT; @@ -2741,7 +2742,20 @@ fail: delayinfo.TargetModuleBase = *phmod; delayinfo.Unused = NULL; delayinfo.LastError = nts; - return dllhook(4, &delayinfo); + + if (dllhook) + return dllhook(4, &delayinfo); + + if (IMAGE_SNAP_BY_ORDINAL(pINT[id].u1.Ordinal)) + { + DWORD_PTR ord = LOWORD(pINT[id].u1.Ordinal); + return syshook(name, (const char *)ord); + } + else + { + const IMAGE_IMPORT_BY_NAME* iibn = get_rva(base, pINT[id].u1.AddressOfData); + return syshook(name, (const char *)iibn->Name); + } } /****************************************************************** diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h index 06b6589..e833611 100644 --- a/include/delayloadhandler.h +++ b/include/delayloadhandler.h @@ -47,6 +47,7 @@ typedef struct _DELAYLOAD_INFO } DELAYLOAD_INFO, *PDELAYLOAD_INFO; typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO); +typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_SYSTEM_ROUTINE)(LPCSTR, LPCSTR); #ifdef __cplusplus }

1 0

Dmitry Timoshkov : user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: c441573625bb0b8b42896492d8a773ddc4dca609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c441573625bb0b8b42896492… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 27 09:11:04 2018 +0300 user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d57fcb41135f8686f343c3b02da81cb9e44fd670) Conflicts: dlls/user32/tests/msg.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 143 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 11 ++++ 2 files changed, 154 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index eb5d4c4..b2c953e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -123,6 +123,8 @@ static DWORD cbt_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; +static LRESULT WINAPI ParentMsgCheckProcA(HWND, UINT, WPARAM, LPARAM); + /* FIXME: add tests for these Window Edge Styles (Win31/Win95/98 look), in order of precedence: @@ -6231,7 +6233,24 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, case BM_SETSTATE: if (GetCapture()) ok(GetCapture() == hwnd, "GetCapture() = %p\n", GetCapture()); + + lParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case WM_GETDLGCODE: + if (lParam) + { + MSG *msg = (MSG *)lParam; + lParam = MAKELPARAM(msg->message, msg->wParam); + } + wParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case BM_SETCHECK: + case BM_GETCHECK: + lParam = (ULONG_PTR)GetMenu(hwnd); /* fall through */ +log_it: default: msg.hwnd = hwnd; msg.message = message; @@ -6600,6 +6619,129 @@ static void test_button_messages(void) DestroyWindow(parent); } +#define ID_RADIO1 501 +#define ID_RADIO2 502 +#define ID_RADIO3 503 +#define ID_TEXT 504 + +static const struct message auto_radio_button_BM_CLICK[] = +{ + { BM_CLICK, sent|wparam|lparam, 0, 0 }, + { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO3 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, + { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { 0 } +}; + +static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + ParentMsgCheckProcA(hwnd, msg, wp, lp); + return 1; +} + +static void test_autoradio_BM_CLICK(void) +{ + HWND parent, radio1, radio2, radio3; + RECT rc; + MSG msg; + DWORD ret; + + subclass_button(); + + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_1", 0, radio_test_dlg_proc, 0); + ok(parent != 0, "failed to create parent window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); + + /* this avoids focus messages in the generated sequence */ + SetFocus(radio2); + + flush_events(); + flush_sequence(); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio1, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio2, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio3, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + + GetWindowRect(radio2, &rc); + SetCursorPos(rc.left+1, rc.top+1); + + flush_events(); + flush_sequence(); + + log_all_parent_messages++; + + SendMessageA(radio2, BM_CLICK, 0, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_BM_CLICK, "BM_CLICK on auto-radio button", FALSE); + + log_all_parent_messages--; + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + DestroyWindow(parent); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -16924,6 +17066,7 @@ START_TEST(msg) invisible_parent_tests(); test_mdi_messages(); test_button_messages(); + test_autoradio_BM_CLICK(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index a9e45e9..1557291 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -75,6 +75,17 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL,109,20,50,14, WS_TABSTOP | WS_GROUP } +AUTORADIO_TEST_DIALOG_1 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test"

1 0