February 2007 - Wine-Commits

Eric Pouech : dbghelp: Allow to add an alternate file_map for an ELF file ( where to look for its debug information).
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: fc66bb37f41c29db7efe68f8d69860b01400412e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc66bb37f41c29db7efe68f8d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Feb 24 21:01:10 2007 +0100 dbghelp: Allow to add an alternate file_map for an ELF file (where to look for its debug information). --- dlls/dbghelp/elf_module.c | 60 ++++++++++++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b0cc90c..4d15cb3 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -115,6 +115,7 @@ struct elf_file_map unsigned with_crc; unsigned long crc; const char* shstrtab; + struct elf_file_map* alternate; /* another ELF file (linked to this one) */ }; struct elf_section_map @@ -167,27 +168,32 @@ static const char* elf_map_section(struct elf_section_map* esm) * elf_find_section * * Finds a section by name (and type) into memory from an ELF file + * or its alternate if any */ static BOOL elf_find_section(struct elf_file_map* fmap, const char* name, unsigned sht, struct elf_section_map* esm) { unsigned i; - if (fmap->shstrtab == ELF_NO_MAP) + while (fmap) { - struct elf_section_map hdr_esm = {fmap, fmap->elfhdr.e_shstrndx}; - fmap->shstrtab = elf_map_section(&hdr_esm); - if (fmap->shstrtab == ELF_NO_MAP) return FALSE; - } - for (i = 0; i < fmap->elfhdr.e_shnum; i++) - { - if (strcmp(fmap->shstrtab + fmap->sect[i].shdr.sh_name, name) == 0 && - (sht == SHT_NULL || sht == fmap->sect[i].shdr.sh_type)) + if (fmap->shstrtab == ELF_NO_MAP) + { + struct elf_section_map hdr_esm = {fmap, fmap->elfhdr.e_shstrndx}; + fmap->shstrtab = elf_map_section(&hdr_esm); + if (fmap->shstrtab == ELF_NO_MAP) return FALSE; + } + for (i = 0; i < fmap->elfhdr.e_shnum; i++) { - esm->fmap = fmap; - esm->sidx = i; - return TRUE; + if (strcmp(fmap->shstrtab + fmap->sect[i].shdr.sh_name, name) == 0 && + (sht == SHT_NULL || sht == fmap->sect[i].shdr.sh_type)) + { + esm->fmap = fmap; + esm->sidx = i; + return TRUE; + } } + fmap = fmap->alternate; } return FALSE; } @@ -217,9 +223,14 @@ static void elf_end_find(struct elf_file_map* fmap) { struct elf_section_map esm; - esm.fmap = fmap; esm.sidx = fmap->elfhdr.e_shstrndx; - elf_unmap_section(&esm); - fmap->shstrtab = ELF_NO_MAP; + while (fmap) + { + esm.fmap = fmap; + esm.sidx = fmap->elfhdr.e_shstrndx; + elf_unmap_section(&esm); + fmap->shstrtab = ELF_NO_MAP; + fmap = fmap->alternate; + } } /****************************************************************** @@ -257,6 +268,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) fmap->fd = -1; fmap->with_crc = 0; fmap->shstrtab = ELF_NO_MAP; + fmap->alternate = NULL; /* check that the file exists, and that the module hasn't been loaded yet */ if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; @@ -312,16 +324,20 @@ done: */ static void elf_unmap_file(struct elf_file_map* fmap) { - if (fmap->fd != -1) + while (fmap) { - struct elf_section_map esm; - esm.fmap = fmap; - for (esm.sidx = 0; esm.sidx < fmap->elfhdr.e_shnum; esm.sidx++) + if (fmap->fd != -1) { - elf_unmap_section(&esm); + struct elf_section_map esm; + esm.fmap = fmap; + for (esm.sidx = 0; esm.sidx < fmap->elfhdr.e_shnum; esm.sidx++) + { + elf_unmap_section(&esm); + } + HeapFree(GetProcessHeap(), 0, fmap->sect); + close(fmap->fd); } - HeapFree(GetProcessHeap(), 0, fmap->sect); - close(fmap->fd); + fmap = fmap->alternate; } }

1 0

Eric Pouech : dbghelp: Rewrote the ELF section mapper for better data encapsulation.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 62b57f9e216e630a6ce977c169c27fac10b80be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b57f9e216e630a6ce977c16… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Feb 24 21:01:05 2007 +0100 dbghelp: Rewrote the ELF section mapper for better data encapsulation. --- dlls/dbghelp/elf_module.c | 273 +++++++++++++++++++++++---------------------- 1 files changed, 137 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62b57f9e216e630a6ce97…

1 0

Samuel Lidén Borell : comctl32: Use mask value in COMBOEX_GetItemA too.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 0ee7264c374fac91a32733786bf4d1a25ccc96c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee7264c374fac91a32733786… Author: Samuel Lidén Borell <samuellb(a)bredband.net> Date: Fri Feb 23 20:27:58 2007 +0100 comctl32: Use mask value in COMBOEX_GetItemA too. --- dlls/comctl32/comboex.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1c354bd..8febea6 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -577,17 +577,25 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) tmpcit.pszText = 0; if(!COMBOEX_GetItemW (infoPtr, &tmpcit)) return FALSE; - if (is_textW(tmpcit.pszText) && cit->pszText) - WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, - cit->pszText, cit->cchTextMax, NULL, NULL); - else if (cit->pszText) cit->pszText[0] = 0; - else cit->pszText = (LPSTR)tmpcit.pszText; - - cit->iImage = tmpcit.iImage; - cit->iSelectedImage = tmpcit.iSelectedImage; - cit->iOverlay = tmpcit.iOverlay; - cit->iIndent = tmpcit.iIndent; - cit->lParam = tmpcit.lParam; + if (cit->mask & CBEIF_TEXT) + { + if (is_textW(tmpcit.pszText) && cit->pszText) + WideCharToMultiByte(CP_ACP, 0, tmpcit.pszText, -1, + cit->pszText, cit->cchTextMax, NULL, NULL); + else if (cit->pszText) cit->pszText[0] = 0; + else cit->pszText = (LPSTR)tmpcit.pszText; + } + + if (cit->mask & CBEIF_IMAGE) + cit->iImage = tmpcit.iImage; + if (cit->mask & CBEIF_SELECTEDIMAGE) + cit->iSelectedImage = tmpcit.iSelectedImage; + if (cit->mask & CBEIF_OVERLAY) + cit->iOverlay = tmpcit.iOverlay; + if (cit->mask & CBEIF_INDENT) + cit->iIndent = tmpcit.iIndent; + if (cit->mask & CBEIF_LPARAM) + cit->lParam = tmpcit.lParam; return TRUE; }

1 0

Mikołaj Zalewski : comctl32: rebar: Test the RBN_HEIGHTCHANGE notify and do some fixes.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: a02a680b720638315cc473b9abb0137b03baac7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02a680b720638315cc473b9a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 25 12:40:44 2007 +0100 comctl32: rebar: Test the RBN_HEIGHTCHANGE notify and do some fixes. --- dlls/comctl32/rebar.c | 36 ++------ dlls/comctl32/tests/rebar.c | 219 ++++++++++++++++++++++++++++--------------- 2 files changed, 151 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a02a680b720638315cc47…

1 0

Mikołaj Zalewski : comctl32: listview: Set the style in WM_CREATE.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: f3ebf1c7f4c4ec22c97e81d7824a8b6d0bc6c606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ebf1c7f4c4ec22c97e81d78… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 25 12:53:57 2007 +0100 comctl32: listview: Set the style in WM_CREATE. --- dlls/comctl32/listview.c | 11 +++++------ dlls/comctl32/tests/listview.c | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index aca548f..e9476ea 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7702,7 +7702,6 @@ static CALLBACK VOID LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idE static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr; - UINT uView = lpcs->style & LVS_TYPEMASK; LOGFONTW logFont; TRACE("(lpcs=%p)\n", lpcs); @@ -7714,7 +7713,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hwnd; - infoPtr->dwStyle = lpcs->style; + infoPtr->dwStyle = lpcs->style; /* Note: may be changed in WM_CREATE */ /* determine the type of structures to use */ infoPtr->hwndNotify = lpcs->hwndParent; /* infoPtr->notifyFormat will be filled in WM_CREATE */ @@ -7752,10 +7751,6 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; - - /* initialize the icon sizes */ - set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); - set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); return TRUE; fail: @@ -7789,6 +7784,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("(lpcs=%p)\n", lpcs); + infoPtr->dwStyle = lpcs->style; infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); @@ -7824,6 +7820,9 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData(hwnd, themeClass); + /* initialize the icon sizes */ + set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); + set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); return 0; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6c1a3b1..8850091 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -350,13 +350,18 @@ static HIMAGELIST test_create_imagelist; static LRESULT CALLBACK create_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (uMsg == WM_CREATE) + { + LPCREATESTRUCT lpcs = (LPCREATESTRUCT)lParam; + lpcs->style |= LVS_REPORT; SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)test_create_imagelist); + } return CallWindowProc(listviewWndProc, hwnd, uMsg, wParam, lParam); } static void test_create() { HWND hList; + HWND hHeader; WNDCLASSEX cls; cls.cbSize = sizeof(WNDCLASSEX); ok(GetClassInfoEx(GetModuleHandle(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); @@ -368,6 +373,8 @@ static void test_create() test_create_imagelist = ImageList_Create(16, 16, 0, 5, 10); hList = CreateWindow("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); ok((HIMAGELIST)SendMessage(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); DestroyWindow(hList); }

1 0

Dmitry Timoshkov : comdlg32: Synchronize ChooseColor dialog templates with the English one.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: cc9160f214d44b52dc6ad837c47f6f8f5a1052a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9160f214d44b52dc6ad837c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 26 18:17:14 2007 +0800 comdlg32: Synchronize ChooseColor dialog templates with the English one. --- dlls/comdlg32/cdlg_Bg.rc | 12 ++++++------ dlls/comdlg32/cdlg_Ca.rc | 12 ++++++------ dlls/comdlg32/cdlg_Da.rc | 12 ++++++------ dlls/comdlg32/cdlg_De.rc | 12 ++++++------ dlls/comdlg32/cdlg_Fi.rc | 12 ++++++------ dlls/comdlg32/cdlg_Fr.rc | 12 ++++++------ dlls/comdlg32/cdlg_Hu.rc | 12 ++++++------ dlls/comdlg32/cdlg_It.rc | 12 ++++++------ dlls/comdlg32/cdlg_Ja.rc | 12 ++++++------ dlls/comdlg32/cdlg_Nl.rc | 12 ++++++------ dlls/comdlg32/cdlg_Pt.rc | 12 ++++++------ dlls/comdlg32/cdlg_Ru.rc | 12 ++++++------ dlls/comdlg32/cdlg_Sv.rc | 12 ++++++------ dlls/comdlg32/cdlg_Uk.rc | 12 ++++++------ dlls/comdlg32/cdlg_Wa.rc | 12 ++++++------ 15 files changed, 90 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9160f214d44b52dc6ad…

1 0

Vitaliy Margolen : wined3d: Use application provided fog range when fog is enabled.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 51ee7f4978257d01e9f101b65a90313779f9bcef URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ee7f4978257d01e9f101b65… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Feb 25 18:03:00 2007 -0700 wined3d: Use application provided fog range when fog is enabled. --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b76dff..9e5aeb7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -678,8 +678,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->usesFog) { glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); - fogstart = 1.0; - fogend = 0.0; + if (stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { + fogstart = 1.0; + fogend = 0.0; + } context->last_was_foggy_shader = TRUE; } /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes,

1 0

Vitaliy Margolen : imagehlp: Forward already implemented functions to dbghelp.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: bea5199b6f1b9334bfe914a19b3c59350bbf3efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea5199b6f1b9334bfe914a19… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Feb 25 11:08:18 2007 -0700 imagehlp: Forward already implemented functions to dbghelp. --- dlls/imagehlp/imagehlp.spec | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 7c0b2cf..424c731 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -48,7 +48,7 @@ @ stub SymEnumSym @ stdcall SymEnumSymbols(long long str ptr ptr) dbghelp.SymEnumSymbols @ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes -@ stub SymEnumerateModules64 +@ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules @ stub SymEnumerateSymbols64 @ stdcall SymEnumerateSymbols(long long ptr ptr) dbghelp.SymEnumerateSymbols @@ -57,25 +57,25 @@ @ stub SymFindFileInPath @ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName -@ stub SymFunctionTableAccess64 +@ stdcall SymFunctionTableAccess64(long double) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess -@ stub SymGetLineFromAddr64 +@ stdcall SymGetLineFromAddr64(long double ptr ptr) dbghelp.SymGetLineFromAddr64 @ stdcall SymGetLineFromAddr(long long ptr ptr) dbghelp.SymGetLineFromAddr @ stub SymGetLineFromName64 @ stub SymGetLineFromName -@ stub SymGetLineNext64 +@ stdcall SymGetLineNext64(long ptr) dbghelp.SymGetLineNext64 @ stdcall SymGetLineNext(long ptr) dbghelp.SymGetLineNext -@ stub SymGetLinePrev64 +@ stdcall SymGetLinePrev64(long ptr) dbghelp.SymGetLinePrev64 @ stdcall SymGetLinePrev(long ptr) dbghelp.SymGetLinePrev -@ stub SymGetModuleBase64 +@ stdcall SymGetModuleBase64(long double) dbghelp.SymGetModuleBase64 @ stdcall SymGetModuleBase(long long) dbghelp.SymGetModuleBase -@ stub SymGetModuleInfo64 +@ stdcall SymGetModuleInfo64(long double ptr) dbghelp.SymGetModuleInfo64 @ stdcall SymGetModuleInfo(long long ptr) dbghelp.SymGetModuleInfo -@ stub SymGetModuleInfoW64 -@ stub SymGetModuleInfoW +@ stdcall SymGetModuleInfoW64(long double ptr) dbghelp.SymGetModuleInfoW64 +@ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions @ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath -@ stub SymGetSymFromAddr64 +@ stdcall SymGetSymFromAddr64(long double ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stub SymGetSymFromName64 @ stdcall SymGetSymFromName(long str ptr) dbghelp.SymGetSymFromName @@ -86,20 +86,20 @@ @ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName @ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize -@ stub SymLoadModule64 +@ stdcall SymLoadModule64(long long str str double long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule @ stub SymMatchFileName @ stub SymMatchString -@ stub SymRegisterCallback64 +@ stdcall SymRegisterCallback64(long ptr double) dbghelp.SymRegisterCallback64 @ stdcall SymRegisterCallback(long ptr ptr) dbghelp.SymRegisterCallback -@ stub SymRegisterFunctionEntryCallback64 -@ stub SymRegisterFunctionEntryCallback +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) dbghelp.SymRegisterFunctionEntryCallback64 +@ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) dbghelp.SymRegisterFunctionEntryCallback @ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext @ stdcall SymSetOptions(long) dbghelp.SymSetOptions @ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath @ stub SymUnDName64 @ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName -@ stub SymUnloadModule64 +@ stdcall SymUnloadModule64(long double) dbghelp.SymUnloadModule64 @ stdcall SymUnloadModule(long long) dbghelp.SymUnloadModule @ stdcall TouchFileTimes(long ptr) @ stdcall UnDecorateSymbolName(str str long long) dbghelp.UnDecorateSymbolName

1 0

H. Verbeet : d3d9: Free the vertex declaration elements.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 969dc6a7ef524f0138ad347b97e5b2bb3644e2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969dc6a7ef524f0138ad347b9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Feb 25 20:06:01 2007 +0100 d3d9: Free the vertex declaration elements. --- dlls/d3d9/vertexdeclaration.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index c3f462e..315107e 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -214,6 +214,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL if (ref == 0) { IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); IUnknown_Release(This->parentDevice); + HeapFree(GetProcessHeap(), 0, This->elements); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -343,6 +344,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateVertexDeclaration failed\n", This); + HeapFree(GetProcessHeap(), 0, object->elements); HeapFree(GetProcessHeap(), 0, object); } else { IUnknown_AddRef(iface);

1 0

James Hawkins : msi: Overwrite an existing read-only file when copying the install file.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: ba40c463d76235474249b92654d3f9caee5778b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40c463d76235474249b9265… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 26 04:28:58 2007 -0600 msi: Overwrite an existing read-only file when copying the install file. --- dlls/msi/files.c | 28 +++++++++++--- dlls/msi/tests/install.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 61992a3..eb5e456 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -638,13 +638,9 @@ static void schedule_install_files(MSIPACKAGE *package) } } -static UINT copy_install_file(MSIFILE *file) +static UINT copy_file(MSIFILE *file) { BOOL ret; - UINT gle; - - TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), - debugstr_w(file->TargetPath)); ret = CopyFileW(file->SourcePath, file->TargetPath, FALSE); if (ret) @@ -653,7 +649,20 @@ static UINT copy_install_file(MSIFILE *file) return ERROR_SUCCESS; } - gle = GetLastError(); + return GetLastError(); +} + +static UINT copy_install_file(MSIFILE *file) +{ + UINT gle; + + TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath)); + + gle = copy_file(file); + if (gle == ERROR_SUCCESS) + return gle; + if (gle == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) { TRACE("overwriting existing file\n"); @@ -665,6 +674,13 @@ static UINT copy_install_file(MSIFILE *file) TRACE("Source file not found\n"); gle = ERROR_SUCCESS; } + else if (gle == ERROR_ACCESS_DENIED) + { + SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); + + gle = copy_file(file); + TRACE("Overwriting existing file: %d\n", gle); + } else if (!(file->Attributes & msidbFileAttributesVital)) { TRACE("Ignoring error for nonvital\n"); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3bea451..534a64a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -241,6 +241,31 @@ static const CHAR ui_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm "CustomAction\tAction\n" "SetUIProperty\t51\tHASUIRUN\t1\t\n"; +static const CHAR rof_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n"; + +static const CHAR rof_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t2\t1\tTARGETDIR\t0"; + +static const CHAR rof_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus"; + +static const CHAR rof_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t8192\t1"; + +static const CHAR rof_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -339,6 +364,18 @@ static const msi_table ui_tables[] = ADD_TABLE(property), }; +static const msi_table rof_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1120,6 +1157,56 @@ static void test_uiLevelFlags(void) DeleteFile(msifile); } +static BOOL file_matches(LPSTR path) +{ + CHAR buf[MAX_PATH]; + HANDLE file; + DWORD size; + + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + + ZeroMemory(buf, MAX_PATH); + ReadFile(file, buf, 15, &size, NULL); + CloseHandle(file); + + return !lstrcmp(buf, "msitest\\maximus"); +} + +static void test_readonlyfile(void) +{ + UINT r; + DWORD size; + HANDLE file; + CHAR path[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, rof_tables, sizeof(rof_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectory(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + if (file == INVALID_HANDLE_VALUE) printf("didnt work here: %d\n", GetLastError()); + + WriteFile(file, "readonlyfile", 20, &size, NULL); + CloseHandle(file); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(file_matches(path), "Expected file to be overwritten\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1145,6 +1232,7 @@ START_TEST(install) test_mixedmedia(); test_samesequence(); test_uiLevelFlags(); + test_readonlyfile(); SetCurrentDirectoryA(prev_path); }

1 0