June 2023 - Wine-Commits - list.winehq.org

Davide Beatrici : wineoss: Use mmdevapi's stream_release.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: cafed10a111db30ba17e56aa09a6c1da60ae1d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/cafed10a111db30ba17e56aa09a6c1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jun 17 09:44:10 2023 +0200 wineoss: Use mmdevapi's stream_release. --- dlls/wineoss.drv/mmdevdrv.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c1d9cc6d1a9..950b711bad0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -87,6 +87,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void); void DECLSPEC_HIDDEN sessions_lock(void) @@ -141,17 +143,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -static HRESULT stream_release(stream_handle stream, HANDLE timer_thread) -{ - struct release_stream_params params; - - params.stream = stream; - params.timer_thread = timer_thread; - OSS_CALL(release_stream, &params); - - return params.result; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) {

1 0

Davide Beatrici : winealsa: Use mmdevapi's stream_release.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: d49a6b773e76e4c399a18d295d51e0c3053f2b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/d49a6b773e76e4c399a18d295d51e0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jun 17 09:43:39 2023 +0200 winealsa: Use mmdevapi's stream_release. --- dlls/winealsa.drv/mmdevdrv.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 916e04ff047..d8596c9371c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void); void DECLSPEC_HIDDEN sessions_lock(void) @@ -127,18 +129,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) -{ - struct release_stream_params params; - - params.stream = stream; - params.timer_thread = timer_thread; - - ALSA_CALL(release_stream, &params); - - return params.result; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -443,7 +433,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) - alsa_stream_release(This->stream, This->timer_thread); + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -648,7 +638,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ - alsa_stream_release(stream, NULL); + stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{

1 0

Davide Beatrici : winepulse: Move stream_release into mmdevapi.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 959dd9a9a38aace40ad741afb46dc55eff562713 URL: https://gitlab.winehq.org/wine/wine/-/commit/959dd9a9a38aace40ad741afb46dc5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jun 17 09:43:05 2023 +0200 winepulse: Move stream_release into mmdevapi. --- dlls/mmdevapi/client.c | 12 ++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 16 +++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index a0a2b225c0b..5d807776ff0 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -177,6 +177,18 @@ static DWORD CALLBACK timer_loop_func(void *user) return 0; } +HRESULT stream_release(stream_handle stream, HANDLE timer_thread) +{ + struct release_stream_params params; + + params.stream = stream; + params.timer_thread = timer_thread; + + WINE_UNIX_CALL(release_stream, &params); + + return params.result; +} + static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) { WCHAR pn[37]; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6221856481d..4efc75dc5a5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -133,6 +133,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) @@ -147,14 +149,6 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void pulse_release_stream(stream_handle stream, HANDLE timer) -{ - struct release_stream_params params; - params.stream = stream; - params.timer_thread = timer; - pulse_call(release_stream, &params); -} - static void set_stream_volumes(ACImpl *This) { struct set_volumes_params params; @@ -444,7 +438,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) { if (This->stream) { - pulse_release_stream(This->stream, This->timer_thread); + stream_release(This->stream, This->timer_thread); This->stream = 0; sessions_lock(); list_remove(&This->entry); @@ -639,7 +633,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { - pulse_release_stream(stream, NULL); + stream_release(stream, NULL); sessions_unlock(); return E_OUTOFMEMORY; } @@ -652,7 +646,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, free(This->vols); This->vols = NULL; sessions_unlock(); - pulse_release_stream(stream, NULL); + stream_release(stream, NULL); return E_OUTOFMEMORY; }

1 0

Alex Henrie : hhctrl: Initialize item->items to NULL in parse_index_sitemap_object (scan-build).
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: add5c43fdba9cddbd34fb04a922869f2a663a61e URL: https://gitlab.winehq.org/wine/wine/-/commit/add5c43fdba9cddbd34fb04a922869… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jun 17 18:46:37 2023 -0600 hhctrl: Initialize item->items to NULL in parse_index_sitemap_object (scan-build). Initializing to NULL makes it more clear that the initial value is only used as a parameter to realloc. --- dlls/hhctrl.ocx/index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 113daa9efc9..231434aa10f 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -129,7 +129,7 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream) item = calloc(1, sizeof(IndexItem)); item->nItems = 0; - item->items = calloc(2, sizeof(void *)); + item->items = NULL; item->itemFlags = 0x11; while(next_node(stream, &node)) {

1 0

Alex Henrie : comctl32: Remove duplicate declarations of MONTHCAL functions.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 47e044b81d30a4fb96199d965d1fa5dcca423758 URL: https://gitlab.winehq.org/wine/wine/-/commit/47e044b81d30a4fb96199d965d1fa5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 16 21:26:12 2023 -0600 comctl32: Remove duplicate declarations of MONTHCAL functions. MONTHCAL_MonthLength and MONTHCAL_CalculateDayOfWeek are already declared in dlls/comctl32/comctl32.h. --- dlls/comctl32/datetime.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ce154aacbea..393406e778b 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -81,10 +81,6 @@ typedef struct int pendingUpdown; } DATETIME_INFO, *LPDATETIME_INFO; -/* in monthcal.c */ -extern int MONTHCAL_MonthLength(int month, int year); -extern int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); - /* this list of defines is closely related to `allowedformatchars' defined * in datetime.c; the high nibble indicates the `base type' of the format * specifier.

1 0

Alex Henrie : comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 15c00627eeb88237beeb28fa605f93b6c9c70c53 URL: https://gitlab.winehq.org/wine/wine/-/commit/15c00627eeb88237beeb28fa605f93… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 16 19:30:38 2023 -0600 comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath. The function is exported by name from shell32 and declared in a public header. --- dlls/comdlg32/cdlg.h | 3 --- dlls/comdlg32/cdlg32.c | 18 ------------------ dlls/comdlg32/itemdlg.c | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 1ddd157b880..8039d6d6bd0 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -182,9 +182,6 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) DECLSPEC_HIDD extern BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; extern BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; -/* SHELL */ -extern LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID); - #define ONOPEN_BROWSE 1 #define ONOPEN_OPEN 2 #define ONOPEN_SEARCH 3 diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index f9619cc6a49..b9e19b78a34 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -43,11 +43,6 @@ DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; -static HINSTANCE SHELL32_hInstance; - -/* SHELL */ -LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID) DECLSPEC_HIDDEN; - /*********************************************************************** * DllMain (COMDLG32.init) * @@ -57,14 +52,6 @@ LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID) DECLSPEC_HIDDE * FALSE if sibling could not be loaded or instantiated twice, TRUE * otherwise. */ -static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n"; -#define GPA(dest, hinst, name) \ - if(!(dest = (void*)GetProcAddress(hinst,name)))\ - { \ - ERR(GPA_string, debugstr_a(name), hinst); \ - return FALSE; \ - } - BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) { TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved); @@ -74,11 +61,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) case DLL_PROCESS_ATTACH: COMDLG32_hInstance = hInstance; DisableThreadLibraryCalls(hInstance); - - SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL"); - - /* SHELL */ - GPA(COMDLG32_SHSimpleIDListFromPathAW, SHELL32_hInstance, (LPCSTR)162); break; case DLL_PROCESS_DETACH: diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f3b9a217e79..1feb1deda00 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -599,7 +599,7 @@ static HRESULT on_default_action(FileDialogImpl *This) } } - pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename); + pidla[i] = SHSimpleIDListFromPath(canon_filename); if(psf_parent && !(open_action == ONOPEN_BROWSE)) IShellFolder_Release(psf_parent);

1 0

Fabian Maurer : gdiplus: Refactor and add comments for easier understanding.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 2c235b6fe42211019bf643b2500c5aed8255b856 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c235b6fe42211019bf643b2500c5a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jun 16 21:42:59 2023 +0200 gdiplus: Refactor and add comments for easier understanding. Hopefully useful for people like me who had a hard time understanding what was going on. Especially with the rearranged divison and the simplification I had a hard time seeing why that does what it does Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdiplus/graphicspath.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 656069d7ffe..4da84a9eac5 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -127,13 +127,15 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R GpPointF mp[5]; GpPointF pt, pt_st; path_list_node_t *node; + REAL area_triangle, distance_start_end; - /* calculate bezier curve middle points == new control points */ - mp[0].X = (start->pt.X + x2) / 2.0; - mp[0].Y = (start->pt.Y + y2) / 2.0; /* middle point between control points */ pt.X = (x2 + x3) / 2.0; pt.Y = (y2 + y3) / 2.0; + + /* calculate bezier curve middle points == new control points */ + mp[0].X = (start->pt.X + x2) / 2.0; + mp[0].Y = (start->pt.Y + y2) / 2.0; mp[1].X = (mp[0].X + pt.X) / 2.0; mp[1].Y = (mp[0].Y + pt.Y) / 2.0; mp[4].X = (end->pt.X + x3) / 2.0; @@ -141,19 +143,28 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R mp[3].X = (mp[4].X + pt.X) / 2.0; mp[3].Y = (mp[4].Y + pt.Y) / 2.0; + /* middle point between new control points */ mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + /* Is one pair of the new control points equal to the old control points? */ if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) return TRUE; pt = end->pt; pt_st = start->pt; - /* check flatness as a half of distance between middle point and a linearized path */ - if(fabs(((pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + - (pt_st.Y*pt.X - pt_st.X*pt.Y))) <= - (0.5 * flatness*sqrtf((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){ + + /* check flatness as a half of distance between middle point and a linearized path + * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) + * is defined as (area_triangle / distance_start_end): + * | (x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1) / sqrt( (x2 - x1)^2 + (y2 - y1)^2 ) | + * Here rearranged to avoid division and simplified: + * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) + */ + area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); + distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); + if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ return TRUE; } else

1 0

Jactry Zeng : atl: Convert REG_DWORD to a correct type.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 7a353e15f685e146aab276886a40add062a4db00 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a353e15f685e146aab276886a40ad… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jun 16 23:32:10 2023 -0500 atl: Convert REG_DWORD to a correct type. --- dlls/atl/registrar.c | 2 +- dlls/atl/tests/registrar.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 9009cd1c7cf..59023944147 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -280,7 +280,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO hres = get_word(&iter, buf); if(FAILED(hres)) break; - dw = wcstol(buf->str, NULL, 10); + dw = wcstoul(buf->str, NULL, 10); lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) { diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index f6b9d422cb5..38e6dc9d3f9 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -49,6 +49,10 @@ static const char textA[] = " val 'dword_unquoted_dec' = d 1 \n" " val 'dword_quoted_hex' = d '0xA' \n" " val 'dword_unquoted_hex' = d 0xA \n" +" val 'dword_negative' = d -2147483648 \n" +" val 'dword_ulong' = d 2147483649 \n" +" val 'dword_max' = d 4294967295 \n" +" val 'dword_overrange' = d 4294967296 \n" " val 'binary_quoted' = b 'deadbeef' \n" " val 'binary_unquoted' = b dead0123 \n" " } \n" @@ -72,6 +76,10 @@ static void test_registrar(void) { "dword_quoted_dec", TRUE, 1 }, { "dword_quoted_hex", FALSE, 0xA }, { "dword_unquoted_hex", FALSE, 0xA }, + { "dword_negative", FALSE, -2147483648 }, + { "dword_ulong", TRUE, 2147483649 }, + { "dword_max", TRUE, 4294967295 }, + { "dword_overrange", FALSE, 4294967296 }, }; if (!GetProcAddress(GetModuleHandleA("atl.dll"), "AtlAxAttachControl"))

1 0

Alex Henrie : combase: Don't export hProxyDll or rpc_execute_call.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: f9785543a85018eec6e1da52e790b321e9e9c8ee URL: https://gitlab.winehq.org/wine/wine/-/commit/f9785543a85018eec6e1da52e790b3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 16 21:20:00 2023 -0600 combase: Don't export hProxyDll or rpc_execute_call. --- dlls/combase/combase_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 19e3def0b4e..52facd44792 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -19,7 +19,7 @@ #include "wine/list.h" -extern HINSTANCE hProxyDll; +extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; struct apartment { @@ -132,7 +132,7 @@ HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HI void rpc_unregister_channel_hooks(void) DECLSPEC_HIDDEN; struct dispatch_params; -void rpc_execute_call(struct dispatch_params *params); +void rpc_execute_call(struct dispatch_params *params) DECLSPEC_HIDDEN; enum class_reg_data_origin {

1 0

Jactry Zeng : atl/tests: Move regular DWORD tests into a loop.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: 6468ffd8bb171a0a5fbfd27eb8dda79f300c565c URL: https://gitlab.winehq.org/wine/wine/-/commit/6468ffd8bb171a0a5fbfd27eb8dda7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jun 16 22:21:00 2023 -0500 atl/tests: Move regular DWORD tests into a loop. --- dlls/atl/tests/registrar.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index ab31f9532b1..f6b9d422cb5 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -59,7 +59,20 @@ static void test_registrar(void) IRegistrar *registrar = NULL; HRESULT hr; INT count; + int i; WCHAR *textW = NULL; + struct dword_test + { + const char *name; + BOOL preserved; + LONGLONG value; + } dword_tests[] = + { + { "dword_unquoted_dec", TRUE, 1 }, + { "dword_quoted_dec", TRUE, 1 }, + { "dword_quoted_hex", FALSE, 0xA }, + { "dword_unquoted_hex", FALSE, 0xA }, + }; if (!GetProcAddress(GetModuleHandleA("atl.dll"), "AtlAxAttachControl")) { @@ -112,25 +125,16 @@ static void test_registrar(void) ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); ok(!strcmp( buffer, "str'ing"), "wrong data %s\n", debugstr_a(buffer)); - size = sizeof(dword); - lret = RegQueryValueExA(key, "dword_unquoted_hex", NULL, NULL, (BYTE*)&dword, &size); - ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); - ok(dword != 0xA, "unquoted hex is not supposed to be preserved\n"); - - size = sizeof(dword); - lret = RegQueryValueExA(key, "dword_quoted_hex", NULL, NULL, (BYTE*)&dword, &size); - ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); - ok(dword != 0xA, "quoted hex is not supposed to be preserved\n"); - - size = sizeof(dword); - lret = RegQueryValueExA(key, "dword_unquoted_dec", NULL, NULL, (BYTE*)&dword, &size); - ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); - ok(dword == 1, "unquoted dec is not supposed to be %ld\n", dword); - - size = sizeof(dword); - lret = RegQueryValueExA(key, "dword_quoted_dec", NULL, NULL, (BYTE*)&dword, &size); - ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); - ok(dword == 1, "quoted dec is not supposed to be %ld\n", dword); + for (i = 0; i < ARRAYSIZE(dword_tests); i++) + { + size = sizeof(dword); + lret = RegQueryValueExA(key, dword_tests[i].name, NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "Test %d: RegQueryValueExA failed %ld.\n", i, lret); + if (dword_tests[i].preserved) + ok(dword == dword_tests[i].value, "Test %d: got unexpected value %lu.\n", i, dword); + else + ok(dword != dword_tests[i].value, "Test %d: is not supposed to be preserved.\n", i); + } size = 4; lret = RegQueryValueExA(key, "binary_quoted", NULL, NULL, bytes, &size);

1 0