February 2007 - Wine-commits

Felix Nawothnig : comctl32: Remove redundant NULL checks before Free() calls.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 8784d47cba60d7daf5aef5e92eb4e9ff58de4c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8784d47cba60d7daf5aef5e92… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Tue Feb 13 21:18:24 2007 +0100 comctl32: Remove redundant NULL checks before Free() calls. --- dlls/comctl32/comboex.c | 10 +++++----- dlls/comctl32/comctl32undoc.c | 10 ++++------ dlls/comctl32/header.c | 27 +++++++-------------------- dlls/comctl32/listview.c | 3 +-- dlls/comctl32/monthcal.c | 5 ++--- dlls/comctl32/propsheet.c | 3 +-- dlls/comctl32/syslink.c | 26 +++++--------------------- dlls/comctl32/tab.c | 7 ++----- dlls/comctl32/treeview.c | 5 ++--- 9 files changed, 29 insertions(+), 67 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 2499b80..1c354bd 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -227,7 +227,7 @@ COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, INT code, NMCOMBOBOXEXW *hdr) if (astr && hdr->ceItem.pszText == (LPWSTR)astr) hdr->ceItem.pszText = wstr; - if (astr) Free(astr); + Free(astr); return ret; } @@ -278,7 +278,7 @@ static void COMBOEX_FreeText (CBE_ITEMDATA *item) { if (is_textW(item->pszText)) Free(item->pszText); item->pszText = 0; - if (item->pszTemp) Free(item->pszTemp); + Free(item->pszTemp); item->pszTemp = 0; } @@ -327,7 +327,7 @@ static LPCWSTR COMBOEX_GetText(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) COMBOEX_FreeText(item); item->pszText = buf; } else { - if (item->pszTemp) Free(item->pszTemp); + Free(item->pszTemp); item->pszTemp = buf; } text = buf; @@ -701,7 +701,7 @@ static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) } ret = COMBOEX_InsertItemW(infoPtr, &citW); - if (wstr) Free(wstr); + Free(wstr); return ret; } @@ -825,7 +825,7 @@ static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) } ret = COMBOEX_SetItemW(infoPtr, &citW); - if (wstr) Free(wstr); + Free(wstr); return ret; } diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index b8c8ef8..d18390e 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -351,10 +351,9 @@ void WINAPI FreeMRUList (HANDLE hMRUList) MRU_SaveChanged( mp ); } - for(i=0; i<mp->extview.nMaxItems; i++) { - if (mp->array[i]) - Free(mp->array[i]); - } + for(i=0; i<mp->extview.nMaxItems; i++) + Free(mp->array[i]); + Free(mp->realMRU); Free(mp->array); Free(mp->extview.lpszSubKey); @@ -422,8 +421,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, } } } - if(dataA) - Free(dataA); + Free(dataA); if (i < mp->cursize) ret = i; else diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 73b1095..2915389 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -113,14 +113,6 @@ static LRESULT HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; static WCHAR emptyString[] = {0}; -static void HEADER_DisposeItem(HEADER_ITEM *lpItem) -{ - if (lpItem->pszText) - { - Free(lpItem->pszText); - } -} - static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, HDITEMW *phdi, BOOL fUnicode) { if (mask & HDI_UNSUPPORTED_FIELDS) @@ -149,11 +141,8 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, HDITEMW * if (mask & HDI_TEXT) { - if (lpItem->pszText) - { - Free(lpItem->pszText); - lpItem->pszText = NULL; - } + Free(lpItem->pszText); + lpItem->pszText = NULL; if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { @@ -1093,7 +1082,7 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wParam) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); iOrder = infoPtr->items[iItem].iOrder; - HEADER_DisposeItem(&infoPtr->items[iItem]); + Free(infoPtr->items[iItem].pszText); infoPtr->uNumItem--; memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], @@ -1422,7 +1411,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) HEADER_CopyHDItemForNotify(infoPtr, &hdNotify, phdi, bUnicode, &pvScratch); if (HEADER_SendNotifyWithHDItemT(hwnd, HDN_ITEMCHANGINGW, nItem, &hdNotify)) { - if (pvScratch) Free(pvScratch); + Free(pvScratch); return FALSE; } @@ -1439,8 +1428,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) InvalidateRect(hwnd, NULL, FALSE); - if (pvScratch != NULL) - Free(pvScratch); + Free(pvScratch); return TRUE; } @@ -1517,13 +1505,12 @@ HEADER_NCDestroy (HWND hwnd, WPARAM wParam, LPARAM lParam) if (infoPtr->items) { lpItem = infoPtr->items; for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) { - HEADER_DisposeItem(lpItem); + Free(lpItem->pszText); } Free (infoPtr->items); } - if (infoPtr->order) - Free(infoPtr->order); + Free(infoPtr->order); if (infoPtr->himl) ImageList_Destroy (infoPtr->himl); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 208d28b..b14537a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9964,8 +9964,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara } LISTVIEW_EndEditLabelT(infoPtr, buffer, isW); - if (buffer) Free(buffer); - + Free(buffer); } SendMessageW(hwnd, WM_CLOSE, 0, 0); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5baf788..53a8e5c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1909,10 +1909,9 @@ static LRESULT MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) { /* free month calendar info data */ - if(infoPtr->monthdayState) - Free(infoPtr->monthdayState); + Free(infoPtr->monthdayState); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); - + CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); Free(infoPtr); diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f4ead78..e9e4aff 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1494,8 +1494,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, ppshpage->pfnDlgProc, (LPARAM)ppshpage); /* Free a no more needed copy */ - if(temp) - Free(temp); + Free(temp); psInfo->proppage[index].hwndPage = hwndPage; diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 237ed27..304e407 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -117,14 +117,8 @@ static VOID SYSLINK_FreeDocItem (PDOC_ITEM DocItem) { if(DocItem->Type == slLink) { - if (DocItem->u.Link.szID != NULL) - { - Free(DocItem->u.Link.szID); - } - if (DocItem->u.Link.szUrl != NULL) - { - Free(DocItem->u.Link.szUrl); - } + Free(DocItem->u.Link.szID); + Free(DocItem->u.Link.szUrl); } /* we don't free Text because it's just a pointer to a character in the @@ -1081,11 +1075,7 @@ static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) } else { - if (szId) - { - Free(szId); - } - + Free(szId); ERR("Unable to allocate memory for link url\n"); return FALSE; } @@ -1093,19 +1083,13 @@ static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) if(Item->mask & LIF_ITEMID) { - if(di->u.Link.szID) - { - Free(di->u.Link.szID); - } + Free(di->u.Link.szID); di->u.Link.szID = szId; } if(Item->mask & LIF_URL) { - if(di->u.Link.szUrl) - { - Free(di->u.Link.szUrl); - } + Free(di->u.Link.szUrl); di->u.Link.szUrl = szUrl; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 7ecd977..cbb4cdd 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2840,12 +2840,9 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) { TAB_ITEM *item = TAB_GetItem(infoPtr, iItem); LPBYTE oldItems = (LPBYTE)infoPtr->items; - - TAB_InvalidateTabArea(infoPtr); - - if (item->pszText) - Free(item->pszText); + TAB_InvalidateTabArea(infoPtr); + Free(item->pszText); infoPtr->uNumItem--; if (!infoPtr->uNumItem) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b89f2de..1130daa 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -820,8 +820,7 @@ TREEVIEW_UpdateDispInfo(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, (LPSTR)callback.item.pszText, -1, wineItem->pszText, buflen/sizeof(WCHAR)); wineItem->cchTextMax = buflen/sizeof(WCHAR); - if (oldText) - Free(oldText); + Free(oldText); } } } @@ -1484,7 +1483,7 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem) infoPtr->uNumItems--; - if (wineItem->pszText && wineItem->pszText != LPSTR_TEXTCALLBACKW) + if (wineItem->pszText != LPSTR_TEXTCALLBACKW) Free(wineItem->pszText); TREEVIEW_FreeItem(infoPtr, wineItem);

1 0

Stefan Dösinger : wined3d: Dirtify the render targets, not the primary swapchain on draws.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 8cae0e4d07ea4f533ddaed50af03458bc0179e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cae0e4d07ea4f533ddaed50a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:32 2007 +0100 wined3d: Dirtify the render targets, not the primary swapchain on draws. --- dlls/wined3d/drawprim.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dcf6d26..63c89ef 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1177,18 +1177,15 @@ void drawPrimitive(IWineD3DDevice *iface, int minIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChainImpl *swapchain; int i; /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE; /* Invalidate the back buffer memory so LockRect will read it the next time */ - for(i = 0; i < IWineD3DDevice_GetNumberOfSwapChains(iface); i++) { - IWineD3DDevice_GetSwapChain(iface, i, (IWineD3DSwapChain **) &swapchain); - if(swapchain) { - if(swapchain->backBuffer) ((IWineD3DSurfaceImpl *) swapchain->backBuffer[0])->Flags |= SFLAG_GLDIRTY; - IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); + for(i = 0; i < GL_LIMITS(buffers); i++) { + if(This->render_targets[i]) { + ((IWineD3DSurfaceImpl *) This->render_targets[i])->Flags |= SFLAG_GLDIRTY; } }

1 0

Jacek Caban : mshtml: Don't release window if it wasn't created.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 3866ce3f7ab3e43a0fd5bfcb34a192d89ab3ee07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3866ce3f7ab3e43a0fd5bfcb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 13 12:21:03 2007 +0100 mshtml: Don't release window if it wasn't created. --- dlls/mshtml/htmldoc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3414d67..65c1996 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -162,7 +162,9 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) if(This->hwnd) DestroyWindow(This->hwnd); - IHTMLWindow2_Release(HTMLWINDOW2(This->window)); + if(This->window) + IHTMLWindow2_Release(HTMLWINDOW2(This->window)); + release_nodes(This); HTMLDocument_ConnectionPoints_Destroy(This); @@ -1110,6 +1112,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->nscontainer = NULL; ret->nodes = NULL; ret->readystate = READYSTATE_UNINITIALIZED; + ret->window = NULL; hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); if(FAILED(hres)) {

1 0

Vitaly Lipatov : cmd: Fix program name.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: fdf8c1a40229ff5398612684a41f7011857e0d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf8c1a40229ff5398612684a… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Tue Feb 13 21:24:29 2007 +0300 cmd: Fix program name. --- programs/cmd/Cs.rc | 26 +++++++++++++------------- programs/cmd/De.rc | 28 ++++++++++++++-------------- programs/cmd/Es.rc | 26 +++++++++++++------------- programs/cmd/Fr.rc | 28 ++++++++++++++-------------- programs/cmd/Ja.rc | 26 +++++++++++++------------- programs/cmd/Ko.rc | 26 +++++++++++++------------- programs/cmd/Nl.rc | 26 +++++++++++++------------- programs/cmd/No.rc | 24 ++++++++++++------------ programs/cmd/Pl.rc | 26 +++++++++++++------------- programs/cmd/Pt.rc | 52 ++++++++++++++++++++++++++-------------------------- programs/cmd/Si.rc | 26 +++++++++++++------------- programs/cmd/Tr.rc | 26 +++++++++++++------------- 12 files changed, 170 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdf8c1a40229ff5398612…

1 0

H. Verbeet : wined3d: Always select the correct shader pair in the vertexdeclaration() state handler.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 1636bc1aec617edc8471a4d4c1be18207c9645a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1636bc1aec617edc8471a4d4c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 19:53:11 2007 +0100 wined3d: Always select the correct shader pair in the vertexdeclaration() state handler. --- dlls/wined3d/state.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee5ba98..b4a1ab9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2663,6 +2663,8 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { BOOL useVertexShaderFunction = FALSE, updateFog = FALSE; + BOOL usePixelShaderFunction = stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && stateblock->pixelShader + && ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function; BOOL transformed; /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; @@ -2758,24 +2760,19 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W IWineD3DVertexShader_CompileShader(stateblock->vertexShader); } - if(useVertexShaderFunction || context->last_was_vshader) { - BOOL usePixelShaderFunction = device->ps_selected_mode != SHADER_NONE && - stateblock->pixelShader && - ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function; - - /* Vertex and pixel shaders are applied together for now, so let the last dirty state do the - * application - */ - if(!isStateDirty(context, STATE_PIXELSHADER)) { - device->shader_backend->shader_select((IWineD3DDevice *) device, usePixelShaderFunction, useVertexShaderFunction); + /* Vertex and pixel shaders are applied together for now, so let the last dirty state do the + * application + */ + if (!isStateDirty(context, STATE_PIXELSHADER)) { + device->shader_backend->shader_select((IWineD3DDevice *)device, usePixelShaderFunction, useVertexShaderFunction); - if(!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (useVertexShaderFunction || usePixelShaderFunction)) { - shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (useVertexShaderFunction || usePixelShaderFunction)) { + shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } - context->last_was_vshader = useVertexShaderFunction; } + context->last_was_vshader = useVertexShaderFunction; + if(updateFog) { state_fog(STATE_RENDER(WINED3DRS_FOGENABLE), stateblock, context); }

1 0

H. Verbeet : wined3d: Cleanup the pixelshader() state handler a little bit.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 2a309f503ded8ed99af5449a1dd630e9d4cc8dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a309f503ded8ed99af5449a1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 19:53:20 2007 +0100 wined3d: Cleanup the pixelshader() state handler a little bit. --- dlls/wined3d/state.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b4a1ab9..61ab215 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1905,9 +1905,11 @@ static void shaderconstant(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + BOOL use_ps = stateblock->pixelShader && ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function != NULL; + BOOL use_vs = stateblock->vertexShader && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL; int i; - if(stateblock->pixelShader && ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.function != NULL) { + if (use_ps) { if(!context->last_was_pshader) { /* Former draw without a pixel shader, some samplers * may be disabled because of WINED3DTSS_COLOROP = WINED3DTOP_DISABLE @@ -1926,18 +1928,6 @@ static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D /* Compile and bind the shader */ IWineD3DPixelShader_CompileShader(stateblock->pixelShader); - - if(!isStateDirty(context, StateTable[STATE_VSHADER].representative)) { - stateblock->wineD3DDevice->shader_backend->shader_select( - (IWineD3DDevice *) stateblock->wineD3DDevice, - TRUE, - !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); - - if(!isStateDirty(context, STATE_VERTEXSHADERCONSTANT)) { - shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } - } - context->last_was_pshader = TRUE; } else { /* Disabled the pixel shader - color ops weren't applied * while it was enabled, so re-apply them. @@ -1947,19 +1937,17 @@ static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D tex_colorop(STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); } } - context->last_was_pshader = FALSE; + } - if(!isStateDirty(context, StateTable[STATE_VSHADER].representative)) { - stateblock->wineD3DDevice->shader_backend->shader_select( - (IWineD3DDevice *) stateblock->wineD3DDevice, - FALSE, - !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); + if(!isStateDirty(context, StateTable[STATE_VSHADER].representative)) { + stateblock->wineD3DDevice->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, use_ps, use_vs); - if(!isStateDirty(context, STATE_VERTEXSHADERCONSTANT)) { - shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } + if(!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vs || use_ps)) { + shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } + + context->last_was_pshader = use_ps; } static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {

1 0

Felix Nawothnig : comctl32: Rename 'string' test to 'misc'.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: feb4abf1183f045a0fb37b7d41df45fa19ada7e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb4abf1183f045a0fb37b7d4… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Tue Feb 13 21:01:35 2007 +0100 comctl32: Rename 'string' test to 'misc'. --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{string.c => misc.c} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 8a4a55e..bb9541d 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -11,13 +11,13 @@ CTESTS = \ header.c \ imagelist.c \ listview.c \ + misc.c \ monthcal.c \ mru.c \ progress.c \ propsheet.c \ rebar.c \ status.c \ - string.c \ subclass.c \ tab.c \ toolbar.c \ diff --git a/dlls/comctl32/tests/string.c b/dlls/comctl32/tests/misc.c similarity index 99% rename from dlls/comctl32/tests/string.c rename to dlls/comctl32/tests/misc.c index af4144c..6d15a01 100644 --- a/dlls/comctl32/tests/string.c +++ b/dlls/comctl32/tests/misc.c @@ -1,5 +1,5 @@ /* - * String tests + * Misc tests * * Copyright 2006 Paul Vriens * @@ -116,7 +116,7 @@ static void test_GetPtrAW(void) } } -START_TEST(string) +START_TEST(misc) { if(!InitFunctionPtrs()) return;

1 0

Jacek Caban : mshtml: Return "wine" as scheme of nsIURI if wine_url is set.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 2a0d583e721c71e870d0aec6d104deacb76adf21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0d583e721c71e870d0aec6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 18:59:38 2007 +0100 mshtml: Return "wine" as scheme of nsIURI if wine_url is set. --- dlls/mshtml/nsio.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7e8e7f2..d44c529 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -57,6 +57,7 @@ typedef struct { NSContainer *container; LPWSTR wine_url; PRBool is_doc_uri; + BOOL use_wine_url; } nsURI; #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) @@ -1159,7 +1160,7 @@ static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) if(This->uri) return nsIURI_GetSpec(This->uri, aSpec); - if(This->wine_url) { + if(This->use_wine_url) { char speca[INTERNET_MAX_URL_LENGTH]; WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); nsACString_SetData(aSpec, speca); @@ -1167,7 +1168,7 @@ static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) return NS_OK; } - WARN("mon and uri are NULL\n"); + TRACE("returning error\n"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1204,10 +1205,19 @@ static nsresult NSAPI nsURI_GetScheme(nsIWineURI *iface, nsACString *aScheme) TRACE("(%p)->(%p)\n", This, aScheme); + if(This->use_wine_url) { + /* + * For Gecko we set scheme to unknown so it won't be handled + * as any special case. + */ + nsACString_SetData(aScheme, "wine"); + return NS_OK; + } + if(This->uri) return nsIURI_GetScheme(This->uri, aScheme); - FIXME("default action not implemented\n"); + TRACE("returning error\n"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1580,6 +1590,10 @@ static nsresult NSAPI nsURI_SetWineURL(nsIWineURI *iface, LPCWSTR aURL) { nsURI *This = NSURI_THIS(iface); + static const WCHAR wszFtp[] = {'f','t','p',':'}; + static const WCHAR wszHttp[] = {'h','t','t','p',':'}; + static const WCHAR wszHttps[] = {'h','t','t','p','s',':'}; + TRACE("(%p)->(%s)\n", This, debugstr_w(aURL)); mshtml_free(This->wine_url); @@ -1588,8 +1602,15 @@ static nsresult NSAPI nsURI_SetWineURL(nsIWineURI *iface, LPCWSTR aURL) int len = strlenW(aURL)+1; This->wine_url = mshtml_alloc(len*sizeof(WCHAR)); memcpy(This->wine_url, aURL, len*sizeof(WCHAR)); + + /* FIXME: Always use wine url */ + This->use_wine_url = + strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); }else { This->wine_url = NULL; + This->use_wine_url = FALSE; } return NS_OK; @@ -1645,6 +1666,7 @@ static nsresult create_uri(nsIURI *uri, NSContainer *container, nsIWineURI **_re ret->container = container; ret->wine_url = NULL; ret->is_doc_uri = FALSE; + ret->use_wine_url = FALSE; if(container) nsIWebBrowserChrome_AddRef(NSWBCHROME(container));

1 0

Jacek Caban : mshtml: Added SchemeIs implementation.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 693e62c8589a47f24cb0053b723d04eb233ccd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=693e62c8589a47f24cb0053b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 13 18:08:09 2007 +0100 mshtml: Added SchemeIs implementation. --- dlls/mshtml/nsio.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d44c529..c21f55a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1435,10 +1435,20 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo TRACE("(%p)->(%s %p)\n", This, debugstr_a(scheme), _retval); + if(This->use_wine_url) { + WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; + int len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; + + *_retval = strlenW(This->wine_url) > len + && This->wine_url[len] == ':' + && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); + return NS_OK; + } + if(This->uri) return nsIURI_SchemeIs(This->uri, scheme, _retval); - FIXME("default action not implemented\n"); + TRACE("returning error\n"); return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Jacek Caban : mshtml: Forward GetAsciiSpec to GetSpec.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 82adfaaef92fb6fd1c425b0c12aff52a5ee2093a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82adfaaef92fb6fd1c425b0c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 19:02:02 2007 +0100 mshtml: Forward GetAsciiSpec to GetSpec. --- dlls/mshtml/nsio.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c21f55a..fdfe323 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1500,10 +1500,13 @@ static nsresult NSAPI nsURI_GetAsciiSpec(nsIWineURI *iface, nsACString *aAsciiSp TRACE("(%p)->(%p)\n", This, aAsciiSpec); + if(This->wine_url) + return nsIURI_GetSpec(NSURI(This), aAsciiSpec); + if(This->uri) return nsIURI_GetAsciiSpec(This->uri, aAsciiSpec); - FIXME("default action not implemented\n"); + TRACE("returning error\n"); return NS_ERROR_NOT_IMPLEMENTED; }

1 0