wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Jacek Caban : appwiz.cpl: Moved package file name to a struct that will allow customization.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 3e5c4551c40eb0458bd7c02a92e6580d18e12463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5c4551c40eb0458bd7c02a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:27 2012 +0200 appwiz.cpl: Moved package file name to a struct that will allow customization. --- dlls/appwiz.cpl/addons.c | 80 +++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4b57cc3..0e731e4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,7 +64,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" +typedef struct { + const char *file_name; +} addon_info_t; + +static const addon_info_t addons_info[] = { + { + "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" + } +}; + +static const addon_info_t *addon = &addons_info[0]; static const WCHAR mshtml_keyW[] = {'S','o','f','t','w','a','r','e', @@ -157,18 +167,30 @@ static BOOL install_file(const WCHAR *file_name) return TRUE; } -static BOOL install_from_unix_file(const char *file_name) +static BOOL install_from_unix_file(const char *dir, const char *file_name) { LPWSTR dos_file_name; - int fd; + char *file_path; + int fd, len; BOOL ret; static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - fd = open(file_name, O_RDONLY); + len = strlen(dir); + file_path = heap_alloc(len+strlen(file_name)+2); + if(!file_path) + return FALSE; + + memcpy(file_path, dir, len); + if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') + file_path[len++] = '/'; + strcpy(file_path+len, file_name); + + fd = open(file_path, O_RDONLY); if(fd == -1) { - TRACE("%s not found\n", debugstr_a(file_name)); + TRACE("%s not found\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } @@ -178,19 +200,22 @@ static BOOL install_from_unix_file(const char *file_name) wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); if(wine_get_dos_file_name) { /* Wine UNIX mode */ - dos_file_name = wine_get_dos_file_name(file_name); + dos_file_name = wine_get_dos_file_name(file_path); if(!dos_file_name) { - ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); + ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } } else { /* Windows mode */ UINT res; WARN("Could not get wine_get_dos_file_name function, calling install_cab directly.\n"); - res = MultiByteToWideChar( CP_ACP, 0, file_name, -1, 0, 0); + res = MultiByteToWideChar( CP_ACP, 0, file_path, -1, 0, 0); dos_file_name = heap_alloc (res*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); + MultiByteToWideChar( CP_ACP, 0, file_path, -1, dos_file_name, res); } + heap_free(file_path); + ret = install_file(dos_file_name); heap_free(dos_file_name); @@ -199,7 +224,7 @@ static BOOL install_from_unix_file(const char *file_name) static BOOL install_from_registered_dir(void) { - char *file_name; + char *package_dir; HKEY hkey; DWORD res, type, size = MAX_PATH; BOOL ret; @@ -209,32 +234,30 @@ static BOOL install_from_registered_dir(void) if(res != ERROR_SUCCESS) return FALSE; - file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_alloc(size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { - file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_realloc(package_dir, size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { - heap_free(file_name); + heap_free(package_dir); return FALSE; } - strcat(file_name, GECKO_FILE_NAME); - - TRACE("Trying %s\n", debugstr_a(file_name)); + TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); return ret; } static BOOL install_from_default_dir(void) { const char *data_dir, *subdir; - char *file_name; + char *package_dir; int len, len2; BOOL ret; @@ -248,19 +271,18 @@ static BOOL install_from_default_dir(void) len = strlen(data_dir); len2 = strlen(subdir); - file_name = heap_alloc(len+len2+sizeof(GECKO_FILE_NAME)); - memcpy(file_name, data_dir, len); - memcpy(file_name+len, subdir, len2); - memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); + package_dir = heap_alloc(len+len2+1); + memcpy(package_dir, data_dir, len); + memcpy(package_dir+len, subdir, len2+1); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); if (!ret) - ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/", addon->file_name); if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) - ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file("/usr/share/wine/gecko/", addon->file_name); return ret; }

1 0

Dmitry Timoshkov : gdiplus: Fix the clipping region calculation.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: d0fcc19e7e43f7e9bc6709f7b737e47195c990f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fcc19e7e43f7e9bc6709f7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:32 2012 +0900 gdiplus: Fix the clipping region calculation. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f2c956ea..c6e6a6e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5190,9 +5190,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; + rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); scaled_rect.X = 0.0;

1 0

Dmitry Timoshkov : gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: bf9aed6f5cbae09463468158015e5615976dcf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9aed6f5cbae094634681580… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:24 2012 +0900 gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset. --- dlls/gdiplus/graphics.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e352e42..f2c956ea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5161,14 +5161,18 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ - RectF bounds; - GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + RectF bounds, in_rect = *rect; + in_rect.Height = 0.0; /* avoid height clipping */ + GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); + + TRACE("bounds %s\n", debugstr_rectf(&bounds)); if(format->vertalign == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; else if(format->vertalign == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } + TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); } save_state = SaveDC(hdc);

1 0

Christian Costa : d3drm: Retrieve mesh name at loading time. Implement GetName and SetName.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: c436887483314c14deec51178730db0522413596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c436887483314c14deec51178… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:29 2012 +0200 d3drm: Retrieve mesh name at loading time. Implement GetName and SetName. --- dlls/d3drm/meshbuilder.c | 74 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 22 +++++++++++++ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 557a028..c84ccb8 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -48,6 +48,7 @@ typedef struct { IDirect3DRMMeshBuilder2 IDirect3DRMMeshBuilder2_iface; IDirect3DRMMeshBuilder3 IDirect3DRMMeshBuilder3_iface; LONG ref; + char* name; DWORD nb_vertices; D3DVECTOR* pVertices; DWORD nb_normals; @@ -344,6 +345,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); HeapFree(GetProcessHeap(), 0, This->pFaceData); @@ -408,23 +410,23 @@ static DWORD WINAPI IDirect3DRMMeshBuilder2Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder2* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetName(&This->IDirect3DRMMeshBuilder3_iface, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_GetName(&This->IDirect3DRMMeshBuilder3_iface, size, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, @@ -1002,23 +1004,48 @@ static DWORD WINAPI IDirect3DRMMeshBuilder3Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder3* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + char *string = NULL; - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + if (name) + { + string = HeapAlloc(GetProcessHeap(), 0, strlen(name) + 1); + if (!string) return E_OUTOFMEMORY; + strcpy(string, name); + } + HeapFree(GetProcessHeap(), 0, This->name); + This->name = string; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder3* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + if (!size) + return E_POINTER; + + if (!This->name) + { + *size = 0; + return D3DRM_OK; + } + + if (*size < (strlen(This->name) + 1)) + return E_INVALIDARG; + + strcpy(name, This->name); + *size = strlen(This->name) + 1; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, @@ -1052,6 +1079,29 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); + /* Remove previous name */ + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + hr = IDirectXFileData_GetName(pData, NULL, &size); + if (hr != DXFILE_OK) + return hr; + if (size) + { + This->name = HeapAlloc(GetProcessHeap(), 0, size); + if (!This->name) + return E_OUTOFMEMORY; + + hr = IDirectXFileData_GetName(pData, This->name, &size); + if (hr != DXFILE_OK) + { + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + return hr; + } + } + + TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 64f93cf..8a8968e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -179,6 +179,8 @@ static void test_MeshBuilder(void) D3DVECTOR v[3]; D3DVECTOR n[3]; DWORD f[8]; + char name[10]; + DWORD size; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -201,6 +203,26 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, "Object"), "Retreived name '%s' instead of 'Object'\n", name); + size = strlen("Object"); /* No space for null character */ + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(size == 0, "Size should be 0 instead of %u\n", size); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, ""); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, ""), "Retreived name '%s' instead of ''\n", name); + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);

1 0

Nikolay Sivov : msxml3: Remove no longer used get_xml() option to mess with encoding attribute.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: edf6162340847742c93af2efffc11274a7d503a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf6162340847742c93af2eff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 15 11:49:58 2012 +0400 msxml3: Remove no longer used get_xml() option to mess with encoding attribute. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 37 ++----------------------------------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 10 files changed, 11 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 58be87d..0fa00ec 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -497,7 +497,7 @@ static HRESULT WINAPI domattr_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domattr_transformNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b07cd84..1cf3d29 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -452,7 +452,7 @@ static HRESULT WINAPI domcdata_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcdata_transformNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3dab11b..172a1e6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -451,7 +451,7 @@ static HRESULT WINAPI domcomment_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcomment_transformNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index cedd258..46b81b0 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -449,7 +449,7 @@ static HRESULT WINAPI domfrag_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domfrag_transformNode( diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e760c84..26bfd0c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -926,7 +926,7 @@ static HRESULT WINAPI domelem_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, TRUE, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domelem_transformNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 313fc2e..f2d46ab 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -444,7 +444,7 @@ static HRESULT WINAPI entityref_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI entityref_transformNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 026b5dc..18ddac8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -329,7 +329,7 @@ extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_put_text(xmlnode*,BSTR) DECLSPEC_HIDDEN; -extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*) DECLSPEC_HIDDEN; +extern HRESULT node_get_xml(xmlnode*,BOOL,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_get_prefix(xmlnode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_get_base_name(xmlnode*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index adc38cb..36602eb 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -787,37 +787,6 @@ BSTR EnsureCorrectEOL(BSTR sInput) return sNew; } -/* Removes encoding information and last character (nullbyte) */ -static BSTR EnsureNoEncoding(BSTR sInput) -{ - static const WCHAR wszEncoding[] = {'e','n','c','o','d','i','n','g','='}; - BSTR sNew; - WCHAR *pBeg, *pEnd; - - pBeg = sInput; - while(*pBeg != '\n' && memcmp(pBeg, wszEncoding, sizeof(wszEncoding))) - pBeg++; - - if(*pBeg == '\n') - { - SysReAllocStringLen(&sInput, sInput, SysStringLen(sInput)-1); - return sInput; - } - pBeg--; - - pEnd = pBeg + sizeof(wszEncoding)/sizeof(WCHAR) + 2; - while(*pEnd != '\"') pEnd++; - pEnd++; - - sNew = SysAllocStringLen(NULL, - pBeg-sInput + SysStringLen(sInput)-(pEnd-sInput)-1); - memcpy(sNew, sInput, (pBeg-sInput)*sizeof(WCHAR)); - memcpy(&sNew[pBeg-sInput], pEnd, (SysStringLen(sInput)-(pEnd-sInput)-1)*sizeof(WCHAR)); - - SysFreeString(sInput); - return sNew; -} - /* * We are trying to replicate the same behaviour as msxml by converting * line endings to \r\n and using indents as \t. The problem is that msxml @@ -825,7 +794,7 @@ static BSTR EnsureNoEncoding(BSTR sInput) * reproduce behaviour exactly. * */ -HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BSTR *ret) +HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) { xmlBufferPtr xml_buf; xmlNodePtr xmldecl; @@ -853,8 +822,6 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BS content = bstr_from_xmlChar(buf_content + (buf_content[0] == ' ' ? 1 : 0)); if(ensure_eol) content = EnsureCorrectEOL(content); - if(ensure_no_encoding) - content = EnsureNoEncoding(content); *ret = content; }else { @@ -1453,7 +1420,7 @@ static HRESULT WINAPI unknode_get_xml( FIXME("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI unknode_transformNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1910b..4d1cab7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -487,7 +487,7 @@ static HRESULT WINAPI dom_pi_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI dom_pi_transformNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 705afd0..865c1d4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -514,7 +514,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domtext_transformNode(

1 0

Francois Gouget : Assorted typo, spelling, wording and case fixes.
by Alexandre Julliard 15 May '12

15 May '12

1 0

Francois Gouget : wininet: Fix the spelling of an InternetQueryDataAvailable() parameter.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: d0579d02ccfe8a0bb0ee759d859f912a9f9e9cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0579d02ccfe8a0bb0ee759d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:01 2012 +0200 wininet: Fix the spelling of an InternetQueryDataAvailable() parameter. --- dlls/wininet/internet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ba4794c..be1663b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3833,13 +3833,13 @@ lend: * data is available. */ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, - LPDWORD lpdwNumberOfBytesAvailble, + LPDWORD lpdwNumberOfBytesAvailable, DWORD dwFlags, DWORD_PTR dwContext) { object_header_t *hdr; DWORD res; - TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext); hdr = get_handle_object( hFile ); if (!hdr) { @@ -3848,7 +3848,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, } if(hdr->vtbl->QueryDataAvailable) { - res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailable, dwFlags, dwContext); }else { WARN("wrong handle\n"); res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;

1 0

Francois Gouget : usp10: Fix the spelling of the Consonant_is_post_base_form() function.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 7796895b74b2b60e03e5948b310e0eb7c475052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796895b74b2b60e03e5948b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:41 2012 +0200 usp10: Fix the spelling of the Consonant_is_post_base_form() function. --- dlls/usp10/indic.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index df2a977..62834d1 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -208,7 +208,7 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } -static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -225,7 +225,7 @@ static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac return FALSE; } -static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -242,7 +242,7 @@ static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCa return FALSE; } -static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -259,7 +259,7 @@ static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return FALSE; } -static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static BOOL Consonant_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) { if ((lexical(pwChar[s->start])==lex_Ra) && s->end > s->start && lexical(pwChar[s->start+1]) == lex_Halant) return (SHAPE_does_GSUB_feature_apply_to_chars(hdc, psa, psc, &pwChar[s->start], 1, 2, "rphf") > 0); @@ -273,7 +273,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP BOOL pref = FALSE; /* remove ralf from consideration */ - if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) + if (Consonant_is_ralf(hdc, psa, psc, input, s, lex)) { s->ralf = s->start; s->start+=2; @@ -290,7 +290,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) + while ((blwf = Consonant_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonant_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonant_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) { if (blwf && s->blwf == -1) s->blwf = s->base - 1;

1 0

Francois Gouget : taskmgr: Fix the spelling of the AdjustControlPosition() function.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: ec6a0fdb612cbc419a930a8bb6f523aa78f45ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6a0fdb612cbc419a930a8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:51 2012 +0200 taskmgr: Fix the spelling of the AdjustControlPosition() function. --- programs/taskmgr/perfpage.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 2d3b485..5276de7 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -102,7 +102,7 @@ static void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDiff InvalidateRect(hCntrl, NULL, TRUE); } -static void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) +static void AdjustControlPosition(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0); } @@ -404,18 +404,18 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) AdjustCntrlPos(IDS_TOTALS_PROCESS_COUNT, hDlg, 0, nYDifference); AdjustCntrlPos(IDS_TOTALS_THREAD_COUNT, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); { static int lastX, lastY;

1 0

Francois Gouget : user32: Fix the spelling of the hRecipient variable.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: b89a49d4816c251de4bc70186769a182e81ab5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89a49d4816c251de4bc70186… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:23 2012 +0200 user32: Fix the spelling of the hRecipient variable. --- dlls/user32/misc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5fc601a..ef7fff6 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -505,7 +505,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * notifications about a device. * * PARAMS - * hRecepient [I] Window or service status handle that + * hRecipient [I] Window or service status handle that * will receive notifications. * pNotificationFilter [I] DEV_BROADCAST_HDR followed by some * type-specific data. @@ -518,13 +518,13 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * NOTES * * The dwFlags parameter can be one of two values: - *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecepient is a window handle - *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecepient is a service status handle + *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecipient is a window handle + *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecipient is a service status handle */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) { FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", - hRecepient,pNotificationFilter,dwFlags ); + hRecipient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
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 May 2012