May 2018 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite/tests: Use ARRAY_SIZE() macro in tests.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 63bdcf97a7332b2f413a8b2c06d3d22dbbd7f922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bdcf97a7332b2f413a8b2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:50:42 2018 +0300 dwrite/tests: Use ARRAY_SIZE() macro in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 20 ++++++----- dlls/dwrite/tests/font.c | 60 ++++++++++++++++--------------- dlls/dwrite/tests/layout.c | 86 ++++++++++++++++++++++---------------------- 3 files changed, 86 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63bdcf97a7332b2f413a…

1 0

Nikolay Sivov : dwrite: Properly truncate face name to LOGFONT size.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: e5966d747543ebe2bc4270c424f16f50e9972524 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5966d747543ebe2bc4270c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:50:43 2018 +0300 dwrite: Properly truncate face name to LOGFONT size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 15 +++++++++++++-- dlls/dwrite/tests/font.c | 9 +++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b95083e..db44368 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1736,8 +1736,19 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * if (!exists) IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); - if (exists) - IDWriteLocalizedStrings_GetString(lfnames, index, lfname, LF_FACESIZE); + if (exists) { + UINT32 length = 0; + WCHAR *nameW; + + IDWriteLocalizedStrings_GetStringLength(lfnames, index, &length); + nameW = heap_alloc((length + 1) * sizeof(WCHAR)); + if (nameW) { + *nameW = 0; + IDWriteLocalizedStrings_GetString(lfnames, index, nameW, length + 1); + lstrcpynW(lfname, nameW, LF_FACESIZE); + heap_free(nameW); + } + } IDWriteLocalizedStrings_Release(lfnames); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index db9949f..f23bfcc 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2515,6 +2515,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) if (exists) { static const WCHAR enusW[] = {'e','n','-','u','s',0}; WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + WCHAR nameW[256]; UINT32 index; /* Fallback to en-us if there's no string for user locale. */ @@ -2525,8 +2526,12 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) if (!exists) IDWriteLocalizedStrings_FindLocaleName(names, enusW, &index, &exists); - if (exists) - IDWriteLocalizedStrings_GetString(names, index, logfont->lfFaceName, ARRAY_SIZE(logfont->lfFaceName)); + if (exists) { + nameW[0] = 0; + hr = IDWriteLocalizedStrings_GetString(names, index, nameW, ARRAY_SIZE(nameW)); + ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr); + lstrcpynW(logfont->lfFaceName, nameW, ARRAY_SIZE(logfont->lfFaceName)); + } } IDWriteLocalizedStrings_Release(names);

1 0

Alexandre Julliard : user32: Don' t send cross-process message for GetWindowTextLength().
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 51e8d579bb643859385edcf53b263eeeb13dd9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e8d579bb643859385edcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 13:00:34 2018 +0200 user32: Don't send cross-process message for GetWindowTextLength(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 28 +++++++++++++++++++++------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 3 ++- server/window.c | 5 ++--- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 850f0ba..7c12825 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -461,18 +461,23 @@ static void update_window_state( HWND hwnd ) * * Retrieve the window text from the server. */ -static void get_server_window_text( HWND hwnd, LPWSTR text, INT count ) +static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) { - size_t len = 0; + data_size_t len = 0, needed = 0; SERVER_START_REQ( get_window_text ) { req->handle = wine_server_user_handle( hwnd ); - wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) len = wine_server_reply_size(reply); + if (count) wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); + if (!wine_server_call_err( req )) + { + needed = reply->length; + len = wine_server_reply_size(reply); + } } SERVER_END_REQ; - text[len / sizeof(WCHAR)] = 0; + if (text) text[len / sizeof(WCHAR)] = 0; + return needed; } @@ -2875,7 +2880,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString ) */ INT WINAPI GetWindowTextLengthA( HWND hwnd ) { - return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + CPINFO info; + + if (WIN_IsCurrentProcess( hwnd )) return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + GetCPInfo( CP_ACP, &info ); + return get_server_window_text( hwnd, NULL, 0 ) * info.MaxCharSize; } /******************************************************************* @@ -2883,7 +2894,10 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) */ INT WINAPI GetWindowTextLengthW( HWND hwnd ) { - return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + return get_server_window_text( hwnd, NULL, 0 ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6aee918..564ae92 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3703,7 +3703,9 @@ struct get_window_text_request struct get_window_text_reply { struct reply_header __header; + data_size_t length; /* VARARG(text,unicode_str); */ + char __pad_12[4]; }; @@ -6509,6 +6511,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 551 +#define SERVER_PROTOCOL_VERSION 552 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 1673ae3..9fb155b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2659,6 +2659,7 @@ enum coords_relative @REQ(get_window_text) user_handle_t handle; /* handle to the window */ @REPLY + data_size_t length; /* total length in WCHARs */ VARARG(text,unicode_str); /* window text */ @END diff --git a/server/request.h b/server/request.h index f69ff16..3e6183b 100644 --- a/server/request.h +++ b/server/request.h @@ -1772,7 +1772,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); -C_ASSERT( sizeof(struct get_window_text_reply) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); +C_ASSERT( sizeof(struct get_window_text_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct set_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 ); diff --git a/server/trace.c b/server/trace.c index ac15ba9..44004ad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3233,7 +3233,8 @@ static void dump_get_window_text_request( const struct get_window_text_request * static void dump_get_window_text_reply( const struct get_window_text_reply *req ) { - dump_varargs_unicode_str( " text=", cur_size ); + fprintf( stderr, " length=%u", req->length ); + dump_varargs_unicode_str( ", text=", cur_size ); } static void dump_set_window_text_request( const struct set_window_text_request *req ) diff --git a/server/window.c b/server/window.c index 9560f93..4a1a278 100644 --- a/server/window.c +++ b/server/window.c @@ -2398,9 +2398,8 @@ DECL_HANDLER(get_window_text) if (win && win->text) { - data_size_t len = strlenW( win->text ) * sizeof(WCHAR); - if (len > get_reply_max_size()) len = get_reply_max_size(); - set_reply_data( win->text, len ); + reply->length = strlenW( win->text ); + set_reply_data( win->text, min( reply->length * sizeof(WCHAR), get_reply_max_size() )); } }

1 0

Henri Verbeet : d3d11/tests: Rebind the pixel shader between runs with different sample counts in test_sampleinfo_instruction ().
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: cf4baf95a30633abfd9fa85255a4d250afb43d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4baf95a30633abfd9fa852… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 17:26:48 2018 +0430 d3d11/tests: Rebind the pixel shader between runs with different sample counts in test_sampleinfo_instruction(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 894c744..09301c7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20005,7 +20005,6 @@ static void test_sampleinfo_instruction(void) hr = ID3D11Device_CreatePixelShader(device, ps_rt_code, sizeof(ps_rt_code), NULL, &ps_rt); ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); - ID3D11DeviceContext_PSSetShader(context, ps_rt, NULL, 0); for (sample_count = 1; sample_count <= 8; sample_count *= 2) { texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; @@ -20026,6 +20025,11 @@ static void test_sampleinfo_instruction(void) ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + /* Some drivers (AMD Radeon HD 6310) return stale sample counts if we + * don't rebind the pixel shader between runs with different sample + * counts. */ + ID3D11DeviceContext_PSSetShader(context, NULL, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps_rt, NULL, 0); draw_quad(&test_context); if (sample_count != 1)

1 0

Zebediah Figura : msi/tests: Avoid calling MsiSetTargetPath("TARGETDIR").
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 30fe6f43612ce0a7d65ec16f751d3212cb78c1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=30fe6f43612ce0a7d65ec16f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 21:55:43 2018 -0500 msi/tests: Avoid calling MsiSetTargetPath("TARGETDIR"). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9c9966c..08e4bbd 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -577,18 +577,18 @@ static void test_targetpath(MSIHANDLE hinst) r = MsiSetTargetPathA(hinst, NULL, "C:\\subdir"); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", NULL); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", NULL); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\subdir"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\subdir"); ok(hinst, !r, "got %u\n", r); sz = sizeof(buffer); - r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); + r = MsiGetTargetPathA(hinst, "MSITESTDIR", buffer, &sz); ok(hinst, !r, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:\\subdir\\"), "got \"%s\"\n", buffer); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\"); /* test GetSourcePath() */

1 0

Zebediah Figura : msi/tests: Test deferral of DuplicateFiles and RemoveDuplicateFiles.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 4d9d73e1b95ced3c66beaeab0e337c4b9eec52d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9d73e1b95ced3c66beaeab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:53 2018 -0500 msi/tests: Test deferral of DuplicateFiles and RemoveDuplicateFiles. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 22 ++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 38 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 70baaa3..966158b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1081,13 +1081,26 @@ static const char rd_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "RemoveDuplicateFiles\t\t1900\n" + "rd_immediate\tREMOVE\t1901\n" + "rd_deferred\tREMOVE\t1902\n" "InstallFiles\t\t2000\n" "DuplicateFiles\t\t2100\n" + "df_immediate\tNOT REMOVE\t2101\n" + "df_deferred\tNOT REMOVE\t2102\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rd_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "df_immediate\t1\tcustom.dll\trd_absent\n" + "df_deferred\t1025\tcustom.dll\trd_present\n" + "rd_immediate\t1\tcustom.dll\trd_present\n" + "rd_deferred\t1025\tcustom.dll\trd_absent\n"; + static const char rrv_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1996,6 +2009,7 @@ static const msi_table rd_tables[] = ADD_TABLE(rd_file), ADD_TABLE(rd_duplicate_file), ADD_TABLE(rd_install_exec_seq), + ADD_TABLE(rd_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 08e4bbd..aa4f667 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1274,3 +1274,25 @@ UINT WINAPI sss_stopped(MSIHANDLE hinst) CloseServiceHandle(manager); return ERROR_SUCCESS; } + +UINT WINAPI rd_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\original2.txt"), "file absent\n"); + ok(hinst, pf_exists("msitest\\duplicate.txt"), "file absent\n"); +} + ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI rd_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\original2.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate.txt"), "file present\n"); +} + ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 01b95e9..10e7e9d 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,6 +7,8 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall rd_present(long) +@ stdcall rd_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) @ stdcall sis_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of InstallFiles and RemoveFiles.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 99562a56170f51002c817cd353fa62325c056ab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99562a56170f51002c817cd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:54 2018 -0500 msi/tests: Test deferral of InstallFiles and RemoveFiles. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 8 ++++++++ dlls/msi/tests/custom.c | 18 ++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 28 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 966158b..d2fad6c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -643,6 +643,8 @@ static const char cf_install_exec_seq_dat[] = "CostInitialize\t\t800\n" "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" + "rfi_immediate\tREMOVE\t3501\n" + "rfi_deferred\tREMOVE\t3502\n" "CreateFolders\t\t3700\n" "cf_immediate\tNOT REMOVE\t3701\n" "cf_deferred\tNOT REMOVE\t3702\n" @@ -650,6 +652,8 @@ static const char cf_install_exec_seq_dat[] = "rf_immediate\tREMOVE\t3801\n" "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" + "ifi_immediate\tNOT REMOVE\t4001\n" + "ifi_deferred\tNOT REMOVE\t4002\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" @@ -665,6 +669,10 @@ static const char cf_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" + "ifi_immediate\t1\tcustom.dll\tfile_absent\n" + "ifi_deferred\t1025\tcustom.dll\tfile_present\n" + "rfi_immediate\t1\tcustom.dll\tfile_present\n" + "rfi_deferred\t1025\tcustom.dll\tfile_absent\n" "cf_immediate\t1\tcustom.dll\tcf_absent\n" "cf_deferred\t1025\tcustom.dll\tcf_present\n" "rf_immediate\t1\tcustom.dll\tcf_present\n" diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index aa4f667..4e3e2dc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1180,6 +1180,24 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } +UINT WINAPI file_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first\\one.txt"), "file absent\n"); + ok(hinst, pf_exists("msitest\\second\\two.txt"), "file absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI file_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first\\one.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\second\\two.txt"), "file present\n"); +} + return ERROR_SUCCESS; +} + UINT WINAPI crs_present(MSIHANDLE hinst) { todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 10e7e9d..1b15ca9 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,6 +7,8 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall file_present(long) +@ stdcall file_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : odbccp32: Clean up SQLGetInstalledDrivers().
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 169960b676e6b6a36f8a69a626072f3f5a846bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169960b676e6b6a36f8a69a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:55 2018 -0500 odbccp32: Clean up SQLGetInstalledDrivers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 138 +++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 70 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index f9a2269..8788330 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -482,99 +482,97 @@ BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) return TRUE; } -/* This is implemented sensibly rather than according to exact conformance to Microsoft's buggy implementations - * e.g. The Microsoft one occasionally actually adds a third nul character (possibly beyond the buffer). - * e.g. If the key has no drivers then version 3.525.1117.0 does not modify the buffer at all, not even a nul character. - */ -BOOL WINAPI SQLGetInstalledDriversW(LPWSTR lpszBuf, WORD cbBufMax, - WORD *pcbBufOut) +BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) { - HKEY hDrivers; /* Registry handle to the Drivers key */ - LONG reg_ret; /* Return code from registry functions */ - BOOL success = FALSE; /* The value we will return */ + WORD written = 0; + DWORD index = 0; + BOOL ret = TRUE; + DWORD valuelen; + WCHAR *value; + HKEY drivers; + DWORD len; + LONG res; clear_errors(); - TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + TRACE("%p %d %p\n", buf, size, sizeout); - if (!lpszBuf || cbBufMax == 0) + if (!buf || !size) { push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); + return FALSE; } - else if ((reg_ret = RegOpenKeyExW (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */, - drivers_key, 0, KEY_READ /* Maybe overkill */, - &hDrivers)) == ERROR_SUCCESS) + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drivers_key, 0, KEY_QUERY_VALUE, &drivers); + if (res) { - DWORD index = 0; - cbBufMax--; - success = TRUE; - while (cbBufMax > 0) - { - DWORD size_name; - size_name = cbBufMax; - if ((reg_ret = RegEnumValueW(hDrivers, index, lpszBuf, &size_name, NULL, NULL, NULL, NULL)) == ERROR_SUCCESS) - { - index++; - assert (size_name < cbBufMax && *(lpszBuf + size_name) == 0); - size_name++; - cbBufMax-= size_name; - lpszBuf+=size_name; - } - else - { - if (reg_ret != ERROR_NO_MORE_ITEMS) - { - success = FALSE; - push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); - } - break; - } - } - *lpszBuf = 0; - if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) - TRACE ("Error %d closing ODBC Drivers key\n", reg_ret); + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + return FALSE; } - else + + RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); + value = heap_alloc(++valuelen * sizeof(WCHAR)); + + size--; + + while (1) { - /* MSDN states that it returns failure with COMPONENT_NOT_FOUND in this case. - * Version 3.525.1117.0 (Windows 2000) does not; it actually returns success. - * I doubt if it will actually be an issue. - */ - push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + len = valuelen; + res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + lstrcpynW(buf + written, value, size - written); + written += min(len + 1, size - written); + } + else if (res == ERROR_NO_MORE_ITEMS) + break; + else + { + push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); + ret = FALSE; + break; + } } - return success; + + buf[written++] = 0; + + heap_free(value); + RegCloseKey(drivers); + if (sizeout) + *sizeout = written; + return ret; } -BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, - WORD *pcbBufOut) +BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) { + WORD written; + WCHAR *wbuf; BOOL ret; - int size_wbuf = cbBufMax; - LPWSTR wbuf; - WORD size_used; - TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + TRACE("%p %d %p\n", buf, size, sizeout); - wbuf = HeapAlloc(GetProcessHeap(), 0, size_wbuf*sizeof(WCHAR)); - if (wbuf) + if (!buf || !size) { - ret = SQLGetInstalledDriversW(wbuf, size_wbuf, &size_used); - if (ret) - { - if (!(ret = SQLInstall_narrow(2, lpszBuf, wbuf, size_used, cbBufMax, pcbBufOut))) - { - push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); - } - } - HeapFree(GetProcessHeap(), 0, wbuf); - /* ignore failure; we have achieved the aim */ + push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); + return FALSE; } - else + + wbuf = heap_alloc(size * sizeof(WCHAR)); + if (!wbuf) { push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); - ret = FALSE; + return FALSE; } - return ret; + + ret = SQLGetInstalledDriversW(wbuf, size, &written); + if (!ret) + return FALSE; + + *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); + + heap_free(wbuf); + return TRUE; } static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename)

1 0

Zebediah Figura : odbccp32/tests: Add tests for SQLGetInstalledDrivers().
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 3478a81a4cd2bfae173332aff71f679fc4fa2b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3478a81a4cd2bfae173332af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:56 2018 -0500 odbccp32/tests: Add tests for SQLGetInstalledDrivers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 4a72ad0..c12ff49 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -27,6 +27,15 @@ static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; +static void check_error_(int line, DWORD expect) +{ + RETCODE ret; + DWORD err; + ret = SQLInstallerError(1, &err, NULL, 0, NULL); + ok_(__FILE__, line)(ret == SQL_SUCCESS_WITH_INFO, "got %d\n", ret); + ok_(__FILE__, line)(err == expect, "expected %u, got %u\n", expect, ret); +} +#define check_error(a) check_error_(__LINE__, a) static void test_SQLConfigMode(void) { @@ -605,6 +614,63 @@ static void test_SQLInstallTranslatorEx(void) } +static void test_SQLGetInstalledDrivers(void) +{ + char buffer[1000], *p; + WORD written, len; + int found = 0; + BOOL ret; + + SQLInstallDriverEx("Wine test\0Driver=test.dll\0\0", NULL, buffer, + sizeof(buffer), &written, ODBC_INSTALL_COMPLETE, NULL); + + ret = SQLGetInstalledDrivers(NULL, sizeof(buffer), &written); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_INVALID_BUFF_LEN); + + ret = SQLGetInstalledDrivers(buffer, 0, &written); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_INVALID_BUFF_LEN); + + ret = SQLGetInstalledDrivers(buffer, 10, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer)); + ok(written == 10, "got written %d\n", written); + ok(!buffer[9], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, sizeof(buffer), &written); + ok(ret, "got %d\n", ret); + ok(!buffer[written-1] && !buffer[written-2], "buffer not doubly null-terminated\n"); + len = strlen(buffer); + + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "Wine test")) + found = 1; + } + ok(found, "installed driver not found\n"); + + ret = SQLGetInstalledDrivers(buffer, len, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len-2, "expected len %d, got %u\n", len-2, lstrlenA(buffer)); + ok(written == len, "expected written %d, got %d\n", len, written); + ok(!buffer[len-1], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, len+1, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len-1, "expected len %d, got %u\n", len-1, lstrlenA(buffer)); + ok(written == len+1, "expected written %d, got %d\n", len+1, written); + ok(!buffer[len], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, len+2, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len, "expected len %d, got %u\n", len, lstrlenA(buffer)); + ok(written == len+2, "expected written %d, got %d\n", len+2, written); + ok(!buffer[len+1], "buffer not doubly null-terminated\n"); + + SQLRemoveDriver("Wine test", TRUE, NULL); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -615,4 +681,5 @@ START_TEST(misc) test_SQLGetPrivateProfileStringW(); test_SQLInstallDriverEx(); test_SQLInstallTranslatorEx(); + test_SQLGetInstalledDrivers(); }

1 0

Zebediah Figura : msi/tests: Test installation of ODBC driver.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 7f69ea3c57b9caa0fd39e6cb3c0164d7b37aa21b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f69ea3c57b9caa0fd39e6cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:57 2018 -0500 msi/tests: Test installation of ODBC driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 2cfc59b..43a5657 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msi.dll -IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version +IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 custom_IMPORTS = uuid msi ole32 shell32 advapi32 diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index d2fad6c..e33decc 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -32,6 +32,7 @@ #include <wtypes.h> #include <shellapi.h> #include <winsvc.h> +#include <odbcinst.h> #include "wine/test.h" #include "utils.h" @@ -825,18 +826,22 @@ static const char odbc_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" + "odbc\todbc64\n" "odbc\todbc\n"; static const char odbc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" + "odbc64\t{B6F3E4AF-35D1-4B72-9044-989F03E20A43}\tMSITESTDIR\t256\tMsix64\tODBCdriver.dll\n" "odbc\t{B6F3E4AE-35D1-4B72-9044-989F03E20A43}\tMSITESTDIR\t0\t\tODBCdriver.dll\n"; static const char odbc_driver_dat[] = "Driver\tComponent_\tDescription\tFile_\tFile_Setup\n" "s72\ts72\ts255\ts72\tS72\n" "ODBCDriver\tDriver\n" + "64-bit driver\todbc64\tODBC test driver\tODBCdriver.dll\t\n" + "64-bit driver2\todbc64\tODBC test driver2\tODBCdriver2.dll\tODBCsetup.dll\n" "ODBC test driver\todbc\tODBC test driver\tODBCdriver.dll\t\n" "ODBC test driver2\todbc\tODBC test driver2\tODBCdriver2.dll\tODBCsetup.dll\n"; @@ -5347,6 +5352,9 @@ error: static void test_install_remove_odbc(void) { + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; UINT r; if (is_process_limited()) @@ -5379,6 +5387,19 @@ static void test_install_remove_odbc(void) ok(pf_exists("msitest\\ODBCtranslator2.dll"), "file not created\n"); ok(pf_exists("msitest\\ODBCsetup.dll"), "file not created\n"); + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(len < sizeof(buffer), "buffer too small\n"); + ok(r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } + ok(gotdriver, "driver not installed\n"); + ok(gotdriver2, "driver 2 not installed\n"); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5389,6 +5410,20 @@ static void test_install_remove_odbc(void) ok(!delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + gotdriver = gotdriver2 = 0; + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(len < sizeof(buffer), "buffer too small\n"); + ok(r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } + ok(!gotdriver, "driver not installed\n"); + ok(!gotdriver2, "driver 2 not installed\n"); + error: DeleteFileA("msitest\\ODBCdriver.dll"); DeleteFileA("msitest\\ODBCdriver2.dll");

1 0