October 2008 - Wine-Commits

Michael Stefaniuc : user32: HGDIOBJ is interchangeable with other handle types; no casts are needed.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 4fc84eaf5a90cfb9f3b25519e35aac507686aadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc84eaf5a90cfb9f3b25519e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 23:39:12 2008 +0200 user32: HGDIOBJ is interchangeable with other handle types; no casts are needed. --- dlls/user32/button.c | 4 +- dlls/user32/static.c | 2 +- dlls/user32/tests/class.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/static.c | 2 +- dlls/user32/text.c | 8 +++--- dlls/user32/uitools.c | 62 ++++++++++++++++++++++---------------------- 7 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fc84eaf5a90cfb9f3b25…

1 0

Michael Stefaniuc : comctl32: HGDIOBJ is interchangeable with other handle types so don't cast.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 092b892f54883f05d1603fc94038388f2e7e1fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092b892f54883f05d1603fc94… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 23:38:37 2008 +0200 comctl32: HGDIOBJ is interchangeable with other handle types so don't cast. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/imagelist.c | 4 ++-- dlls/comctl32/ipaddress.c | 2 +- dlls/comctl32/pager.c | 2 +- dlls/comctl32/tests/datetime.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 899760e..8d91992 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -348,7 +348,7 @@ static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size) mydc = GetDC (0); /* why the entire screen???? */ nfont = (HFONT)SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0); - ofont = (HFONT) SelectObject (mydc, nfont); + ofont = SelectObject (mydc, nfont); GetTextExtentPointW (mydc, strA, 1, size); SelectObject (mydc, ofont); ReleaseDC (0, mydc); diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8c2e95f..c2f4f7b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1212,7 +1212,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /* Create the blend Mask */ hOldBitmap = SelectObject(hBlendMaskDC, hBlendMaskBmp); hBlendBrush = fStyle & ILD_BLEND50 ? himl->hbrBlend50 : himl->hbrBlend25; - hOldBrush = (HBRUSH) SelectObject(hBlendMaskDC, hBlendBrush); + hOldBrush = SelectObject(hBlendMaskDC, hBlendBrush); PatBlt(hBlendMaskDC, 0, 0, cx, cy, PATCOPY); SelectObject(hBlendMaskDC, hOldBrush); @@ -1225,7 +1225,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /* now apply blend to the current image given the BlendMask */ if (clrBlend == CLR_DEFAULT) clrBlend = GetSysColor (COLOR_HIGHLIGHT); else if (clrBlend == CLR_NONE) clrBlend = GetTextColor (pimldp->hdcDst); - hOldBrush = (HBRUSH) SelectObject (hImageDC, CreateSolidBrush(clrBlend)); + hOldBrush = SelectObject (hImageDC, CreateSolidBrush(clrBlend)); BitBlt (hImageDC, 0, 0, cx, cy, hBlendMaskDC, 0, 0, 0xB8074A); /* PSDPxax */ DeleteObject(SelectObject(hImageDC, hOldBrush)); SelectObject(hBlendMaskDC, hOldBitmap); diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 5d8d970..4a91417 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -193,7 +193,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) infoPtr->Enabled = TRUE; infoPtr->Notify = lpCreate->hwndParent; - hSysFont = (HFONT) GetStockObject(ANSI_VAR_FONT); + hSysFont = GetStockObject(ANSI_VAR_FONT); GetObjectW(hSysFont, sizeof(LOGFONTW), &logSysFont); SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); strcpyW(logFont.lfFaceName, logSysFont.lfFaceName); diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 079fbfb..fdf470c 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -237,7 +237,7 @@ PAGER_DrawButton(HDC hdc, COLORREF clrBk, RECT arrowRect, return; hBrush = CreateSolidBrush(clrBk); - hOldBrush = (HBRUSH)SelectObject(hdc, hBrush); + hOldBrush = SelectObject(hdc, hBrush); FillRect(hdc, &rc, hBrush); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index b194cc1..d835e75 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -256,7 +256,7 @@ static void test_dtm_set_and_get_mcfont(HWND hWndDateTime) { HFONT hFontOrig, hFontNew; - hFontOrig = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + hFontOrig = GetStockObject(DEFAULT_GUI_FONT); SendMessage(hWndDateTime, DTM_SETMCFONT, (WPARAM)hFontOrig, TRUE); hFontNew = (HFONT)SendMessage(hWndDateTime, DTM_GETMCFONT, 0, 0); ok(hFontOrig == hFontNew, "Expected hFontOrig==hFontNew, hFontOrig=%p, hFontNew=%p\n", hFontOrig, hFontNew); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0ed8c78..4b4964f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -138,7 +138,7 @@ static HWND create_a_window(void) cls.hInstance = 0; cls.hIcon = LoadIconA (0, (LPSTR)IDI_APPLICATION); cls.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); - cls.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH); + cls.hbrBackground = GetStockObject (WHITE_BRUSH); cls.lpszMenuName = 0; cls.lpszClassName = className;

1 0

Alexandre Julliard : shdocvw/tests: Avoid sizeof in trace.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 199bcc9c7055f330a3af9462a533e8ec795c7de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199bcc9c7055f330a3af9462a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 11:29:32 2008 +0100 shdocvw/tests: Avoid sizeof in trace. --- dlls/shdocvw/tests/shdocvw.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index f80a111..cb75f5e 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -117,8 +117,7 @@ static void test_URLSubRegQueryA(void) buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 0, -1); used = lstrlenA(buffer); - ok((hr == S_OK) && (used == INTERNET_MAX_URL_LENGTH - 1), - "got 0x%x and %d (expected S_OK and %d)\n", hr, used, INTERNET_MAX_URL_LENGTH-1); + ok((hr == S_OK) && (used == INTERNET_MAX_URL_LENGTH - 1), "got 0x%x and %d\n", hr, used); /* still succeed without a buffer for the result */ hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, 0, -1);

1 0

Alexandre Julliard : jscript: Avoid a compiler warning.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 2aa1e71e7743fb707aee0dd3684c5913aeecc875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa1e71e7743fb707aee0dd36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 11:29:21 2008 +0100 jscript: Avoid a compiler warning. --- dlls/jscript/engine.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bf82dfa..ec503f6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2210,12 +2210,11 @@ HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags } default: FIXME("unhandled vt %d\n", V_VT(&val)); - hres = E_NOTIMPL; + VariantClear(&val); + return E_NOTIMPL; } VariantClear(&val); - if(FAILED(hres)) - return hres; ret->type = EXPRVAL_VARIANT; V_VT(&ret->u.var) = VT_BSTR;

1 0

Dmitry Timoshkov : gdi32: Search the child font list first.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 2d15db61367e7c87c33b56f258c2a39f8ed1f568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d15db61367e7c87c33b56f25… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 15:59:53 2008 +0800 gdi32: Search the child font list first. --- dlls/gdi32/freetype.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9692450..313e625 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3114,6 +3114,19 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); + /* try the child list */ + LIST_FOR_EACH(font_elem_ptr, &child_font_list) { + ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); + if(!fontcmp(ret, &fd)) { + if(!can_use_bitmap && !FT_IS_SCALABLE(ret->ft_face)) continue; + LIST_FOR_EACH(hfontlist_elem_ptr, &ret->hfontlist) { + hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); + if(hflist->hfont == hfont) + return ret; + } + } + } + /* try the in-use list */ LIST_FOR_EACH(font_elem_ptr, &gdi_font_list) { ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); @@ -5340,6 +5353,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) return FALSE; } + child->font->font_desc = font->font_desc; child->font->ntmFlags = child->face->ntmFlags; child->font->orientation = font->orientation; child->font->scale_y = font->scale_y;

1 0

Andrew Talbot : odbc32: Sign-compare warnings fix.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: f36c9624e9ef1aee2a913fb061cb7225aed8eac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36c9624e9ef1aee2a913fb06… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 25 16:43:47 2008 +0100 odbc32: Sign-compare warnings fix. --- dlls/odbc32/proxyodbc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 6357ce3..8b2e78d 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -211,7 +211,7 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) { /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ dirn = SQL_FETCH_NEXT; - if (sizedesc == strlen(desc)) + if (sizedesc == lstrlenA(desc)) { HKEY hThis; if ((reg_ret = RegQueryValueExA (hDrivers, desc, NULL, @@ -339,7 +339,7 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) { /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ dirn = SQL_FETCH_NEXT; - if (sizedsn == strlen(dsn) && sizedesc == strlen(desc)) + if (sizedsn == lstrlenA(dsn) && sizedesc == lstrlenA(desc)) { HKEY hDSN; if ((reg_ret = RegCreateKeyExA (hODBC, dsn, 0, @@ -2155,9 +2155,9 @@ SQLRETURN WINAPI SQLColAttributesW( TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); TRACE(" Declared length: %d\n", *pcbDesc); */ - if (*pcbDesc != strlenW(rgbDesc) * 2) { + if (*pcbDesc != lstrlenW(rgbDesc) * 2) { TRACE("CHEAT: resetting name length for ADO\n"); - *pcbDesc = strlenW(rgbDesc) * 2; + *pcbDesc = lstrlenW(rgbDesc) * 2; } } return iResult; @@ -2331,9 +2331,9 @@ SQLRETURN WINAPI SQLColAttributeW (SQLHSTMT StatementHandle, TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); TRACE(" Declared length: %d\n", *pcbDesc); */ - if (*StringLength != strlenW(CharacterAttribute) * 2) { + if (*StringLength != lstrlenW(CharacterAttribute) * 2) { TRACE("CHEAT: resetting name length for ADO\n"); - *StringLength = strlenW(CharacterAttribute) * 2; + *StringLength = lstrlenW(CharacterAttribute) * 2; } } return iResult;

1 0

Vitaliy Margolen : winmm: Support more joysticks.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 9fbe249f3cc100235b8a9d09d30934b3489971da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbe249f3cc100235b8a9d09d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 26 12:01:28 2008 -0600 winmm: Support more joysticks. --- dlls/winejoystick.drv/joystick.c | 2 +- dlls/winmm/joystick.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 2d3e514..41d6eb8 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); #ifdef HAVE_LINUX_JOYSTICK_H -#define MAXJOYSTICK (JOYSTICKID2 + 1) +#define MAXJOYSTICK (JOYSTICKID2 + 30) typedef struct tagWINE_JSTCK { int joyIntf; diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 3577bdd..f3cffdf 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); -#define MAXJOYSTICK (JOYSTICKID2 + 1) +#define MAXJOYSTICK (JOYSTICKID2 + 30) #define JOY_PERIOD_MIN (10) /* min Capture time period */ #define JOY_PERIOD_MAX (1000) /* max Capture time period */

1 0

Eric Pouech : winedbg: Add a kill command to kill the current process.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 0c4e9df2a1389744711728a917f84a3cf783a5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4e9df2a1389744711728a91… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 25 09:12:30 2008 +0200 winedbg: Add a kill command to kill the current process. --- programs/winedbg/dbg.y | 3 ++- programs/winedbg/debug.l | 1 + programs/winedbg/tgt_active.c | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 190c106..c88d3e8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -59,7 +59,7 @@ static int dbg_error(const char*); %token tSTEPI tNEXTI tFINISH tSHOW tDIR tWHATIS tSOURCE %token <string> tPATH tIDENTIFIER tSTRING tDEBUGSTR tINTVAR %token <integer> tNUM tFORMAT -%token tSYMBOLFILE tRUN tATTACH tDETACH tMAINTENANCE tTYPE tMINIDUMP +%token tSYMBOLFILE tRUN tATTACH tDETACH tKILL tMAINTENANCE tTYPE tMINIDUMP %token tNOPROCESS %token tCHAR tSHORT tINT tLONG tFLOAT tDOUBLE tUNSIGNED tSIGNED @@ -141,6 +141,7 @@ command: | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2, FALSE); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } + | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } | run_command diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 66fe70d..3a47a17 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -183,6 +183,7 @@ STRING \"[^\n"]+\" <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } +<INITIAL>kill|kil|ki|k { BEGIN(NOCMD); return tKILL; } <INITIAL,NOPROCESS>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } <INITIAL>minidump|mdmp { BEGIN(PATH_EXPECTED); return tMINIDUMP; } <INITIAL>echo { BEGIN(ASTRING_EXPECTED); return tECHO; } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 9cb0a56..f5ea8f2 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -979,7 +979,14 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) SetThreadContext(dbg_curr_thread->handle, &dbg_context); ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } - if (!kill && !DebugActiveProcessStop(dbg_curr_pid)) return FALSE; + } + if (kill) + { + TerminateProcess(pcs->handle, 0); + } + else + { + if (!DebugActiveProcessStop(pcs->pid)) return FALSE; } SymCleanup(pcs->handle); dbg_del_process(pcs);

1 0

Marcus Meissner : netapi32: Fixed buffer sizes to GetUserNameW and GetComputerNameW.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 0025eaefabffae8b465e5e9326c978fe4aa3b84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0025eaefabffae8b465e5e932… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 25 12:10:10 2008 +0200 netapi32: Fixed buffer sizes to GetUserNameW and GetComputerNameW. --- dlls/netapi32/tests/access.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 1cc71b9..dfa68ef 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -70,7 +70,7 @@ static int init_access_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name); + dwSize = sizeof(user_name)/sizeof(WCHAR); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { @@ -80,7 +80,7 @@ static int init_access_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name); + dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return 1; }

1 0

Marcus Meissner : programs: Fixed two RegEnumValue name lengths.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 19464a6bf77cba2f7028ce5d90302a19ec88da1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19464a6bf77cba2f7028ce5d9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 26 15:27:05 2008 +0100 programs: Fixed two RegEnumValue name lengths. --- programs/oleview/details.c | 2 +- programs/winecfg/winecfg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 531591b..3e266cc 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -51,7 +51,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad while(TRUE) { - lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + lenName = sizeof(WCHAR[MAX_LOAD_STRING])/sizeof(WCHAR); lenData = sizeof(WCHAR[MAX_LOAD_STRING]); retEnum = RegEnumValue(hKey, i, wszName, &lenName, diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index f1439a7..543daf1 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -491,7 +491,7 @@ WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) while (TRUE) { WCHAR name[1024]; - DWORD namesize = sizeof(name); + DWORD namesize = sizeof(name)/sizeof(name[0]); BOOL removed = FALSE; /* find out the needed size, allocate a buffer, read the value */

1 0