September 2010 - Wine-Commits

Hans Leidekker : shell32: Implement SHGetKnownFolderPath.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 678c6776901425654c05988202ed53f7e9a68334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678c6776901425654c0598820… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:14 2010 +0200 shell32: Implement SHGetKnownFolderPath. --- dlls/shell32/shell32_En.rc | 18 ++ dlls/shell32/shellpath.c | 431 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/shresdef.h | 19 ++ 3 files changed, 464 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=678c6776901425654c059…

1 0

Hans Leidekker : include/shlobj.h: Add known folder flags.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 4deb1844c736ebe79e50a04a429170af46f5f118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deb1844c736ebe79e50a04a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:44 2010 +0200 include/shlobj.h: Add known folder flags. --- include/shlobj.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index e0170ea..ad41f94 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -85,6 +85,15 @@ BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); +#define KF_FLAG_SIMPLE_IDLIST 0x00000100 +#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 +#define KF_FLAG_DEFAULT_PATH 0x00000400 +#define KF_FLAG_INIT 0x00000800 +#define KF_FLAG_NO_ALIAS 0x00001000 +#define KF_FLAG_DONT_UNEXPAND 0x00002000 +#define KF_FLAG_DONT_VERIFY 0x00004000 +#define KF_FLAG_CREATE 0x00008000 + #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ #define SHFMT_NOFORMAT 0xFFFFFFFDL /* Drive is not formattable */

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against NULL / 0.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: b68d257710ba6bbac33f1470df98efe7c81050e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68d257710ba6bbac33f1470d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:39 2010 +0200 wined3d: Get rid of redundant comparisons against NULL / 0. --- dlls/wined3d/arb_program_shader.c | 128 +++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 18 ++-- dlls/wined3d/basetexture.c | 6 +- dlls/wined3d/buffer.c | 8 +- dlls/wined3d/clipper.c | 11 +-- dlls/wined3d/device.c | 142 ++++++++++++++++++++---------------- dlls/wined3d/directx.c | 29 ++++--- dlls/wined3d/drawprim.c | 40 +++++----- dlls/wined3d/glsl_shader.c | 28 ++++--- dlls/wined3d/palette.c | 6 +- dlls/wined3d/query.c | 6 +- dlls/wined3d/resource.c | 15 ++-- dlls/wined3d/shader.c | 6 +- dlls/wined3d/state.c | 26 ++++--- dlls/wined3d/stateblock.c | 7 +- dlls/wined3d/surface.c | 34 ++++---- dlls/wined3d/surface_base.c | 25 ++++--- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/swapchain_base.c | 6 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_main.c | 14 ++-- dlls/wined3d/wined3d_private.h | 2 +- 23 files changed, 299 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b68d257710ba6bbac33f1…

1 0

Jesse Litton : wined3d: Recognize GeForce GTX 465.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: ad917d366c24ea078aca26982e4411d54f36ce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad917d366c24ea078aca26982… Author: Jesse Litton <wine(a)eternaldusk.com> Date: Mon Sep 13 21:42:12 2010 -0500 wined3d: Recognize GeForce GTX 465. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b6369bb..95e7322 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1079,6 +1079,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, /* ATI cards */ @@ -1410,6 +1411,12 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } /* Geforce 400 - midend */ + if (strstr(gl_renderer, "GTX 465")) + { + return CARD_NVIDIA_GEFORCE_GTX465; + } + + /* Geforce 400 - midend */ if (strstr(gl_renderer, "GTX 460")) { return CARD_NVIDIA_GEFORCE_GTX460; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e152dc3..23706c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1357,6 +1357,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, + CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against FALSE.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 0b15963b4edf7cdf53b5b5162fc48fa0c424a1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b15963b4edf7cdf53b5b5162… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:40 2010 +0200 wined3d: Get rid of redundant comparisons against FALSE. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/swapchain_gdi.c | 3 ++- dlls/wined3d/utils.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c1927b0..05ff012 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5313,7 +5313,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio bool_const = get_bool_const(ins, This, ins->src[0].reg.idx); if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const; - if(!priv->muted && bool_const == FALSE) + if (!priv->muted && !bool_const) { shader_addline(buffer, "#if(FALSE){\n"); priv->muted = TRUE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c9ec815..35558ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -81,7 +81,8 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 250485b..8920cae 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -65,7 +65,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6cc154e..8760ce6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2880,7 +2880,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting memset(&settings->op[i], 0xff, sizeof(settings->op[i])); } - if(stateblock->renderState[WINED3DRS_FOGENABLE] == FALSE) { + if (!stateblock->renderState[WINED3DRS_FOGENABLE]) + { settings->fog = FOG_OFF; } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) {

1 0

Henri Verbeet : wined3d: Introduce a structure for stream state.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 6ce848bee49968e53626e472f7af0dd0b4b7f3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce848bee49968e53626e472f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:41 2010 +0200 wined3d: Introduce a structure for stream state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 142 ++++++++++++++++++++++------------------ dlls/wined3d/drawprim.c | 36 +++++----- dlls/wined3d/state.c | 90 +++++++++++++++---------- dlls/wined3d/stateblock.c | 47 ++++++++----- dlls/wined3d/wined3d_private.h | 15 +++-- 6 files changed, 186 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce848bee49968e53626e…

1 0

Dmitry Timoshkov : gdi32: Add a trace for GetClipBox.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: cec1686cedf99967b4657d8d3815338461bc9979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec1686cedf99967b4657d8d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 16:41:44 2010 +0900 gdi32: Add a trace for GetClipBox. --- dlls/gdi32/clipping.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 7be7650..8717da7 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -408,6 +408,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) } DPtoLP( hdc, (LPPOINT)rect, 2 ); release_dc_ptr( dc ); + TRACE("%p => %d %s\n", hdc, ret, wine_dbgstr_rect( rect )); return ret; }

1 0

Hans Leidekker : include: Add knownfolders.h.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 6416430f687db227c9150134aa1a5bb567f095ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6416430f687db227c9150134a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:14 2010 +0200 include: Add knownfolders.h. --- include/Makefile.in | 1 + include/knownfolders.h | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6416430f687db227c9150…

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying window bits if the window didn't move.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: c912af04deed53a0d1c06f03e4515ac838a896b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c912af04deed53a0d1c06f03e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:22:56 2010 +0900 winex11.drv: Avoid copying window bits if the window didn't move. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99dbf49..3c0f303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2339,7 +2339,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { /* if we have an X window the bits will be moved by the X server */ - if (!data->whole_window) + if (!data->whole_window && (x_offset != 0 || y_offset != 0)) move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else

1 0

Nikolay Sivov : msxml3: Fix IXMLDOMNode::get_prefix() for empty prefix.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 154c0828bfcc8a02320c66ae39099138706142c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154c0828bfcc8a02320c66ae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 09:00:02 2010 +0400 msxml3: Fix IXMLDOMNode::get_prefix() for empty prefix. --- dlls/msxml3/node.c | 16 ++++++------- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e059d77..7e91292 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1429,8 +1429,7 @@ static HRESULT WINAPI xmlnode_get_prefix( BSTR* prefixString) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT hr = S_FALSE; - xmlNsPtr *pNSList; + xmlNsPtr *ns; TRACE("(%p)->(%p)\n", This, prefixString ); @@ -1439,16 +1438,15 @@ static HRESULT WINAPI xmlnode_get_prefix( *prefixString = NULL; - pNSList = xmlGetNsList(This->node->doc, This->node); - if(pNSList) + if ((ns = xmlGetNsList(This->node->doc, This->node))) { - *prefixString = bstr_from_xmlChar( pNSList[0]->prefix ); - - xmlFree(pNSList); - hr = S_OK; + if (ns[0]->prefix) *prefixString = bstr_from_xmlChar( ns[0]->prefix ); + xmlFree(ns); } - return hr; + TRACE("prefix %s\n", debugstr_w(*prefixString)); + + return *prefixString ? S_OK : S_FALSE; } static HRESULT WINAPI xmlnode_get_baseName( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f65eff7..176ff36 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6103,8 +6103,8 @@ static void test_createNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); prefix = (void*)0xdeadbeef; hr = IXMLDOMNode_get_prefix(node, &prefix); - todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); - todo_wine ok(prefix == 0, "expected empty prefix, got %p\n", prefix); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(prefix == 0, "expected empty prefix, got %p\n", prefix); hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); ok( hr == S_OK, "got 0x%08x\n", hr); @@ -6118,6 +6118,7 @@ static void test_createNode(void) hr = IXMLDOMElement_get_namespaceURI(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); ok( lstrcmpW(str, _bstr_("http://winehq.org/default")) == 0, "expected default namespace\n"); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMNode_Release(node); @@ -6126,6 +6127,51 @@ static void test_createNode(void) free_bstrs(); } +static void test_get_prefix(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + /* no prefix */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &element); + ok( hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_get_prefix(element, NULL); + ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok( str == 0, "got %p\n", str); + + IXMLDOMElement_Release(element); + + /* with prefix */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("a:elem"), &element); + ok( hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("a")) == 0, "expected prefix \"a\"\n"); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_namespaceURI(element, &str); + todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok( str == 0, "got %p\n", str); + + IXMLDOMElement_Release(element); + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -6182,6 +6228,7 @@ START_TEST(domdoc) test_setAttributeNode(); test_put_dataType(); test_createNode(); + test_get_prefix(); CoUninitialize(); }

1 0