November 2018 - Wine-commits

Alexandre Julliard : widl: Always generate files for the target platform only.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: f67301e9ecaedc6920470782910f7df79cb68b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67301e9ecaedc6920470782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 18:18:17 2018 +0100 widl: Always generate files for the target platform only. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 22 +------------ tools/widl/proxy.c | 24 ++------------ tools/widl/register.c | 2 +- tools/widl/server.c | 22 +------------ tools/widl/typelib.c | 2 +- tools/widl/widl.c | 88 ++++++++++++++++++++++++++++++++----------------- tools/widl/widl.h | 9 +++-- tools/widl/widl.man.in | 10 ++---- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 4 +-- 10 files changed, 75 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f67301e9ecaedc692047…

1 0

Alexandre Julliard : Revert "makefiles: Only generate proxy code for the target architecture."
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d076ff3c120319d5fc7bc9043095925d5244320c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d076ff3c120319d5fc7bc904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 18:18:53 2018 +0100 Revert "makefiles: Only generate proxy code for the target architecture." This reverts commit ee206a37609f99e9dc024dbe19d4a9b842433813. It's the default widl behavior now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - configure | 11 ----------- configure.ac | 5 ----- tools/makedep.c | 3 --- 4 files changed, 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index c1242af..6b65fdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,6 @@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ -WIDLFLAGS = @WIDLFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ diff --git a/configure b/configure index 92be309..dd45a4e 100755 --- a/configure +++ b/configure @@ -763,7 +763,6 @@ BISON FLEX TOOLSDIR wine64_disable -WIDLFLAGS TARGETFLAGS LD CPPBIN @@ -5513,8 +5512,6 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32" - WIDLFLAGS="--win32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5550,8 +5547,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext notice_platform="64-bit " TARGETFLAGS="-m64" - WIDLFLAGS="--win64" - fi ;; arm*) @@ -5620,8 +5615,6 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" TARGETFLAGS="-marm -mfloat-abi=$float_abi" - WIDLFLAGS="--win32" - ;; aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 @@ -5646,13 +5639,9 @@ $as_echo "no" >&6; } as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - WIDLFLAGS="--win64" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} - WIDLFLAGS="--win32" - ;; esac diff --git a/configure.ac b/configure.ac index efec221..294fe4b 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,6 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") - AC_SUBST(WIDLFLAGS,"--win32") PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -175,7 +174,6 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") - AC_SUBST(WIDLFLAGS,"--win64") fi ;; arm*) @@ -207,7 +205,6 @@ case $host in esac CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") - AC_SUBST(WIDLFLAGS,"--win32") ;; aarch64*) AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) @@ -215,11 +212,9 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) - AC_SUBST(WIDLFLAGS,"--win64") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} - AC_SUBST(WIDLFLAGS,"--win32") ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index e3bb04a..21ae2f7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -133,7 +133,6 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray cpp_flags; static struct strarray unwind_flags; -static struct strarray widl_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2642,7 +2641,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); - output_filenames( widl_flags ); output_filenames( target_flags ); output_filenames( make->include_args ); output_filenames( make->define_args ); @@ -4211,7 +4209,6 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); - widl_flags = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" );

1 0

André Hentschel : kernel32: Export RtlPcToFileHeader on ARM64.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 9f7692e2edc2face389f1cd26fdb5f705acaa6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f7692e2edc2face389f1cd2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 14 19:09:23 2018 +0100 kernel32: Export RtlPcToFileHeader on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46144 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5490b07..5c2e426 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1294,7 +1294,7 @@ @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind

1 0

Michael Stefaniuc : kernel32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d9c7d4147b569553bc97ef57c6200002fe81565e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c7d4147b569553bc97ef57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 14 20:46:01 2018 +0100 kernel32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 53b1b2d..abf33df 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2553,7 +2553,7 @@ static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) { - GetSystemDirectoryW( comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR) ); + GetSystemDirectoryW( comspec, ARRAY_SIZE( comspec ) - ARRAY_SIZE( cmdW )); strcatW( comspec, cmdW ); } if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0,

1 0

Gabriel Ivăncescu : shell32/autocomplete: Hide the listbox when the text is changed programmatically.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 4cac7da8b5f68a212314733797815bf0883e10c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cac7da8b5f68a2123147337… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 13:04:05 2018 +0200 shell32/autocomplete: Hide the listbox when the text is changed programmatically. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 705b28b..6d8988b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -627,6 +627,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_SETTEXT: + if (This->options & ACO_AUTOSUGGEST) + hide_listbox(This, This->hwndListBox, TRUE); + break; case WM_CUT: case WM_CLEAR: case WM_UNDO:

1 0

Gabriel Ivăncescu : shell32/tests: Test WM_SETTEXT with AutoComplete.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d715814e68d51c42cfe6da80c84c1c4b3996c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d715814e68d51c42cfe6da80… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 13:04:06 2018 +0200 shell32/tests: Test WM_SETTEXT with AutoComplete. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 6921202..ad7eb6a 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -510,12 +510,14 @@ static void test_custom_source(void) static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; static WCHAR str_au[] = {'a','u',0}; + static WCHAR str_aut[] = {'a','u','t',0}; static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; struct string_enumerator *obj; IUnknown *enumerator; IAutoComplete2 *autocomplete; IAutoCompleteDropDown *acdropdown; HWND hwnd_edit; + DWORD flags = 0; WCHAR buffer[20]; HRESULT hr; @@ -587,6 +589,22 @@ static void test_custom_source(void) ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); /* end of hijacks */ + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(flags & ACDD_VISIBLE, "AutoComplete DropDown should be visible\n"); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str_au); + dispatch_messages(); + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(!(flags & ACDD_VISIBLE), "AutoComplete DropDown should have been hidden\n"); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str_aut); + dispatch_messages(); + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(!(flags & ACDD_VISIBLE), "AutoComplete DropDown should be hidden\n"); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str_aut, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_aut), wine_dbgstr_w(buffer)); + test_aclist_expand(hwnd_edit, enumerator); obj->num_resets = 0;

1 0

Michael Stefaniuc : d3dx9: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: df722d262837e612baecf87385cceb1907101047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df722d262837e612baecf873… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:39 2018 +0100 d3dx9: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5522dea..418a3be 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -105,7 +105,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *d if( !desc ) return D3DERR_INVALIDCALL; memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } @@ -284,8 +284,7 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ /* Copy everything but the last structure member. This requires the two D3DXFONT_DESC structures to be equal until the FaceName member */ memcpy(&widedesc, desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, - widedesc.FaceName, sizeof(widedesc.FaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, widedesc.FaceName, ARRAY_SIZE(widedesc.FaceName)); return D3DXCreateFontIndirectW(device, &widedesc, font); }

1 0

Michael Stefaniuc : imaadp32.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 4efdb2604411ab35c799a8d94c0a79faae605d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4efdb2604411ab35c799a8d9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:42 2018 +0100 imaadp32.acm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 9518adc..a93b5f6 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -530,13 +530,13 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE(add->szShortName) ); MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM CODEC", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE(add->szLongName) ); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE(add->szCopyright) ); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR;

1 0

Andrey Gusev : pdh: Add PdhVbAddCounter stub.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: fe8ed8af8dcb6210ea9a98cc54de604c1af898a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe8ed8af8dcb6210ea9a98cc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 13 18:41:49 2018 +0200 pdh: Add PdhVbAddCounter stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44109 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa3..5f61a8a 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b648d8b..bc3674a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1084,6 +1084,18 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) } /*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** * PdhValidatePathExA (PDH.@) */ PDH_STATUS WINAPI PdhValidatePathExA( PDH_HLOG source, LPCSTR path )

1 0

Gabriel Ivăncescu : comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ac174f4cf433176b0f582e83b6103adbf9537af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac174f4cf433176b0f582e83… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:16 2018 +0200 comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 6 +++--- dlls/comctl32/tests/listbox.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4a2df52..76b09aa 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,8 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((DWORD *)buffer) = *(DWORD *)&descr->items[index].data; - len = sizeof(DWORD); + *((ULONG_PTR *)buffer) = descr->items[index].data; + len = sizeof(ULONG_PTR); } return len; } @@ -2653,7 +2653,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!HAS_STRINGS(descr)) return sizeof(DWORD); + if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); return strlenW( descr->items[wParam].str ); case LB_GETCURSEL: diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 6ac3c73..802dd98 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2296,12 +2296,11 @@ static void test_LBS_NODATA(void) ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42); ok(ret == TRUE, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0); - todo_wine_if(text_len == 8) + todo_wine_if(is_wow64) ok(ret == text_len, "Unexpected return value %d.\n", ret); memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

1 0