January 2008 - Wine-commits

Francois Gouget : kernel32/tests: Small spelling fix in a parameter name.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 12689d9b0ffd35e916c406027a0c87e29a23dc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12689d9b0ffd35e916c406027… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 16 12:19:21 2008 +0100 kernel32/tests: Small spelling fix in a parameter name. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 3ab86ea..61b8521 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -284,7 +284,7 @@ static void test_event_security(void) static HANDLE sem = 0; -static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped) +static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTransferred, LPOVERLAPPED lpOverlapped) { ReleaseSemaphore(sem, 1, NULL); }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 7478d9c44d25f6cdc257ed77c1998e338cbbbb68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7478d9c44d25f6cdc257ed77c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 16 12:17:27 2008 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddrawmodes.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 5af8ba4..529c81a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -110,18 +110,18 @@ static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext { trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\r\n", lpddsd->dwWidth, lpddsd->dwHeight, - U2(*lpddsd).dwRefreshRate, lpddsd->lPitch, lpddsd->dwFlags); + U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); /* Check that the pitch is valid if applicable */ if(lpddsd->dwFlags & DDSD_PITCH) { - ok(lpddsd->lPitch != 0, "EnumDisplayModes callback with bad pitch\n"); + ok(U1(*lpddsd).lPitch != 0, "EnumDisplayModes callback with bad pitch\n"); } /* Check that frequency is valid if applicable */ if(lpddsd->dwFlags & DDSD_REFRESHRATE) { - ok(lpddsd->dwRefreshRate != 0, "EnumDisplayModes callback with bad refresh rate\n"); + ok(U2(*lpddsd).dwRefreshRate != 0, "EnumDisplayModes callback with bad refresh rate\n"); } adddisplaymode(lpddsd);

1 0

Francois Gouget : Fix spelling error in the generated conformance test files.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: f6fab295f35cbeae9e76b98b95c3b65531f0e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fab295f35cbeae9e76b98b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 16 12:17:40 2008 +0100 Fix spelling error in the generated conformance test files. --- dlls/gdi32/tests/generated.c | 2 +- dlls/kernel32/tests/generated.c | 2 +- dlls/ntdll/tests/generated.c | 2 +- dlls/rpcrt4/tests/generated.c | 2 +- dlls/shell32/tests/generated.c | 2 +- dlls/shlwapi/tests/generated.c | 2 +- dlls/urlmon/tests/generated.c | 2 +- dlls/user32/tests/generated.c | 2 +- tools/winapi/winapi_test | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index ec9e9fa..9a35f24 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -16,7 +16,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 4777d29..846d726 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -16,7 +16,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index 2e2b69b..4818c9e 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -16,7 +16,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index fb7d7cc..b281d0b 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -21,7 +21,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index b424065..7e8d281 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -23,7 +23,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index d1bfa4c..6d50fbc 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -21,7 +21,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 99bec81..d29c226 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -19,7 +19,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index f0012cf..c2d24f9 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -16,7 +16,7 @@ #include "wine/test.h" /*********************************************************************** - * Compability macros + * Compatibility macros */ #define DWORD_PTR UINT_PTR diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index b1bb582..5e8d144 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -495,7 +495,7 @@ sub output_header($$$) { print OUT "\n"; print OUT "/***********************************************************************\n"; - print OUT " * Compability macros\n"; + print OUT " * Compatibility macros\n"; print OUT " */\n"; print OUT "\n"; print OUT "#define DWORD_PTR UINT_PTR\n";

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_36.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 87fefc7ef4eabef2b5869d75c7eced5d52c3a5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fefc7ef4eabef2b5869d75c… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Jan 13 11:34:43 2008 +0100 d3dx9: Start implementation of d3dx9_36. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_36/Makefile.in | 14 ++ dlls/d3dx9_36/d3dx9_36.spec | 336 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_main.c | 53 +++++++ 7 files changed, 410 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87fefc7ef4eabef2b5869…

1 0

Francois Gouget : gdi32: Small wording tweaks in comments.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 22edaaef16cefdb06842b1742f09b305cc2e2d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22edaaef16cefdb06842b1742… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 16 12:17:08 2008 +0100 gdi32: Small wording tweaks in comments. --- dlls/gdi32/painting.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 74b04f9..097ddcf 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1041,7 +1041,7 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, * *Very* simple bezier drawing code, * * It uses a recursive algorithm to divide the curve in a series - * of straight line segments. Not ideal but for me sufficient. + * of straight line segments. Not ideal but sufficient for me. * If you are in need for something better look for some incremental * algorithm. * @@ -1203,7 +1203,7 @@ static void GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, * Ptr to an array of POINTs that contain the lines that approximate the * Beziers. The array is allocated on the process heap and it is the caller's * responsibility to HeapFree it. [this is not a particularly nice interface - * but since we can't know in advance how many points will generate, the + * but since we can't know in advance how many points we will generate, the * alternative would be to call the function twice, once to determine the size * and a second time to do the work - I decided this was too much of a pain]. */

1 0

Dmitry Timoshkov : gdi32: Allocate cache for face enumeration data only when necessary.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: ec4a46f93a9c94d43f596e3450ceb4e1a01904b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4a46f93a9c94d43f596e345… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 16 14:46:24 2008 +0800 gdi32: Allocate cache for face enumeration data only when necessary. --- dlls/gdi32/freetype.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b72ee50..b48cbcc 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -242,6 +242,13 @@ typedef struct { FT_Pos size, x_ppem, y_ppem; } My_FT_Bitmap_Size; +struct enum_data +{ + ENUMLOGFONTEXW elf; + NEWTEXTMETRICEXW ntm; + DWORD type; +}; + typedef struct tagFace { struct list entry; WCHAR *StyleName; @@ -260,10 +267,7 @@ typedef struct tagFace { BOOL external; /* TRUE if we should manually add this font to the registry */ struct tagFamily *family; /* Cached data for Enum */ - BOOL cache_valid; - ENUMLOGFONTEXW elf; - NEWTEXTMETRICEXW ntm; - DWORD type; + struct enum_data *cached_enum_data; } Face; typedef struct tagFamily { @@ -1239,7 +1243,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } } face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cache_valid = FALSE; + face->cached_enum_data = NULL; list_add_tail(&family->faces, &face->entry); face->StyleName = StyleW; if (file) @@ -3290,12 +3294,12 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, GdiFont *font; LONG width, height; - if (face->cache_valid) + if (face->cached_enum_data) { TRACE("Cached\n"); - memcpy(pelf,&face->elf,sizeof(ENUMLOGFONTEXW)); - memcpy(pntm,&face->ntm,sizeof(NEWTEXTMETRICEXW)); - *ptype = face->type; + memcpy(pelf, &face->cached_enum_data->elf, sizeof(ENUMLOGFONTEXW)); + memcpy(pntm, &face->cached_enum_data->ntm, sizeof(NEWTEXTMETRICEXW)); + *ptype = face->cached_enum_data->type; return; } @@ -3374,10 +3378,13 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, if(!(pntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) *ptype |= RASTER_FONTTYPE; - memcpy(&face->elf,pelf,sizeof(ENUMLOGFONTEXW)); - memcpy(&face->ntm,pntm,sizeof(NEWTEXTMETRICEXW)); - face->type = *ptype; - face->cache_valid = TRUE; + face->cached_enum_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*face->cached_enum_data)); + if (face->cached_enum_data) + { + memcpy(&face->cached_enum_data->elf, pelf, sizeof(ENUMLOGFONTEXW)); + memcpy(&face->cached_enum_data->ntm, pntm, sizeof(NEWTEXTMETRICEXW)); + face->cached_enum_data->type = *ptype; + } free_font(font); }

1 0

Marcus Meissner : mshtml: Check for This->frame.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: fa6042fc8d93908ac73b43a051d1bfe0e8d54851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6042fc8d93908ac73b43a05… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 13 12:27:14 2008 +0100 mshtml: Check for This->frame. --- dlls/mshtml/olecmd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 326b0b0..afc3cc8 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -629,7 +629,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, call_set_active_object(This->ip_window, ACTOBJ(This)); memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); - IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); + if (This->frame) + IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); } return S_OK;

1 0

James Hawkins : propsys: Add a stub implementation of propsys.dll.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 07588027948d81bf79b96f5de84d5f61fbf74b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07588027948d81bf79b96f5de… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 16 00:11:17 2008 -0600 propsys: Add a stub implementation of propsys.dll. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/propsys/Makefile.in | 13 +++ dlls/propsys/propsys.spec | 209 +++++++++++++++++++++++++++++++++++++++++++ dlls/propsys/propsys_main.c | 49 ++++++++++ 7 files changed, 278 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07588027948d81bf79b96…

1 0

Alistair Leslie-Hughes : msxml3: Implement put_text.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: b2101b81774f3ee14e1dcec32efbe0aaaa948c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2101b81774f3ee14e1dcec32… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 16 13:44:51 2008 +1100 msxml3: Implement put_text. --- dlls/msxml3/node.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 72be7a8..e354081 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -697,8 +697,29 @@ static HRESULT WINAPI xmlnode_put_text( IXMLDOMNode *iface, BSTR text) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlChar *str = NULL; + + TRACE("%p\n", This); + + switch(This->node->type) + { + case XML_DOCUMENT_NODE: + return E_FAIL; + default: + break; + } + + str = xmlChar_from_wchar((WCHAR*)text); + + /* Escape the string. */ + str = xmlEncodeEntitiesReentrant(This->node->doc, str); + str = xmlEncodeSpecialChars(This->node->doc, str); + + xmlNodeSetContent(This->node, str); + xmlFree(str); + + return S_OK; } static HRESULT WINAPI xmlnode_get_specified( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 75adc64..1637e7c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -142,6 +142,8 @@ static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; static WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; +static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', + 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; static WCHAR szAttribute[] = {'A','t','t','r',0 }; static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; @@ -444,6 +446,9 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n"); SysFreeString( str ); + /* test put_text */ + r = IXMLDOMDocument_put_text( doc, _bstr_("Should Fail") ); + ok( r == E_FAIL, "ret %08x\n", r ); /* check that there's a document element */ element = NULL; @@ -2030,6 +2035,13 @@ static void test_xmlTypes(void) SysFreeString(str); } + hr = IXMLDOMElement_put_text(pElement, _bstr_("TestingNode")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); + IXMLDOMElement_Release(pElement); }

1 0

James Hawkins : msi: dest_path refers to the directory prefix, not the entire file path.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: ced64861f53629f37f8a2616df710ec8590e6949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced64861f53629f37f8a2616d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 15 22:29:56 2008 -0600 msi: dest_path refers to the directory prefix, not the entire file path. --- dlls/msi/files.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b447461..ba25f04 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -901,13 +901,11 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) } dest = build_directory_name(2, dest_path, dest_name); - create_full_pathW(dest); + create_full_pathW(dest_path); TRACE("Duplicating file %s to %s\n",debugstr_w(file->TargetPath), debugstr_w(dest)); - CreateDirectoryW(dest_path, NULL); - if (strcmpW(file->TargetPath,dest)) rc = !CopyFileW(file->TargetPath,dest,TRUE); else

1 0