February 2010 - Wine-Commits

Andrew Nguyen : winnls32: Restore the correct export names.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: f8ae018423bb734a05029ed2acd97ba12aa4045d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ae018423bb734a05029ed2a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Feb 17 13:48:42 2010 -0600 winnls32: Restore the correct export names. --- dlls/winnls.dll16/winnls.c | 7 +++++-- dlls/winnls32/winnls.c | 8 ++++---- dlls/winnls32/winnls32.spec | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winnls.dll16/winnls.c b/dlls/winnls.dll16/winnls.c index 778c254..efe64ff 100644 --- a/dlls/winnls.dll16/winnls.c +++ b/dlls/winnls.dll16/winnls.c @@ -24,12 +24,15 @@ #include "wownt32.h" #include "wine/winuser16.h" +BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable); +BOOL WINAPI WINNLS32GetEnableStatus(HWND hWnd); + /*********************************************************************** * WINNLSEnableIME (WINNLS.16) */ BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable ) { - return WINNLSEnableIME( HWND_32(hwnd), enable ); + return WINNLS32EnableIME( HWND_32(hwnd), enable ); } /*********************************************************************** @@ -37,5 +40,5 @@ BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable ) */ BOOL WINAPI WINNLSGetEnableStatus16( HWND16 hwnd ) { - return WINNLSGetEnableStatus( HWND_32(hwnd) ); + return WINNLS32GetEnableStatus( HWND_32(hwnd) ); } diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 2366815..517a53c 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -39,17 +39,17 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } /*********************************************************************** - * WINNLSGetEnableStatus (WINNLS32.2) + * WINNLS32GetEnableStatus (WINNLS32.2) */ -BOOL WINAPI WINNLSGetEnableStatus(HWND hWnd) +BOOL WINAPI WINNLS32GetEnableStatus(HWND hWnd) { return FALSE; } /*********************************************************************** - * WINNLSEnableIME (WINNLS32.1) + * WINNLS32EnableIME (WINNLS32.1) */ -BOOL WINAPI WINNLSEnableIME(HWND hWnd, BOOL fEnable) +BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable) { /* fake return of previous status. is this what this function should do ? */ return !fEnable; diff --git a/dlls/winnls32/winnls32.spec b/dlls/winnls32/winnls32.spec index 18bffea..34e0d42 100644 --- a/dlls/winnls32/winnls32.spec +++ b/dlls/winnls32/winnls32.spec @@ -1,5 +1,5 @@ -1 stdcall WINNLSEnableIME(long long) -2 stdcall WINNLSGetEnableStatus(long) +1 stdcall WINNLS32EnableIME(long long) +2 stdcall WINNLS32GetEnableStatus(long) 3 stub WINNLS32GetIMEHotKey 21 stub IMP32GetIME 22 stub IMP32QueryIME

1 0

Alexandre Julliard : user.exe: The default dialog button id is 0 on Win16.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: a9a5dae06459ac512b61c989e945012af8615bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a5dae06459ac512b61c989e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:12:11 2010 +0100 user.exe: The default dialog button id is 0 on Win16. --- dlls/user.exe16/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index ab6cb38..a194a58 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,6 +446,7 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; + dlgInfo->idResult = 0; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc );

1 0

Dylan Smith : wordpad: Avoid making monochrome bitmaps for print preview.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: 003e7e967545711f5a750b05686856d7630d7ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003e7e967545711f5a750b056… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:16:01 2010 -0500 wordpad: Avoid making monochrome bitmaps for print preview. Previewly monochrome bitmaps were being created by CreateCompatibleBitmap because the hdc passed into that call came from CreateCompatibleDC which is initialized with a single pixel monochrome bitmap. --- programs/wordpad/print.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index e43b4b9..e8d14e8 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -874,13 +874,11 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r } -static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) +static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int page) { - HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight); int bottom; char_from_pagenum(hEditorWnd, lpFr, page); - SelectObject(lpFr->hdc, hBitmapCapture); FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); bottom = lpFr->rc.bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); @@ -926,6 +924,7 @@ LRESULT print_preview(HWND hwndPreview) GETTEXTLENGTHEX gt; RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); + HBITMAP hBitmapCapture; preview.hdc = CreateCompatibleDC(hdc); @@ -947,12 +946,16 @@ LRESULT print_preview(HWND hwndPreview) paper.bottom = preview.bmSize.cy; fr.hdc = preview.hdc; - draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &paper, preview.page); + hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); + SelectObject(fr.hdc, hBitmapCapture); + draw_preview(hEditorWnd, &fr, &paper, preview.page); if(preview.hdc2) { fr.hdc = preview.hdc2; - draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &fr.rcPage, preview.page + 1); + hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); + SelectObject(fr.hdc, hBitmapCapture); + draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1); } update_preview_buttons(hMainWnd);

1 0

Dylan Smith : wordpad: Added text colour toolbar button.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: 2397171cf3f2455ecddd1c32c3251c10fc3be337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2397171cf3f2455ecddd1c32c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:19:36 2010 -0500 wordpad: Added text colour toolbar button. --- programs/wordpad/Da.rc | 24 +++++++++++++++ programs/wordpad/De.rc | 24 +++++++++++++++ programs/wordpad/En.rc | 24 +++++++++++++++ programs/wordpad/Fr.rc | 24 +++++++++++++++ programs/wordpad/Hu.rc | 24 +++++++++++++++ programs/wordpad/It.rc | 24 +++++++++++++++ programs/wordpad/Ja.rc | 24 +++++++++++++++ programs/wordpad/Ko.rc | 24 +++++++++++++++ programs/wordpad/Lt.rc | 24 +++++++++++++++ programs/wordpad/Nl.rc | 24 +++++++++++++++ programs/wordpad/No.rc | 24 +++++++++++++++ programs/wordpad/Pl.rc | 24 +++++++++++++++ programs/wordpad/Pt.rc | 24 +++++++++++++++ programs/wordpad/Ru.rc | 24 +++++++++++++++ programs/wordpad/Si.rc | 24 +++++++++++++++ programs/wordpad/Sv.rc | 24 +++++++++++++++ programs/wordpad/Tr.rc | 24 +++++++++++++++ programs/wordpad/Uk.rc | 24 +++++++++++++++ programs/wordpad/Zh.rc | 24 +++++++++++++++ programs/wordpad/formatbar.bmp | Bin 1014 -> 1142 bytes programs/wordpad/wordpad.c | 62 ++++++++++++++++++++++++++++++++++++--- programs/wordpad/wordpad.h | 21 +++++++++++++ 22 files changed, 534 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2397171cf3f2455ecddd1…

1 0

Dylan Smith : richedit: Prevent crash on word selection at end of paragraph .
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: 9106860c853511b8d5c739b69a6292eb395b5473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9106860c853511b8d5c739b69… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:15:50 2010 -0500 richedit: Prevent crash on word selection at end of paragraph. --- dlls/riched20/caret.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 500b6c7..abcc73e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -723,6 +723,7 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) return FALSE; pRun = ME_FindItemBack(pPara, diRun); + pPara = pPara->member.para.prev_para; } break; }

1 0

Stefan Dösinger : wined3d: Control SFLAG_CONVERTED in surface_prepare_texture.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 5c4d3fb5a21210f48dfb7d9c0af8a91b23dc7ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4d3fb5a21210f48dfb7d9c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 15 12:30:37 2010 +0100 wined3d: Control SFLAG_CONVERTED in surface_prepare_texture. This makes sure that the flag is set correctly when surface_allocate_surface is called and client storage is disabled properly for converted surfaces. --- dlls/wined3d/surface.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a37fb1..d5d2246 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1265,6 +1265,9 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) if (surface->Flags & alloc_flag) return; d3dfmt_get_conv(surface, TRUE, TRUE, &format, &internal, &type, &convert, &bpp, srgb); + if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; + else surface->Flags &= ~SFLAG_CONVERTED; + if ((surface->Flags & SFLAG_NONPOW2) && !(surface->Flags & SFLAG_OVERSIZE)) { width = surface->pow2Width; @@ -5060,17 +5063,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3DERR_OUTOFVIDEOMEMORY; } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); - - This->Flags |= SFLAG_CONVERTED; } else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT && (gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) { d3dfmt_p8_upload_palette(iface, convert); - This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; } else { - This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; }

1 0

Alexandre Julliard : user32: Don' t overwrite the default button id when creating the dialog structure.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: a64765f673b01944ebf5da44dbcae7b8f4b68ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64765f673b01944ebf5da44d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 11:43:34 2010 +0100 user32: Don't overwrite the default button id when creating the dialog structure. --- dlls/user.exe16/dialog.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 04f2435..ab6cb38 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 373260a..fecd417 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->hMenu = 0; dlgInfo->xBaseUnit = 0; dlgInfo->yBaseUnit = 0; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index d95746b..c7c9409 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );

1 0

Paul Chitescu : qedit: Always print a TRACE when a SampleGrabber pin gets connected.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 381bd1c0ca250b22a5b77f55c9d4614d606575ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bd1c0ca250b22a5b77f55c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Feb 17 12:52:28 2010 +0200 qedit: Always print a TRACE when a SampleGrabber pin gets connected. --- dlls/qedit/samplegrabber.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 4538004..b4912eb 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1022,8 +1022,8 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE IMemInputPin_Release(This->sg->memOutput); This->sg->memOutput = NULL; } - if (SUCCEEDED(IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)))) - TRACE("pair IMemInputPin %p\n", This->sg->memOutput); + IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)); + TRACE("(%p) Accepted IPin %p, IMemInputPin %p\n", This, receiver, This->sg->memOutput); return S_OK; } @@ -1066,6 +1066,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M This->sg->mtype.pbFormat = NULL; } This->pair = connector; + TRACE("(%p) Accepted IPin %p\n", This, connector); return S_OK; }

1 0

Roderick Colenbrander : winex11: Use PictOpOver instead of PictOpSrc in 1-bit -> color blits.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: a19abd9fd57088395cfe2af7e395787645a181ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19abd9fd57088395cfe2af7e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Feb 17 12:43:46 2010 +0100 winex11: Use PictOpOver instead of PictOpSrc in 1-bit -> color blits. --- dlls/winex11.drv/xrender.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a5cd65a..d3600b7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1852,28 +1852,30 @@ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_offset = (xscale<0) ? width : 0; int y_offset = (yscale<0) ? height : 0; + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict. + * The 'src_pict' data effectively acts as an alpha channel to the tile data. We need PictOpOver for correct rendering. */ + int op = mask_pict ? PictOpOver : PictOpSrc; + /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ if(xscale != 1.0 || yscale != 1.0) { - /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ if(mask_pict) set_xrender_transformation(mask_pict, xscale, yscale, x_offset, y_offset); else set_xrender_transformation(src_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); } else { - /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ if(mask_pict) set_xrender_transformation(mask_pict, 1, 1, 0, 0); else set_xrender_transformation(src_pict, 1, 1, 0, 0); - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); } }

1 0

Piotr Caban : oleaut32: Fix crash in LoadTypeLib if typelib name is not specified.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 2c911147b923e93c19b8c02aff4f15d19d362930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c911147b923e93c19b8c02af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 17 13:01:33 2010 +0100 oleaut32: Fix crash in LoadTypeLib if typelib name is not specified. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 936c497..843af08 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -968,6 +968,33 @@ if(use_midl_tlb) { return; } +static void test_CreateTypeLib(void) { + char filename[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *createtl; + ITypeLib *tl; + HRESULT hres; + + trace("CreateTypeLib tests\n"); + + GetTempFileNameA(".", "tlb", 0, filename); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); + + hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeLib2_Release(createtl); + + hres = LoadTypeLib(filenameW, &tl); + ok(hres == S_OK, "got %08x\n", hres); + + ITypeLib_Release(tl); + + DeleteFileA(filename); +} + #if 0 /* use this to generate more tests */ #define OLE_CHECK(x) { HRESULT hr = x; if (FAILED(hr)) { printf(#x "failed - %x\n", hr); return; } } @@ -1480,6 +1507,7 @@ START_TEST(typelib) test_TypeInfo(); test_QueryPathOfRegTypeLib(); test_inheritance(); + test_CreateTypeLib(); if ((filename = create_test_typelib())) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2ad5412..445eac5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -552,7 +552,9 @@ HRESULT WINAPI RegisterTypeLib( LPOLESTR doc; /* Set the human-readable name of the typelib */ - if (SUCCEEDED(ITypeLib_GetDocumentation(ptlib, -1, NULL, &doc, NULL, NULL))) + if (FAILED(ITypeLib_GetDocumentation(ptlib, -1, NULL, &doc, NULL, NULL))) + res = E_FAIL; + else if (doc) { if (RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)doc, (lstrlenW(doc)+1) * sizeof(OLECHAR)) != ERROR_SUCCESS) @@ -560,8 +562,6 @@ HRESULT WINAPI RegisterTypeLib( SysFreeString(doc); } - else - res = E_FAIL; /* Make up the name of the typelib path subkey */ if (!get_lcid_subkey( attr->lcid, attr->syskind, tmp )) res = E_FAIL;

1 0