October 2014 - Wine-Commits

Bruno Jesus : advapi32/tests: Fix copy & paste issue (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: c7772a5d10c64c5ccf184c0ba5bb01f1609d916a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7772a5d10c64c5ccf184c0ba… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:04:22 2014 -0200 advapi32/tests: Fix copy & paste issue (Cppcheck). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82391e1..1445f6f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1136,7 +1136,7 @@ static void test_reg_open_key(void) ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); - bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + error = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error);

1 0

Hans Leidekker : msvcrt: Implement _snprintf_l.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79b3f9a52bcab2b748ceb41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:08:26 2014 +0100 msvcrt: Implement _snprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d6c38f4..91805ee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1289,7 +1289,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 02b6497..5de6965 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1647,7 +1647,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce09f00..b7f0a86 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -969,7 +969,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e4302cf..a8ad25f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -944,7 +944,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f376db3..37046c3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -912,7 +912,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf # stub _snprintf_c(ptr long str) # stub _snprintf_c_l(ptr long str ptr) -# stub _snprintf_l(ptr long str ptr) +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4123d06..a6a4fe7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -818,6 +818,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _snprintf_s (MSVCRT.@) */ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,

1 0

Iván Matellanes : msvcrt: Added _fgetc_nolock implementation.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 878b4a92803eeac38b218e55dc9f41a6d503deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=878b4a92803eeac38b218e55d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:43 2014 +0100 msvcrt: Added _fgetc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/file.c | 16 ++++++++++++++-- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 91805ee..e33f5fe 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -800,6 +800,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5de6965..88144a3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1148,6 +1148,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b7f0a86..5c01600 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -467,6 +467,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a8ad25f..d9d99f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -449,6 +449,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d191953..dbbbe78 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3503,10 +3503,23 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fgetc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fgetc_nolock(MSVCRT_FILE* file) +{ unsigned char *i; unsigned int j; - MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; @@ -3514,7 +3527,6 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); - MSVCRT__unlock_file(file); return j; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9f00923..137bec2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -916,6 +916,7 @@ int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); +int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 305d251..54c07fe 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); +int __cdecl _fgetc_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Bruno Jesus : comctl32/tests: Remove a dead assignment from dpa.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 2c5f05b860d0f69b249746523374851d90ea5e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5f05b860d0f69b249746523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:32:04 2014 -0200 comctl32/tests: Remove a dead assignment from dpa.c (Cppcheck). --- dlls/comctl32/tests/dpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 644f3aa..4eb32a4 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -271,7 +271,7 @@ static void test_dpa(void) ok(rc, "dw2=0x%x\n", dw2); /* Clone into an old DPA */ - p = NULL; SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); rc=CheckDPA(dpa3, 0x123456, &dw3);

1 0

Bruno Jesus : comctl32: Remove dead assignment in tooltips.c (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: a54c187886353bd7c6bcc6d43b85e1101a0627f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c187886353bd7c6bcc6d43… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:17:34 2014 -0200 comctl32: Remove dead assignment in tooltips.c (Cppcheck). --- dlls/comctl32/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index f74ea65..7564c3f 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -234,7 +234,7 @@ TOOLTIPS_customdraw_fill(const TOOLTIPS_INFO *infoPtr, NMTTCUSTOMDRAW *lpnmttcd, static inline DWORD TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) { - LRESULT result = CDRF_DODEFAULT; + LRESULT result; lpnmttcd->nmcd.dwDrawStage = dwDrawStage; TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,

1 0

Bruno Jesus : comctl32: Remove a dead assignment in comctl32undoc.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 197ea35c5a0f140d4cedd24c754f9eb83afc1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197ea35c5a0f140d4cedd24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:41:01 2014 -0200 comctl32: Remove a dead assignment in comctl32undoc.c (Cppcheck). --- dlls/comctl32/comctl32undoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index f20857c..97bbf1a 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -690,8 +690,8 @@ static HANDLE create_mru_list(LPWINEMRULIST mp) /* get values from key 'MRUList' */ if (newkey) { datasize = (mp->extview.uMax + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { + if (RegQueryValueExW( newkey, strMRUList, 0, &type, + (LPBYTE)mp->realMRU, &datasize)) { /* not present - set size to 1 (will become 0 later) */ datasize = 1; *mp->realMRU = 0;

1 0

Bruno Jesus : atl: Remove dead assignment.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 36c331f2e95d69499ee734523d85c285bf58ff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c331f2e95d69499ee734523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:22:55 2014 -0200 atl: Remove dead assignment. --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 32e207e..96fcb0e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -380,7 +380,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) { LPCOLESTR iter = data; strbuf buf; - HRESULT hres = S_OK; + HRESULT hres; unsigned int i; strbuf_init(&buf);

1 0

Bruno Jesus : advpack/tests: Remove dead assignment (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: c1b2fc3c4f89efd753abf17272600c9ae7c5fbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b2fc3c4f89efd753abf1727… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:16:14 2014 -0200 advpack/tests: Remove dead assignment (Cppcheck). --- dlls/advpack/tests/advpack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index f3e70d7..5b9ed42 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -187,7 +187,6 @@ static void delnode_test(void) CloseHandle(hn); hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); - currDir[currDirLen] = '\0'; } static void append_str(char **str, const char *data, ...)

1 0

Michael Stefaniuc : comdlg32: Use the proper macro to create an int atom ( PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 50a877d69fbbd3fa1bf3ab76966fa47850868690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a877d69fbbd3fa1bf3ab769… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:39:44 2014 +0100 comdlg32: Use the proper macro to create an int atom (PVS-Studio). --- dlls/comdlg32/cdlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c437183..886804c 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -24,7 +24,7 @@ #include "dlgs.h" /* Common dialogs implementation globals */ -#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Format registry values before interpreting value type.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 7f57d8f19a195e5283fea75c86d25d4a4bc0b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f57d8f19a195e5283fea75c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:09:06 2014 +0100 msi: Format registry values before interpreting value type. --- dlls/msi/action.c | 24 ++++++++++-------------- dlls/msi/tests/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e310ba3..66c2858 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2438,9 +2438,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, DWORD *size ) +static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) { - BYTE *data = NULL; + BYTE *data; if (!value) { @@ -2529,19 +2529,18 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, else { const WCHAR *ptr = value; - DWORD len; *type = REG_SZ; if (value[0] == '#') { - ptr++; + ptr++; len--; if (value[1] == '%') { - ptr++; + ptr++; len--; *type = REG_EXPAND_SZ; } } - len = deformat_string( package, ptr, (WCHAR **)&data ); + data = (BYTE *)msi_strdupW( ptr, len ); if (len > strlenW( (const WCHAR *)data )) *type = REG_MULTI_SZ; *size = (len + 1) * sizeof(WCHAR); } @@ -2872,14 +2871,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_FUNCTION_FAILED; } - str = msi_record_get_string( row, 5, &len ); - if (str && len > strlenW( str )) - { - type = REG_MULTI_SZ; - new_size = (len + 1) * sizeof(WCHAR); - new_value = (BYTE *)msi_strdupW( str, len ); - } - else new_value = parse_value( package, str, &type, &new_size ); + str = msi_record_get_string( row, 5, NULL ); + len = deformat_string( package, str, &deformated ); + new_value = parse_value( package, deformated, len, &type, &new_size ); + + msi_free( deformated ); deformat_string(package, name, &deformated); if (!is_special_entry( name )) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9f1651d..a8903d9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -186,7 +186,8 @@ static const char property_dat[] = "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" - "MSIFASTINSTALL\t1\n"; + "MSIFASTINSTALL\t1\n" + "regdata15\t#x01\n"; static const char environment_dat[] = "Environment\tName\tValue\tComponent_\n" @@ -514,7 +515,11 @@ static const char wrv_registry_dat[] = "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n"; + "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" + "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" + "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" + "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -4923,6 +4928,7 @@ static void test_write_registry_values(void) HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; + BYTE buf[8]; if (is_process_limited()) { @@ -5055,6 +5061,42 @@ static void test_write_registry_values(void) ok(size == 5, "Expected 5, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5063,6 +5105,10 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value5"); RegDeleteValueA(hkey, "Value6"); RegDeleteValueA(hkey, "Value7"); + RegDeleteValueA(hkey, "Value8"); + RegDeleteValueA(hkey, "Value9"); + RegDeleteValueA(hkey, "Value10"); + RegDeleteValueA(hkey, "Value11"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0