March 2006 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : gdi: Add a simple test for bitmap bits/metrics
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 5c1b27a02958504501a93dfad3c36b044d3d923f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c1b27a02958504501a93df… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 20 18:36:53 2006 +0800 gdi: Add a simple test for bitmap bits/metrics Add a simple test for bitmap bits/metrics, fix GetBitmapBits for an empty (not selected into a DC) bitmap. --- dlls/gdi/bitmap.c | 5 ++- dlls/gdi/tests/gdiobj.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index 5c2b6c3..a5b249b 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -366,8 +366,9 @@ LONG WINAPI GetBitmapBits( } else { if(!bmp->bitmap.bmBits) { - WARN("Bitmap is empty\n"); - ret = 0; + TRACE("Bitmap is empty\n"); + memset(bits, 0, count); + ret = count; } else { memcpy(bits, bmp->bitmap.bmBits, count); ret = count; diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 2dee9ab..ec4d2d4 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -982,10 +982,91 @@ else } } +static void test_bitmap(void) +{ + char buf[256], buf_cmp[256]; + HBITMAP hbmp, hbmp_old; + HDC hdc; + BITMAP bm; + INT ret; + + hdc = CreateCompatibleDC(0); + assert(hdc != 0); + + hbmp = CreateBitmap(15, 15, 1, 1, NULL); + assert(hbmp != NULL); + + ret = GetObject(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + + ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); + ok(bm.bmWidth == 15, "wrong bm.bmWidth %d\n", bm.bmWidth); + ok(bm.bmHeight == 15, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmWidthBytes == 2, "wrong bm.bmWidthBytes %d\n", bm.bmWidthBytes); + ok(bm.bmPlanes == 1, "wrong bm.bmPlanes %d\n", bm.bmPlanes); + ok(bm.bmBitsPixel == 1, "wrong bm.bmBitsPixel %d\n", bm.bmBitsPixel); + ok(bm.bmBits == NULL, "wrong bm.bmBits %p\n", bm.bmBits); + + assert(sizeof(buf) >= bm.bmWidthBytes * bm.bmHeight); + assert(sizeof(buf) == sizeof(buf_cmp)); + + memset(buf_cmp, 0xAA, sizeof(buf_cmp)); + memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); + + memset(buf, 0xAA, sizeof(buf)); + ret = GetBitmapBits(hbmp, sizeof(buf), buf); + ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); + + hbmp_old = SelectObject(hdc, hbmp); + + ret = GetObject(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + + ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); + ok(bm.bmWidth == 15, "wrong bm.bmWidth %d\n", bm.bmWidth); + ok(bm.bmHeight == 15, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmWidthBytes == 2, "wrong bm.bmWidthBytes %d\n", bm.bmWidthBytes); + ok(bm.bmPlanes == 1, "wrong bm.bmPlanes %d\n", bm.bmPlanes); + ok(bm.bmBitsPixel == 1, "wrong bm.bmBitsPixel %d\n", bm.bmBitsPixel); + ok(bm.bmBits == NULL, "wrong bm.bmBits %p\n", bm.bmBits); + + memset(buf, 0xAA, sizeof(buf)); + ret = GetBitmapBits(hbmp, sizeof(buf), buf); + ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); +todo_wine { + ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); +} + + hbmp_old = SelectObject(hdc, hbmp_old); + ok(hbmp_old == hbmp, "wrong old bitmap %p\n", hbmp_old); + + /* test various buffer sizes for GetObject */ + ret = GetObject(hbmp, sizeof(bm) * 2, &bm); + ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + + ret = GetObject(hbmp, sizeof(bm) / 2, &bm); +todo_wine { + ok(ret == 0, "%d != 0\n", ret); +} + + ret = GetObject(hbmp, 0, &bm); + ok(ret == 0, "%d != 0\n", ret); + + ret = GetObject(hbmp, 1, &bm); +todo_wine { + ok(ret == 0, "%d != 0\n", ret); +} + + DeleteObject(hbmp); + DeleteDC(hdc); +} + START_TEST(gdiobj) { test_logfont(); test_logpen(); + test_bitmap(); test_bitmap_font(); test_bitmap_font_metrics(); test_gdi_objects();

1 0

Mike McCormack : msi: Set the InstallerLocation value when registering msi. dll.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 5052dcccf2cb329d350e3c28f872a61a166481d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5052dcccf2cb329d350e3c2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 19 16:52:31 2006 +0900 msi: Set the InstallerLocation value when registering msi.dll. --- dlls/msi/regsvr.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index f49b78a..f8bfbbb 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -595,6 +595,39 @@ static struct regsvr_interface const int { NULL } /* list terminator */ }; +static HRESULT register_msiexec(void) +{ + static const WCHAR key[] = { + 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','s','t','a','l','l','e','r',0 }; + static const WCHAR val[] = { + 'I','n','s','t','a','l','l','e','r','L','o','c','a','t','i','o','n',0 }; + WCHAR path[MAX_PATH]; + HKEY hkey; + LONG res; + INT len; + + len = GetSystemDirectoryW(path, MAX_PATH); + if (!len || len > MAX_PATH) + return E_FAIL; + + res = RegCreateKeyExW(HKEY_LOCAL_MACHINE, key, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &hkey, NULL); + if (res != ERROR_SUCCESS) + return E_FAIL; + + res = RegSetValueExW(hkey, val, 0, REG_SZ, + (BYTE*)path, (len + 1)*sizeof(WCHAR)); + + RegCloseKey(hkey); + + return (res == ERROR_SUCCESS) ? S_OK : E_FAIL; +} + /*********************************************************************** * DllRegisterServer (MSI.@) */ @@ -607,6 +640,8 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = register_msiexec(); return hr; }

1 0

Detlef Riekenberg : kernel: Avoid heap corruption on invalid parameter in GlobalFree().
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: dcbfa1179d32a5762388ee079dec546d5feeeced URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcbfa1179d32a5762388ee0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 19 19:35:36 2006 +0100 kernel: Avoid heap corruption on invalid parameter in GlobalFree(). --- dlls/kernel/heap.c | 23 ++++++++++++++++++----- dlls/kernel/tests/heap.c | 23 ++++++++++++++++++++++- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 59a5e9f..a5849ed 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -683,13 +683,19 @@ HGLOBAL WINAPI GlobalReAlloc( * * Free a global memory object. * + * PARAMS + * hmem [I] Handle of the global memory object + * * RETURNS - * NULL: Success - * Handle: Failure + * Success: NULL + * Failure: The provided handle + * + * NOTES + * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE + * */ -HGLOBAL WINAPI GlobalFree( - HGLOBAL hmem /* [in] Handle of global memory object */ -) { +HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) +{ PGLOBAL32_INTERN pintern; HGLOBAL hreturned; @@ -707,6 +713,7 @@ HGLOBAL WINAPI GlobalFree( if(pintern->Magic==MAGIC_GLOBAL_USED) { + pintern->Magic = 0xdead; /* WIN98 does not make this test. That is you can free a */ /* block you have not unlocked. Go figure!! */ @@ -719,6 +726,12 @@ HGLOBAL WINAPI GlobalFree( if(!HeapFree(GetProcessHeap(), 0, pintern)) hreturned=hmem; } + else + { + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); + SetLastError(ERROR_INVALID_HANDLE); + hreturned = hmem; + } } } __EXCEPT_PAGE_FAULT diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index a6284a0..e1a535c 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -25,6 +25,8 @@ #include "winbase.h" #include "wine/test.h" +#define MAGIC_DEAD 0xdeadbeef + static SIZE_T resize_9x(SIZE_T size) { DWORD dwSizeAligned = (size + 3) & ~3; @@ -35,7 +37,8 @@ START_TEST(heap) { void *mem; HGLOBAL gbl; - SIZE_T size; + HGLOBAL hsecond; + SIZE_T size; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -75,6 +78,15 @@ START_TEST(heap) gbl = GlobalReAlloc(0, 10, GMEM_MOVEABLE); ok(gbl == NULL, "global realloc allocated memory\n"); + /* invalid handles are catched in windows */ + gbl = GlobalAlloc(GMEM_MOVEABLE, 256); + GlobalFree(gbl); + SetLastError(MAGIC_DEAD); + hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ + ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", + hsecond, GetLastError(), gbl); + /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); ok(gbl != NULL, "local memory not allocated for size 0\n"); @@ -96,6 +108,15 @@ START_TEST(heap) gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ok(gbl == NULL, "local realloc allocated memory\n"); + /* invalid handles are catched in windows */ + gbl = LocalAlloc(GMEM_MOVEABLE, 256); + LocalFree(gbl); + SetLastError(MAGIC_DEAD); + hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ + ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", + hsecond, GetLastError(), gbl); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n");

1 0

Alexandre Julliard : kernel: Avoid infinite waits in directory change tests .
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 13c2f4742f776e40815287fce2d78cee1e8c265b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13c2f4742f776e40815287f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 12:26:14 2006 +0100 kernel: Avoid infinite waits in directory change tests. --- dlls/kernel/tests/change.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index 8bce2ce..e99d44c 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -409,7 +409,7 @@ static void test_readdirectorychanges(vo r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); @@ -451,7 +451,7 @@ static void test_readdirectorychanges(vo r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); @@ -474,7 +474,7 @@ static void test_readdirectorychanges(vo r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); @@ -487,7 +487,7 @@ static void test_readdirectorychanges(vo r = CreateDirectoryW( subsubdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); @@ -510,7 +510,7 @@ static void test_readdirectorychanges(vo r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -605,7 +605,7 @@ static void test_readdirectorychanges_nu r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove directory\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); @@ -675,7 +675,7 @@ static void test_readdirectorychanges_fi ok( hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ok( CloseHandle(hfile), "failed toc lose file\n"); - r = WaitForSingleObject( ov.hEvent, INFINITE ); + r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");

1 0

H. Verbeet : d3d8: Change the default debug channel to d3d8 for device.c.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: bb370f3582358be5be56c2b9f0422368f208d3ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb370f3582358be5be56c2b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 19 22:26:00 2006 +0000 d3d8: Change the default debug channel to d3d8 for device.c. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33d56fb..3b7b40b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -34,7 +34,7 @@ #include "d3d8_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DEFAULT_DEBUG_CHANNEL(d3d8); /* IDirect3D IUnknown parts follow: */ HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj)

1 0

H. Verbeet : d3d8: Downgrade a FIXME to a TRACE in IDirect3DDevice8Impl_SetVertexShader.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 2940fd91706209ee2bc8e5fe753630a9c19ae869 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2940fd91706209ee2bc8e5f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 19 22:25:49 2006 +0000 d3d8: Downgrade a FIXME to a TRACE in IDirect3DDevice8Impl_SetVertexShader. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4038188..33d56fb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1088,7 +1088,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetV /* Call SetVertexShader with a NULL shader to set the vertexshader in the stateblock to NULL. */ IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL); } else { - FIXME("Setting shader\n"); + TRACE("Setting shader\n"); if (MAX_SHADERS <= pShader - (VS_HIGHESTFIXEDFXF + 1)) { FIXME("(%p) : Number of shaders exceeds the maximum number of possible shaders\n", This); hrc = D3DERR_INVALIDCALL;

1 0

H. Verbeet : d3d8: Fix comparison in IDirect3DDevice8Impl_DeleteVertexShader.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 0ea6686134d3b5d20cca5acf976c33f14d69091a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ea6686134d3b5d20cca5ac… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 19 22:25:05 2006 +0000 d3d8: Fix comparison in IDirect3DDevice8Impl_DeleteVertexShader. --- dlls/d3d8/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 834d84b..4038188 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1140,11 +1140,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_De IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; TRACE("(%p) Relay\n", This); - if (VS_HIGHESTFIXEDFXF <= pShader) { - WARN("(%p) : Caller as passed a shader below the valud of VS_HIGHESTFIXEDFXF\n", This); + if (pShader <= VS_HIGHESTFIXEDFXF) { + WARN("(%p) : Caller passed a shader below the value of VS_HIGHESTFIXEDFXF\n", This); hrc = D3DERR_INVALIDCALL; } else if (MAX_SHADERS <= pShader - (VS_HIGHESTFIXEDFXF + 1)) { - FIXME("(%p) : Caller as passed a shader greater than the maximum number of shaders\n", This); + FIXME("(%p) : Caller passed a shader greater than the maximum number of shaders\n", This); hrc = D3DERR_INVALIDCALL; } else { IDirect3DVertexShader8Impl *shader = This->vShaders[pShader - (VS_HIGHESTFIXEDFXF + 1)];

1 0

Jacek Caban : mshtml: Optimize nsACString handling.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: dbd582cf8423c2c3cb723386df37c89a59e45789 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbd582cf8423c2c3cb72338… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 22:00:34 2006 +0100 mshtml: Optimize nsACString handling. --- dlls/mshtml/mshtml_private.h | 5 ++--- dlls/mshtml/nsembed.c | 26 ++++++++++---------------- dlls/mshtml/nsiface.idl | 8 +++++++- dlls/mshtml/nsio.c | 37 ++++++++++++++++++++----------------- dlls/mshtml/persist.c | 8 ++++---- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 20cdac6..66f4450 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -198,10 +198,9 @@ void hlink_frame_navigate(HTMLDocument*, nsIURI *get_nsIURI(LPCWSTR); -nsACString *nsACString_Create(void); +void nsACString_Init(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**,PRBool*); -void nsACString_SetData(nsACString*,const char*); -void nsACString_Destroy(nsACString*); +void nsACString_Finish(nsACString*); void nsAString_Init(nsAString*,const PRUnichar*); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**,PRBool*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 03c1fed..9cabc71 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -361,17 +361,11 @@ static BOOL load_gecko(void) return TRUE; } -nsACString *nsACString_Create(void) +void nsACString_Init(nsACString *str, const char *data) { - nsACString *ret; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsACString)); - NS_CStringContainerInit(ret); - return ret; -} - -void nsACString_SetData(nsACString *str, const char *data) -{ - NS_CStringSetData(str, data, PR_UINT32_MAX); + NS_CStringContainerInit(str); + if(data) + NS_CStringSetData(str, data, PR_UINT32_MAX); } PRUint32 nsACString_GetData(const nsACString *str, const char **data, PRBool *termited) @@ -379,10 +373,9 @@ PRUint32 nsACString_GetData(const nsACSt return NS_CStringGetData(str, data, termited); } -void nsACString_Destroy(nsACString *str) +void nsACString_Finish(nsACString *str) { NS_CStringContainerFinish(str); - HeapFree(GetProcessHeap(), 0, str); } void nsAString_Init(nsAString *str, const PRUnichar *data) @@ -727,16 +720,17 @@ static nsresult NSAPI nsURIContentListen { NSContainer *This = NSURICL_THIS(iface); nsIWineURI *wine_uri; - nsACString *spec_str = nsACString_Create(); + nsACString spec_str; const char *spec; nsresult nsres; - nsIURI_GetSpec(aURI, spec_str); - nsACString_GetData(spec_str, &spec, NULL); + nsACString_Init(&spec_str, NULL); + nsIURI_GetSpec(aURI, &spec_str); + nsACString_GetData(&spec_str, &spec, NULL); TRACE("(%p)->(%p(%s) %p)\n", This, aURI, debugstr_a(spec), _retval); - nsACString_Destroy(spec_str); + nsACString_Finish(&spec_str); nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); if(NS_SUCCEEDED(nsres)) { diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7c0ad2f..176ef9b 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -52,9 +52,15 @@ typedef struct { void *d1; PRUint32 d2; void *d3; +} nsCStringContainer; + +typedef struct { + void *v; + void *d1; + PRUint32 d2; + void *d3; } nsStringContainer; -typedef struct nsCStringContainer nsCStringContainer; typedef nsCStringContainer nsACString; typedef nsStringContainer nsAString; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9a42cf6..51b3160 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -146,7 +146,7 @@ static BOOL handle_uri(NSContainer *cont static BOOL before_async_open(nsChannel *This) { - nsACString *uri_str; + nsACString uri_str; NSContainer *container; const char *uria; LPWSTR uri; @@ -167,13 +167,13 @@ static BOOL before_async_open(nsChannel return TRUE; } - uri_str = nsACString_Create(); - nsIWineURI_GetSpec(This->uri, uri_str); - nsACString_GetData(uri_str, &uria, NULL); + nsACString_Init(&uri_str, NULL); + nsIWineURI_GetSpec(This->uri, &uri_str); + nsACString_GetData(&uri_str, &uria, NULL); len = MultiByteToWideChar(CP_ACP, 0, uria, -1, NULL, 0); uri = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, uria, -1, uri, len); - nsACString_Destroy(uri_str); + nsACString_Finish(&uri_str); ret = handle_uri(container, This, uri); @@ -613,13 +613,15 @@ static nsresult NSAPI nsChannel_AsyncOpe nsres = nsIChannel_QueryInterface(This->channel, &IID_nsIUploadChannel, (void**)&upload_channel); if(NS_SUCCEEDED(nsres)) { - nsACString *empty_string = nsACString_Create(); - nsACString_SetData(empty_string, ""); + nsACString empty_string; + nsACString_Init(&empty_string, ""); nsres = nsIUploadChannel_SetUploadStream(upload_channel, This->post_data_stream, - empty_string, -1); + &empty_string, -1); if(NS_FAILED(nsres)) WARN("SetUploadStream failed: %08lx\n", nsres); + + nsACString_Finish(&empty_string); } } @@ -1380,18 +1382,20 @@ static nsresult NSAPI nsIOService_NewURI aBaseURI, _retval); if(aBaseURI) { - nsACString *base_uri_str = nsACString_Create(); + nsACString base_uri_str; const char *base_uri = NULL; - nsres = nsIURI_GetSpec(aBaseURI, base_uri_str); + nsACString_Init(&base_uri_str, NULL); + + nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); if(NS_SUCCEEDED(nsres)) { - nsACString_GetData(base_uri_str, &base_uri, NULL); + nsACString_GetData(&base_uri_str, &base_uri, NULL); TRACE("uri=%s\n", debugstr_a(base_uri)); }else { ERR("GetSpec failed: %08lx\n", nsres); } - nsACString_Destroy(base_uri_str); + nsACString_Finish(&base_uri_str); } nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); @@ -1603,7 +1607,7 @@ void init_nsio(nsIComponentManager *comp nsIURI *get_nsIURI(LPCWSTR url) { nsIURI *ret; - nsACString *acstr; + nsACString acstr; nsresult nsres; char *urla; int len; @@ -1612,14 +1616,13 @@ nsIURI *get_nsIURI(LPCWSTR url) urla = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_ACP, 0, url, -1, urla, -1, NULL, NULL); - acstr = nsACString_Create(); - nsACString_SetData(acstr, urla); + nsACString_Init(&acstr, urla); - nsres = nsIIOService_NewURI(nsio, acstr, NULL, NULL, &ret); + nsres = nsIIOService_NewURI(nsio, &acstr, NULL, NULL, &ret); if(NS_FAILED(nsres)) FIXME("NewURI failed: %08lx\n", nsres); - nsACString_Destroy(acstr); + nsACString_Finish(&acstr); HeapFree(GetProcessHeap(), 0, urla); return ret; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6f181a6..9496ceb 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -115,18 +115,18 @@ static HRESULT WINAPI BindStatusCallback IBinding_AddRef(pbind); if(This->doc->nscontainer && This->doc->nscontainer->stream) { - nsACString *strTextHtml; + nsACString strTextHtml; nsresult nsres; nsIURI *uri = get_nsIURI(This->url); - strTextHtml = nsACString_Create(); /* FIXME: Set it correctly */ - nsACString_SetData(strTextHtml, "text/html"); + nsACString_Init(&strTextHtml, "text/html"); - nsres = nsIWebBrowserStream_OpenStream(This->doc->nscontainer->stream, uri, strTextHtml); + nsres = nsIWebBrowserStream_OpenStream(This->doc->nscontainer->stream, uri, &strTextHtml); if(NS_FAILED(nsres)) ERR("OpenStream failed: %08lx\n", nsres); + nsACString_Finish(&strTextHtml); nsIURI_Release(uri); }

1 0

Jacek Caban : mshtml: Better QueryInterface implementation.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 3d9d3844860efc63590fa2df44605e543a9fa7bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d9d3844860efc63590fa2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 19:43:05 2006 +0100 mshtml: Better QueryInterface implementation. --- dlls/mshtml/htmlbody.c | 14 +++++------- dlls/mshtml/htmlelem.c | 50 ++++++++++++++++++++++++------------------ dlls/mshtml/htmlinput.c | 14 +++++------- dlls/mshtml/htmlnode.c | 47 ++++++++++++++++++++++++--------------- dlls/mshtml/htmlselect.c | 14 +++++------- dlls/mshtml/htmltextarea.c | 14 +++++------- dlls/mshtml/mshtml_private.h | 3 +++ 7 files changed, 83 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3d9d3844860efc63590…

1 0

Alexander N. Sørnes : wordpad: Fix typo in Norwegian resource.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: ad05be739591604b87727dfbbe86534c60572285 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad05be739591604b87727df… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Sun Mar 19 19:57:18 2006 +0100 wordpad: Fix typo in Norwegian resource. --- programs/wordpad/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 4753a3d..614e42e 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -30,7 +30,7 @@ BEGIN END POPUP "R&ediger" BEGIN - MENUITEM "&Angreo\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Angre\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Gjenta\tCtrl+Y", ID_EDIT_REDO MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR

1 0