wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Alexandre Julliard : shdocvw: Fix the computation of the default extents.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: e37f8f23f123f34cf2369ab5d5acb4395e57efbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37f8f23f123f34cf2369ab5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 17:07:21 2008 +0100 shdocvw: Fix the computation of the default extents. --- dlls/shdocvw/oleobject.c | 6 +++--- dlls/shdocvw/tests/webbrowser.c | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 9a38cf0..198ff2a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -917,9 +917,9 @@ void WebBrowser_OleObject_Init(WebBrowser *This) memset(&This->clip_rect, 0, sizeof(RECT)); memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); - /* The size is dpi dependent */ - This->extent.cx = 127000 / dpi_x; - This->extent.cy = 50800 / dpi_y; + /* Default size is 50x20 pixels, in himetric units */ + This->extent.cx = MulDiv( 50, 2540, dpi_x ); + This->extent.cy = MulDiv( 20, 2540, dpi_y ); } void WebBrowser_OleObject_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index ec036c5..76dfbf7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1814,7 +1814,7 @@ static void test_GetControlInfo(IUnknown *unk) static void test_Extent(IUnknown *unk) { IOleObject *oleobj; - SIZE size; + SIZE size, expected; HRESULT hres; DWORD dpi_x; DWORD dpi_y; @@ -1836,10 +1836,11 @@ static void test_Extent(IUnknown *unk) size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - /* The default size is dpi dependent (96:1323x529 / 120:1058x423) */ - ok(size.cx == (127000 / dpi_x) && - size.cy == (50800 / dpi_y), "size = {%d %d} (expected %d %d)\n", - size.cx, size.cy, 127000 / dpi_x, 50800 / dpi_y); + /* Default size is 50x20 pixels, in himetric units */ + expected.cx = MulDiv( 50, 2540, dpi_x ); + expected.cy = MulDiv( 20, 2540, dpi_y ); + ok(size.cx == expected.cx && size.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", + size.cx, size.cy, expected.cx, expected.cy ); size.cx = 800; size.cy = 700;

1 0

Alexandre Julliard : user32/tests: Only test the window caption status if there is a foreground window.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: bd8e14beddb1a0391ee1e8c7eaac320717f0f9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8e14beddb1a0391ee1e8c7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 15:53:25 2008 +0100 user32/tests: Only test the window caption status if there is a foreground window. --- dlls/user32/tests/win.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8540827..4490679 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -739,9 +739,10 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info) */ ok((info->dwExStyle & ~0xe0000800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE), "wrong dwExStyle: %08x != %08x\n", info->dwExStyle, GetWindowLongA(hwnd, GWL_EXSTYLE)); - status = (GetForegroundWindow() == hwnd) ? WS_ACTIVECAPTION : 0; - ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x active %p fg %p\n", - info->dwWindowStatus, status, GetActiveWindow(), GetForegroundWindow()); + status = (GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0; + if (GetForegroundWindow()) + ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x active %p fg %p\n", + info->dwWindowStatus, status, GetActiveWindow(), GetForegroundWindow()); /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it.

1 0

Alistair Leslie-Hughes : version: VerQueryValueA/ W allow blank and NULL strings.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 9643411c324249860300641ef40a15de5d95e406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9643411c324249860300641ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 21 20:02:54 2008 +1100 version: VerQueryValueA/W allow blank and NULL strings. --- dlls/version/info.c | 7 +++++++ dlls/version/tests/info.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 51e25b3..cad3251 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -777,6 +777,9 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, if (!pBlock) return FALSE; + if (lpSubBlock == NULL || lpSubBlock[0] == '\0') + lpSubBlock = rootA; + if ( !VersionInfoIs16( info ) ) { BOOL ret; @@ -820,6 +823,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { + static const WCHAR nullW[] = { 0 }; static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -832,6 +836,9 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, if (!pBlock) return FALSE; + if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) + lpSubBlock = rootW; + if ( VersionInfoIs16( info ) ) { BOOL ret; diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index a64d911..fa120df 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -248,6 +248,13 @@ static void test_info(void) if (!boolret) goto cleanup; + boolret = VerQueryValueA( pVersionInfo, NULL, (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret || GetLastError() == NO_ERROR /* Win98 */, + "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); + + boolret = VerQueryValueA( pVersionInfo, "", (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); + boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength ); ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); if (!boolret) @@ -286,6 +293,7 @@ static void test_32bit_win(void) WCHAR mypathW[MAX_PATH]; char rootA[] = "\\"; WCHAR rootW[] = { '\\', 0 }; + WCHAR emptyW[] = { 0 }; char varfileinfoA[] = "\\VarFileInfo\\Translation"; WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -392,6 +400,12 @@ static void test_32bit_win(void) if (is_unicode_enabled) { + retW = VerQueryValueW( pVersionInfoW, NULL, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + + retW = VerQueryValueW( pVersionInfoW, emptyW, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2_get_images.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 01536b50030710e1f9331a2e15485e20d3618128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01536b50030710e1f9331a2e1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 18 19:47:45 2008 +1100 mshtml: Implement IHTMLDocument2_get_images. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 07d2fc6..0d9a0a8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -338,8 +338,33 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscoll = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetImages(This->nsdoc, &nscoll); + if(NS_FAILED(nsres)) { + ERR("GetImages failed: %08x\n", nsres); + return E_FAIL; + } + + if(nscoll) { + *p = create_collection_from_htmlcol(This, (IUnknown*)HTMLDOC(This), nscoll); + nsIDOMElement_Release(nscoll); + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e21ead4..36d4f2a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2765,10 +2765,22 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLStyle *style; long l; HRESULT hres; + IHTMLElementCollection *colimages; hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres); + hres = IHTMLDocument2_get_images(doc, NULL); + ok(hres == E_INVALIDARG, "hres %08x\n", hres); + + hres = IHTMLDocument2_get_images(doc, &colimages); + ok(hres == S_OK, "get_images failed: %08x\n", hres); + if(hres == S_OK) + { + test_elem_collection((IUnknown*)colimages, NULL, 0); + IHTMLElementCollection_Release(colimages); + } + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); @@ -3049,6 +3061,7 @@ static void test_elems(IHTMLDocument2 *doc) IDispatch *disp; long type; HRESULT hres; + IHTMLElementCollection *colimages; static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; @@ -3097,6 +3110,16 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_col_item(col, xW, item_types, sizeof(item_types)/sizeof(item_types[0])); IHTMLElementCollection_Release(col); + hres = IHTMLDocument2_get_images(doc, &colimages); + ok(hres == S_OK, "get_images failed: %08x\n", hres); + if(hres == S_OK) + { + static const elem_type_t images_types[] = {ET_IMG}; + test_elem_collection((IUnknown*)colimages, images_types, 1); + + IHTMLElementCollection_Release(colimages); + } + elem = get_doc_elem(doc); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); hres = IHTMLElement_get_all(elem, &disp);

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLCurrentStyle.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 8745dd26d6b34ece03e49ef1b39a88ca099a9bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8745dd26d6b34ece03e49ef1b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 21 20:51:43 2008 +1100 mshtml: Implement IDispatch for IHTMLCurrentStyle. --- dlls/mshtml/htmlcurstyle.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 414ac78..f6a3a6a 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -99,24 +99,21 @@ static ULONG WINAPI HTMLCurrentStyle_Release(IHTMLCurrentStyle *iface) static HRESULT WINAPI HTMLCurrentStyle_GetTypeInfoCount(IHTMLCurrentStyle *iface, UINT *pctinfo) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLCurrentStyle_GetTypeInfo(IHTMLCurrentStyle *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLCurrentStyle_GetIDsOfNames(IHTMLCurrentStyle *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLCurrentStyle_Invoke(IHTMLCurrentStyle *iface, DISPID dispIdMember, @@ -124,8 +121,8 @@ static HRESULT WINAPI HTMLCurrentStyle_Invoke(IHTMLCurrentStyle *iface, DISPID d VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLCurrentStyle_get_position(IHTMLCurrentStyle *iface, BSTR *p)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put posTop.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 71eac71e16c168d467a5a52e53ba6b08a766c959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eac71e16c168d467a5a52e5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 11 22:36:39 2008 +1100 mshtml: Implement IHTMLStyle get/put posTop. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b11c8c2..b88437d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1845,15 +1845,22 @@ static HRESULT WINAPI HTMLStyle_get_pixelHeight(IHTMLStyle *iface, long *p) static HRESULT WINAPI HTMLStyle_put_posTop(IHTMLStyle *iface, float v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%f)\n", This, v); + + return set_style_pos(This, STYLEID_TOP, v); } static HRESULT WINAPI HTMLStyle_get_posTop(IHTMLStyle *iface, float *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + return get_nsstyle_pos(This, STYLEID_TOP, p); } static HRESULT WINAPI HTMLStyle_put_posLeft(IHTMLStyle *iface, float v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6608a4a..e21ead4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2445,6 +2445,22 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); + /* Test posTop */ + hres = IHTMLStyle_get_posTop(style, NULL); + ok(hres == E_POINTER, "get_left failed: %08x\n", hres); + + f = 1.0f; + hres = IHTMLStyle_get_posTop(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 0.0, "expected 0.0 got %f\n", f); + + hres = IHTMLStyle_put_posTop(style, 4.9f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + + hres = IHTMLStyle_get_posTop(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 4.0, "expected 4.0 got %f\n", f); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("3px"); hres = IHTMLStyle_put_top(style, v); @@ -2458,6 +2474,10 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_posTop(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 3.0, "expected 3.0 got %f\n", f); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_top(style, v); ok(hres == S_OK, "put_top failed: %08x\n", hres);

1 0

Andrew Riedi : user32: Fix the loading of stretched cursors.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 1425b1b9ef9099933876ba28625bbb5a16fbcabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1425b1b9ef9099933876ba286… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Thu Nov 20 06:39:53 2008 -0800 user32: Fix the loading of stretched cursors. Based on patches by Henri Verbeet. --- dlls/user32/cursoricon.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b57ce2a..26676de 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -698,6 +698,13 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, DoStretch = (bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width); + /* Scale the hotspot */ + if (DoStretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + { + hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; + hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); + } + if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { @@ -723,14 +730,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, /* Create the XOR bitmap */ if (DoStretch) { - if(bIcon) - { - hXorBits = CreateCompatibleBitmap(screen_dc, width, height); - } - else - { - hXorBits = CreateBitmap(width, height, 1, 1, NULL); - } + hXorBits = CreateCompatibleBitmap(screen_dc, width, height); if(hXorBits) { HBITMAP hOld;

1 0

Andrew Talbot : wined3d: Sign-compare warnings fix.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: fdba8b85931b19427880fa294ad22b48a856f5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdba8b85931b19427880fa294… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 20 22:13:48 2008 +0000 wined3d: Sign-compare warnings fix. --- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/device.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62a4bf4..acfe36b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -191,7 +191,7 @@ static void context_check_fbo_status(IWineD3DDevice *iface) TRACE("FBO complete\n"); } else { IWineD3DSurfaceImpl *attachment; - int i; + unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); /* Dump the FBO attachments */ @@ -446,7 +446,8 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand /* This function takes care of WineD3D pixel format selection. */ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DFORMAT ColorFormat, WINED3DFORMAT DepthStencilFormat, BOOL auxBuffers, int numSamples, BOOL pbuffer, BOOL findCompatible) { - int iPixelFormat=0, matchtry; + int iPixelFormat=0; + unsigned int matchtry; short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits=0, stencilBits=0; @@ -1214,7 +1215,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex * *****************************************************************************/ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchain, DWORD tid) { - int i; + unsigned int i; for(i = 0; i < ((IWineD3DSwapChainImpl *) swapchain)->num_contexts; i++) { if(((IWineD3DSwapChainImpl *) swapchain)->context[i]->tid == tid) { @@ -1475,8 +1476,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, *****************************************************************************/ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { DWORD tid = GetCurrentThreadId(); - int i; - DWORD dirtyState, idx; + DWORD i, dirtyState, idx; BYTE shift; WineD3DContext *context; const struct StateEntry *StateTable = This->StateTable; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83bc436..0cb539b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1152,8 +1152,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface if(hr!= WINED3D_OK) { /* clean up */ - int k; - int l; + unsigned int k; + unsigned int l; for (l = 0; l < j; l++) { IWineD3DSurface_Release(object->surfaces[l][i]); } @@ -1573,7 +1573,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, * Create the back, front and stencil buffers *******************/ if(object->presentParms.BackBufferCount > 0) { - int i; + UINT i; object->backBuffer = HeapAlloc(GetProcessHeap(), 0, sizeof(IWineD3DSurface *) * object->presentParms.BackBufferCount); if(!object->backBuffer) { @@ -1667,7 +1667,7 @@ error: } if (object->backBuffer) { - int i; + UINT i; for(i = 0; i < object->presentParms.BackBufferCount; i++) { if(object->backBuffer[i]) { IWineD3DSurface_GetParent(object->backBuffer[i], &bufferParent); @@ -3623,7 +3623,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantF( UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i; + UINT i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -3663,7 +3663,7 @@ CONST float *srcData, UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i; + UINT i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4052,7 +4052,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF( UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i; + UINT i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4092,7 +4092,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF_DirtyConst( UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i; + UINT i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4148,7 +4148,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo WINED3DVIEWPORT vp; WINED3DMATRIX mat, proj_mat, view_mat, world_mat; BOOL doClip; - int numTextures; + DWORD numTextures; if (lpStrideData->u.s.normal.lpData) { WARN(" lighting state not saved yet... Some strange stuff may happen !\n"); @@ -7187,7 +7187,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->BackBufferHeight != swapchain->presentParms.BackBufferHeight)) { WINED3DVIEWPORT vp; - int i; + UINT i; vp.X = 0; vp.Y = 0;

1 0

Juan Lang : crypt32: Pass next data pointer when decoding a CRL dist point.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: cf9f9af6d0ca5d2d7b37d9f606467f04b7b7ca17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9f9af6d0ca5d2d7b37d9f60… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 20 14:17:59 2008 -0800 crypt32: Pass next data pointer when decoding a CRL dist point. --- dlls/crypt32/decode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 637db66..84b08e7 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4620,11 +4620,12 @@ static BOOL CRYPT_AsnDecodeDistPoint(const BYTE *pbEncoded, DWORD cbEncoded, CRYPT_AsnDecodeAltNameInternal, sizeof(CERT_ALT_NAME_INFO), TRUE, TRUE, offsetof(CRL_DIST_POINT, CRLIssuer.rgAltEntry), 0 }, }; + CRL_DIST_POINT *point = (CRL_DIST_POINT *)pvStructInfo; BOOL ret; ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, - pcbDecoded, NULL); + pcbDecoded, point ? point->DistPointName.u.FullName.rgAltEntry : NULL); return ret; }

1 0

Ricardo Filipe : atl: Remove dead store (llvm/clang).
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: d27fa4fcae74ecf6017cd9eae7b8764ded43c625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27fa4fcae74ecf6017cd9eae… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 21:32:29 2008 +0000 atl: Remove dead store (llvm/clang). --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2b921c5..dd8b7a2 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -242,7 +242,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO strbuf_write(buf->str, &name, -1); }else if(key_type == DO_DELETE) { TRACE("Deleting %s\n", debugstr_w(buf->str)); - lres = RegDeleteTreeW(parent_key, buf->str); + RegDeleteTreeW(parent_key, buf->str); }else { if(key_type == FORCE_REMOVE) RegDeleteTreeW(parent_key, buf->str);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2008