March 2006 - wine-commits

Dmitry Timoshkov : gdi: Add a simple test for bitmap bits/metrics
by Alexandre Julliard 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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.=?UTF-8?Q?=20S=C3=B8rnes=20?=: wordpad: Fix typo in Norwegian resource.
by Alexandre Julliard 20 Mar '06

20 Mar '06

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

Vitaly Lipatov : regedit: Fix Russian translation.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 0bb76d231cb46f0555ac3a8d46a8fce1ca808035 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bb76d231cb46f0555ac3a8… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 19 21:38:50 2006 +0300 regedit: Fix Russian translation. --- programs/regedit/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 18065b4..01cc028 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -28,7 +28,7 @@ IDC_REGEDIT MENU DISCARDABLE BEGIN POPUP "&��" BEGIN - MENUITEM "�&��", ID_REGISTRY_EXIT + MENUITEM "�&��", ID_REGISTRY_EXIT END POPUP "&��" BEGIN @@ -46,9 +46,9 @@ BEGIN MENUITEM "&�� ...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED MENUITEM "&�� ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "&��\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "�&��", ID_REGISTRY_EXIT + MENUITEM "�&��", ID_REGISTRY_EXIT END POPUP "&��" BEGIN @@ -153,9 +153,9 @@ BEGIN "�� " ID_REGISTRY_DISCONNECTNETWORKREGISTRY "�� " - ID_REGISTRY_PRINT "�� " + ID_REGISTRY_PRINT "�� " /* ID_HELP_HELPTOPICS "Opens registry editor help" */ - ID_HELP_ABOUT "�� , �� " + ID_HELP_ABOUT "�� , �� " END STRINGTABLE DISCARDABLE

1 0

Vitaly Lipatov : control: Fix datetime name.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: d4c42c0fef0f0fa5531fb3289a3abc9cff79791a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c42c0fef0f0fa5531fb32… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 19 19:48:05 2006 +0300 control: Fix datetime name. --- programs/control/params.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/control/params.h b/programs/control/params.h index dcdb49f..644b597 100644 --- a/programs/control/params.h +++ b/programs/control/params.h @@ -35,7 +35,7 @@ #define szEXEC_ARGS "Shell32.dll,Control_RunDLL " #define szC_COLOR "desk.cpl,,2" -#define szC_DATETIME "datetime.cpl" +#define szC_DATETIME "timedate.cpl" #define szC_DESKTOP "desk.cpl" #define szC_FONTS "main.cpl @3" #define szC_INTERNATIONAL "intl.cpl"

1 0

Milko Krachounov : winecfg: Update Bulgarian translation.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 5d138be46d654a57eb51dec00e204fd82c9ab6cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d138be46d654a57eb51dec… Author: Milko Krachounov <milko(a)3mhz.net> Date: Sun Mar 19 03:39:07 2006 +0200 winecfg: Update Bulgarian translation. --- programs/winecfg/Bg.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 7c57470..b4f1d54 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -179,7 +179,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " �� ",IDC_STATIC,8,4,244,106 LTEXT "��:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "�� ...",IDC_THEME_INSTALL,152,38,93,14 @@ -187,12 +187,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 - EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + CONTROL "�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,55,13 + EDITTEXT IDC_EDIT_SFPATH,70,195,140,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -206,16 +206,16 @@ BEGIN IDS_SHOW_ADVANCED "�� " IDS_NOTHEME "(�� )" IDS_TAB_GRAPHICS "��" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "��" IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "��" - IDS_WINECFG_TITLE "�� Wine" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE "�� Wine" + IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " IDS_AUDIO_MISSING "�� .\n\n�� .\n�� .\n\n�� , �� ." - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "��" + IDS_LINKS_TO "�� " END STRINGTABLE DISCARDABLE

1 0

Mike McCormack : include: LVSETINFOTIPA does not exist.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 03283bfbc17d8a6dee5e6976ea888bab0d6d2876 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03283bfbc17d8a6dee5e697… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 19 12:06:54 2006 +0900 include: LVSETINFOTIPA does not exist. --- include/commctrl.h | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 3b3501a..305531d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3243,26 +3243,14 @@ typedef struct tagLVITEMW #define LV_ITEMA LVITEMA #define LV_ITEMW LVITEMW -typedef struct LVSETINFOTIPA -{ - UINT cbSize; - DWORD dwFlags; - LPSTR pszText; - int iItem; - int iSubItem; -} LVSETINFOTIPA, *PLVSETINFOTIPA; - -typedef struct LVSETINFOTIPW +typedef struct LVSETINFOTIP { UINT cbSize; DWORD dwFlags; LPWSTR pszText; int iItem; int iSubItem; -} LVSETINFOTIPW, *PLVSETINFOTIPW; - -#define LVSETINFOTIP WINELIB_NAME_AW(LVSETINFOTIP) -#define PLVSETINFOTIP WINELIB_NAME_AW(PLVSETINFOTIP) +} LVSETINFOTIP, *PLVSETINFOTIP; /* ListView background image structs and constants For _WIN32_IE version 0x400 and later. */

1 0

Jeff Latimer : winedbg: Copy floating point status to the dbgcontext.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 18f5d0abdc64c49ed72d8562e29da72cb09ecb56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18f5d0abdc64c49ed72d856… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Mar 19 12:53:01 2006 +1100 winedbg: Copy floating point status to the dbgcontext. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a76f193..7c83d85 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -100,7 +100,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL static unsigned dbg_fetch_context(void) { dbg_context.ContextFlags = CONTEXT_CONTROL - | CONTEXT_INTEGER + | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT #ifdef CONTEXT_SEGMENTS | CONTEXT_SEGMENTS #endif

1 0

Vitaliy Margolen : gdi: Handle NT style \\.\DISPLAY1 name that we return.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 9bf0080136425ca60d63cf06c518a13ece5ab89b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bf0080136425ca60d63cf0… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Mar 18 11:20:03 2006 -0700 gdi: Handle NT style \\.\DISPLAY1 name that we return. --- dlls/gdi/driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index c9ac552..9f40a8d 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -365,11 +365,13 @@ BOOL DRIVER_GetDriverName( LPCWSTR devic { static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR empty_strW[] = { 0 }; WCHAR *p; /* display is a special case */ - if (!strcmpiW( device, displayW )) + if (!strcmpiW( device, displayW ) || + !strcmpiW( device, display1W )) { lstrcpynW( driver, displayW, size ); return TRUE;

1 0

Robert Shearman : msi: Optimise WHERE operations.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 9f487ba1dee3426b1acd03e3d02e00b79e71aec0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f487ba1dee3426b1acd03e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:12:15 2006 +0000 msi: Optimise WHERE operations. Optimise WHERE operations on matching against strings by adding a new function find_matching_rows to the views, which eliminates the need to examine every record when executing a query. Implement this function in the table using a hash table on the ID stored in the data. --- dlls/msi/delete.c | 11 +++++ dlls/msi/distinct.c | 24 +++++++++++ dlls/msi/insert.c | 11 +++++ dlls/msi/msipriv.h | 16 +++++++ dlls/msi/order.c | 21 +++++++++- dlls/msi/select.c | 21 +++++++++- dlls/msi/table.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/update.c | 10 ++++- dlls/msi/where.c | 63 +++++++++++++++++++++++++++++ 9 files changed, 276 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9f487ba1dee3426b1ac…

1 0

Robert Shearman : msi: Add a test for MsiFormatRecord with integer fields.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: d62aa01ec0a005dc9f8be481a6aef0cedb1191fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d62aa01ec0a005dc9f8be48… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:14:09 2006 +0000 msi: Add a test for MsiFormatRecord with integer fields. --- dlls/msi/tests/format.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 59c6f11..50f0e3c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -618,6 +618,18 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); ok( sz == 11, "size wrong\n"); ok( 0 == strcmp(buffer,"boo [~] hoo"), "wrong output (%s)\n",buffer); + + r = MsiRecordSetString(hrec, 0, "[1]"); + r = MsiRecordSetInteger(hrec, 1, 123456); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + todo_wine{ + ok( sz == 6, "size wrong\n"); + ok( 0 == strcmp(buffer,"123456"), "wrong output (%s)\n",buffer); + } + MsiCloseHandle(hrec); }

1 0

Robert Shearman : wininet: Copy from the start of the cookie name, not the cookie data.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 15a7d3b2b4f486db1705e34bbb778d9723afc0d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15a7d3b2b4f486db1705e34… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:11:35 2006 +0000 wininet: Copy from the start of the cookie name, not the cookie data. Copy from the start of the cookie name, not the cookie data when parsing cookies with a NULL cookie name. --- dlls/wininet/cookie.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 231faca..15c257a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -426,7 +426,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR l ourCookieData += 1; ourCookieName = HeapAlloc(GetProcessHeap(), 0, (ourCookieNameSize + 1)*sizeof(WCHAR)); - memcpy(ourCookieName, ourCookieData, ourCookieNameSize * sizeof(WCHAR)); + memcpy(ourCookieName, lpCookieData, ourCookieNameSize * sizeof(WCHAR)); ourCookieName[ourCookieNameSize] = '\0'; TRACE("setting (hacked) cookie of %s, %s\n", debugstr_w(ourCookieName), debugstr_w(ourCookieData));

1 0

Robert Shearman : include: Add some more defines to wininet.h.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 3efe42537aeaefc81f427f2e7f84553e6fe93819 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3efe42537aeaefc81f427f2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:10:52 2006 +0000 include: Add some more defines to wininet.h. --- include/wininet.h | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index f0a93e4..d9b34db 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1220,6 +1220,17 @@ BOOLAPI InternetEnumPerSiteCookieDecisio BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,unsigned long *,unsigned long *,unsigned long); #define InternetEnumPerSiteCookieDecision WINELIB_NAME_AW(InternetEnumPerSiteCookieDecision) +#define INTERNET_COOKIE_IS_SECURE 0x00000001 +#define INTERNET_COOKIE_IS_SESSION 0x00000002 +#define INTERNET_COOKIE_THIRD_PARTY 0x00000010 +#define INTERNET_COOKIE_PROMPT_REQUIRED 0x00000020 +#define INTERNET_COOKIE_EVALUATE_P3P 0x00000040 +#define INTERNET_COOKIE_APPLY_P3P 0x00000080 +#define INTERNET_COOKIE_P3P_ENABLED 0x00000100 +#define INTERNET_COOKIE_IS_RESTRICTED 0x00000200 +#define INTERNET_COOKIE_IE6 0x00000400 +#define INTERNET_COOKIE_IS_LEGACY 0x00000800 + BOOLAPI InternetGetCookieExA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); BOOLAPI InternetGetCookieExW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); #define InternetGetCookieEx WINELIB_NAME_AW(InternetGetCookieEx) @@ -1369,11 +1380,12 @@ INTERNETAPI DWORD WINAPI InternetConfirm #define NORMAL_CACHE_ENTRY 0x00000001 +#define STICKY_CACHE_ENTRY 0x00000004 +#define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 -#define STICKY_CACHE_ENTRY 0x00000004 #define SPARSE_CACHE_ENTRY 0x00010000 #define URLCACHE_FIND_DEFAULT_FILTER NORMAL_CACHE_ENTRY \

1 0

Robert Shearman : wcmd: Use PACKAGE_VERSION as the wcmd version.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 6291ad6ca1883aaa328a0ad14365d7553180c3c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6291ad6ca1883aaa328a0ad… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:10:36 2006 +0000 wcmd: Use PACKAGE_VERSION as the wcmd version. --- programs/wcmd/wcmdmain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 644ebc1..6bc9272 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -24,6 +24,7 @@ * - Lots of functionality missing from builtins */ +#include "config.h" #include "wcmd.h" const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY", @@ -38,7 +39,7 @@ DWORD errorlevel; int echo_mode = 1, verify_mode = 0; const char nyi[] = "Not Yet Implemented\n\n"; const char newline[] = "\n"; -const char version_string[] = "WCMD Version 0.17\n\n"; +const char version_string[] = "WCMD Version " PACKAGE_VERSION "\n\n"; const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL;

1 0

Robert Shearman : ole: Use the thread pool for executing RPC calls for better performance
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 650ac14219ea9ee286e9d537e75b0deb77f1b434 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=650ac14219ea9ee286e9d53… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:09:53 2006 +0000 ole: Use the thread pool for executing RPC calls for better performance (after the thread pool has been improved). --- dlls/ole32/rpc.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 3c5f3ea..6715f72 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -220,12 +220,14 @@ static HRESULT WINAPI ServerRpcChannelBu static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) { struct dispatch_params *data = (struct dispatch_params *) param; - + /* FIXME: trap and rethrow RPC exceptions in app thread */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); TRACE("completed with status 0x%lx\n", data->status); - + + SetEvent(data->handle); + return 0; } @@ -249,7 +251,6 @@ static HRESULT WINAPI ClientRpcChannelBu RPC_STATUS status; DWORD index; struct dispatch_params *params; - DWORD tid; APARTMENT *apt = NULL; IPID ipid; @@ -279,10 +280,9 @@ static HRESULT WINAPI ClientRpcChannelBu RpcBindingInqObject(msg->Handle, &ipid); hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); if ((hr == S_OK) && !apt->multi_threaded) { - params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); - TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) @@ -309,10 +309,9 @@ static HRESULT WINAPI ClientRpcChannelBu * and re-enter this STA from an incoming server thread will * deadlock. InstallShield is an example of that. */ - params->handle = CreateThread(NULL, 0, rpc_sendreceive_thread, params, 0, &tid); - if (!params->handle) + if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT)) { - ERR("Could not create RpcSendReceive thread, error %lx\n", GetLastError()); + ERR("QueueUserWorkItem failed with error %lx\n", GetLastError()); hr = E_UNEXPECTED; } else

1 0

appdb/include version.php
by WineHQ 19 Mar '06

19 Mar '06

ChangeSet ID: 23642 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/19 12:06:18 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Print application names correctly when versions are deleted. $this->appId should have been $this->iAppId. Patch: http://cvs.winehq.org/patch.py?id=23642 Old revision New revision Changes Path 1.49 1.50 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.49 appdb/include/version.php:1.50 --- appdb/include/version.php:1.49 19 Mar 2006 18: 6:18 -0000 +++ appdb/include/version.php 19 Mar 2006 18: 6:18 -0000 @@ -416,7 +416,7 @@ class Version { { if($this->iSubmitterId) { - $oApp = new Application($this->appId); + $oApp = new Application($this->iAppId); $oSubmitter = new User($this->iSubmitterId); switch($sAction) {

1 0

Alexandre Julliard : wineprefixcreate: Autodetect the running from build tree case.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c33fbc0df8228b062c60294e5de645a9184f87a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c33fbc0df8228b062c60294… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 12:34:50 2006 +0100 wineprefixcreate: Autodetect the running from build tree case. --- tools/wineprefixcreate.in | 66 +++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 3effdb5..8a7e6d8 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -29,7 +29,6 @@ usage() echo " -h, --help Display this message" echo " --prefix <dir> Directory to create (default: \$WINEPREFIX or ~/.wine)" echo " -q, --quiet Don't print status messages" - echo " --use-wine-tree <dir> Run from the Wine build tree <dir>" echo " -w, --wait Wait for the wineserver to exit before returning" echo "" } @@ -65,6 +64,38 @@ datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0 +if [ ! -f "$dlldir/ntdll.dll.so" -a \ + -x "$bindir/../server/wineserver" -a \ + -f "$bindir/../dlls/ntdll/ntdll.dll.so" ] +then + # running from the wine source tree + topdir=`cd "$bindir/.." && pwd` + WINELOADER="$topdir/wine" + WINESERVER="$topdir/server/wineserver" + if [ -n "$LD_LIBRARY_PATH" ] + then + LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + else + LD_LIBRARY_PATH="$topdir/libs" + fi + export LD_LIBRARY_PATH + + # find the source directory + link=`readlink "$WINELOADER"` + if [ -z "$link" ] + then + topsrcdir="$topdir" + else + link=`dirname "$link"` + case "$link" in + /*) topsrcdir=`cd "$link/.." && pwd` ;; + *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;; + esac + fi + dlldir="$topdir/programs" + datadir="$topsrcdir/tools" +fi + while [ $# -gt 0 ] do case "$1" in @@ -85,38 +116,7 @@ do shift ;; --use-wine-tree) - topdir=`cd "$2" && pwd` - if [ -x "$topdir/server/wineserver" ] - then - WINELOADER="$topdir/wine" - WINESERVER="$topdir/server/wineserver" - if [ -n "$LD_LIBRARY_PATH" ] - then - LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" - else - LD_LIBRARY_PATH="$topdir/libs" - fi - export LD_LIBRARY_PATH - - # find the source directory - link=`readlink "$WINELOADER"` - if [ -z "$link" ] - then - topsrcdir="$topdir" - else - link=`dirname "$link"` - case "$link" in - /*) topsrcdir=`cd "$link/.." && pwd` ;; - *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;; - esac - fi - - dlldir="$topdir/programs" - datadir="$topsrcdir/tools" - else - echo "$2 is not a valid Wine build tree" - exit 1 - fi + # ignored, autodetected now shift 2 ;; *)

1 0

Alexandre Julliard : setupapi: Added support for calling executables in a RegisterDlls section.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c67728f7c67f5b847d4d145aeaf62ba84a0258f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c67728f7c67f5b847d4d145… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 23:08:27 2006 +0100 setupapi: Added support for calling executables in a RegisterDlls section. --- dlls/setupapi/install.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 4cdfdcf..43544da 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -444,6 +444,7 @@ static BOOL do_register_dll( const struc HMODULE module; HRESULT res; SP_REGISTER_CONTROL_STATUSW status; + IMAGE_NT_HEADERS *nt; status.cbSize = sizeof(status); status.FileName = path; @@ -473,6 +474,45 @@ static BOOL do_register_dll( const struc goto done; } + if ((nt = RtlImageNtHeader( module )) && !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) + { + /* file is an executable, not a dll */ + STARTUPINFOW startup; + PROCESS_INFORMATION info; + WCHAR *cmd_line; + BOOL res; + static const WCHAR format[] = {'"','%','s','"',' ','%','s',0}; + static const WCHAR default_args[] = {'/','R','e','g','S','e','r','v','e','r',0}; + + FreeLibrary( module ); + module = NULL; + if (!args) args = default_args; + cmd_line = HeapAlloc( GetProcessHeap(), 0, (strlenW(path) + strlenW(args) + 4) * sizeof(WCHAR) ); + sprintfW( cmd_line, format, path, args ); + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + TRACE( "executing %s\n", debugstr_w(cmd_line) ); + res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + HeapFree( GetProcessHeap(), 0, cmd_line ); + if (!res) + { + status.FailureCode = SPREG_LOADLIBRARY; + status.Win32Error = GetLastError(); + goto done; + } + CloseHandle( info.hThread ); + + if (WaitForSingleObject( info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) + { + /* timed out, kill the process */ + TerminateProcess( info.hProcess, 1 ); + status.FailureCode = SPREG_TIMEOUT; + status.Win32Error = ERROR_TIMEOUT; + } + CloseHandle( info.hProcess ); + goto done; + } + if (flags & FLG_REGSVR_DLLREGISTER) { const char *entry_point = info->unregister ? "DllUnregisterServer" : "DllRegisterServer";

1 0

Alexandre Julliard : ntdll: In MODULE_FlushModrefs, also free dlls that haven't been initialized yet.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: ac6025131263c9317f775513ab9b5ebcd250e7e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac6025131263c9317f77551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 18 18:41:21 2006 +0100 ntdll: In MODULE_FlushModrefs, also free dlls that haven't been initialized yet. --- dlls/ntdll/loader.c | 71 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cdd860c..efc2bed 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1877,6 +1877,39 @@ void WINAPI LdrShutdownThread(void) RtlLeaveCriticalSection( &loader_section ); } + +/*********************************************************************** + * free_modref + * + */ +static void free_modref( WINE_MODREF *wm ) +{ + RemoveEntryList(&wm->ldr.InLoadOrderModuleList); + RemoveEntryList(&wm->ldr.InMemoryOrderModuleList); + if (wm->ldr.InInitializationOrderModuleList.Flink) + RemoveEntryList(&wm->ldr.InInitializationOrderModuleList); + + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); + if (!TRACE_ON(module)) + TRACE_(loaddll)("Unloaded module %s : %s\n", + debugstr_w(wm->ldr.FullDllName.Buffer), + (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); + + SERVER_START_REQ( unload_dll ) + { + req->base = wm->ldr.BaseAddress; + wine_server_call( req ); + } + SERVER_END_REQ; + + NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + if (cached_modref == wm) cached_modref = NULL; + RtlFreeUnicodeString( &wm->ldr.FullDllName ); + RtlFreeHeap( GetProcessHeap(), 0, wm->deps ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); +} + /*********************************************************************** * MODULE_FlushModrefs * @@ -1894,36 +1927,20 @@ static void MODULE_FlushModrefs(void) mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Blink; entry != mark; entry = prev) { - mod = CONTAINING_RECORD(entry, LDR_MODULE, - InInitializationOrderModuleList); + mod = CONTAINING_RECORD(entry, LDR_MODULE, InInitializationOrderModuleList); wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); - prev = entry->Blink; - if (mod->LoadCount) continue; - - RemoveEntryList(&mod->InLoadOrderModuleList); - RemoveEntryList(&mod->InMemoryOrderModuleList); - RemoveEntryList(&mod->InInitializationOrderModuleList); - - TRACE(" unloading %s\n", debugstr_w(mod->FullDllName.Buffer)); - if (!TRACE_ON(module)) - TRACE_(loaddll)("Unloaded module %s : %s\n", - debugstr_w(mod->FullDllName.Buffer), - (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); - - SERVER_START_REQ( unload_dll ) - { - req->base = mod->BaseAddress; - wine_server_call( req ); - } - SERVER_END_REQ; + if (!mod->LoadCount) free_modref( wm ); + } - NtUnmapViewOfSection( NtCurrentProcess(), mod->BaseAddress ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); - if (cached_modref == wm) cached_modref = NULL; - RtlFreeUnicodeString( &mod->FullDllName ); - RtlFreeHeap( GetProcessHeap(), 0, wm->deps ); - RtlFreeHeap( GetProcessHeap(), 0, wm ); + /* check load order list too for modules that haven't been initialized yet */ + mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; + for (entry = mark->Blink; entry != mark; entry = prev) + { + mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); + wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); + prev = entry->Blink; + if (!mod->LoadCount) free_modref( wm ); } }

1 0

Mike McCormack : Prevent the use of windowsx.h with Wine source.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 9d9bb6a81054322acdd11ea2f10e983500a70803 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d9bb6a81054322acdd11ea… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 10:18:04 2006 +0900 Prevent the use of windowsx.h with Wine source. --- include/windowsx.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 6bd3a2a..57074e5 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -22,6 +22,11 @@ extern "C" { #endif +#ifdef __WINESRC__ +/* This file contains macros that cause warnings on gcc 4.1, so avoid it. */ +#error Please avoid use of windowsx.h in Wine source code. +#endif + #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage

1 0

Mike McCormack : winefile: Eliminate use of windowsx.h.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 3b397e507955b01d8d324800e4e7aafada02443b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b397e507955b01d8d32480… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 00:57:16 2006 +0900 winefile: Eliminate use of windowsx.h. --- programs/winefile/winefile.c | 157 ++++++++++++++++++++++-------------------- programs/winefile/winefile.h | 3 - 2 files changed, 85 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3b397e507955b01d8d3…

1 0

Eric Pouech : dbghelp: MSC fixes.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 12eb665402a13e91e2a91b431ca287311743d724 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12eb665402a13e91e2a91b4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:20 2006 +0100 dbghelp: MSC fixes. - wrong cut & paste across versions of a given record type - wrong definition for register_v2 --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/mscvpdb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 734cb5f..4862e24 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -629,7 +629,7 @@ static int codeview_add_type_struct_fiel leaf_len = numeric_leaf(&value, &type->member_v3.offset); c_name = (const char*)&type->member_v3.offset + leaf_len; - codeview_add_udt_element(ctp, symt, c_name, value, type->member_v2.type); + codeview_add_udt_element(ctp, symt, c_name, value, type->member_v3.type); ptr += 2 + 2 + 4 + leaf_len + (strlen(c_name) + 1); break; diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index 01796dd..a63918a 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -1000,7 +1000,7 @@ union codeview_symbol short int len; /* Total length of this entry */ short int id; /* Always S_REGISTER_V2 */ unsigned int type; /* check whether type & reg are correct */ - unsigned int reg; + unsigned short reg; struct p_string p_name; /* don't handle register tracking */ } register_v2;

1 0

Eric Pouech : dbghelp: Support for LF_VTSHAPE in MSC.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 7eefc9eb0d853ad8d513ae5d66bff9afd83f515e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7eefc9eb0d853ad8d513ae5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:16 2006 +0100 dbghelp: Support for LF_VTSHAPE in MSC. - added preliminary support for VT (virtual table) shape type record - as we don't do C++, it's just a hack to get rid of some errors --- dlls/dbghelp/msc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b181af2..734cb5f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1009,6 +1009,15 @@ static struct symt* codeview_parse_one_t type->mfunction_v2.call); break; + case LF_VTSHAPE_V1: + /* this is an ugly hack... FIXME when we have C++ support */ + if (!(symt = existing)) + { + char buf[128]; + snprintf(buf, sizeof(buf), "__internal_vt_shape_%x\n", curr_type); + symt = &symt_new_udt(ctp->module, buf, 0, UdtStruct)->symt; + } + break; default: FIXME("Unsupported type-id leaf %x\n", type->generic.id); dump(type, 2 + type->generic.len);

1 0

Eric Pouech : dbghelp: MSC forward declaration.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: e737dbec7f324ca6a50de40d8ff8dd05a17a9f4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e737dbec7f324ca6a50de40… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:11 2006 +0100 dbghelp: MSC forward declaration. - create an infrastructure for handling forward usage of type records - used it in some cases (pointer to yet not defined udt, function signature, modifiers) --- dlls/dbghelp/msc.c | 333 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 226 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e737dbec7f324ca6a50…

1 0

Eric Pouech : dbghelp: Type parsing refactoring.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 79b47204f057b648437b9594104e27f47b38b316 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79b47204f057b648437b959… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:06 2006 +0100 dbghelp: Type parsing refactoring. - seperate types' table handling from a single type handling by adding codeview_parse_one_type function - factored all calls for caching symt - make type parsing helpers return the symt instead of a simple error status --- dlls/dbghelp/msc.c | 404 ++++++++++++++++++++++++++-------------------------- 1 files changed, 205 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=79b47204f057b648437…

1 0

Eric Pouech : dbghelp: Fixes for NB11 types.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: dadd1080ee29cf35b1d5016b3b4c09046ed392d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dadd1080ee29cf35b1d5016… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:03 2006 +0100 dbghelp: Fixes for NB11 types. - when checking debug info in NB09 or NB11 format (CodeView), try to load the global types section --- dlls/dbghelp/msc.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c8db442..5542846 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2100,12 +2100,36 @@ static BOOL codeview_process_info(const unsigned int i; codeview_init_basic_types(msc_dbg->module); + + for (i = 0; i < hdr->cDir; i++) + { + ent = (const CV_DIRECTORY_ENTRY*)((const BYTE*)hdr + hdr->cbDirHeader + i * hdr->cbDirEntry); + if (ent->subsection == sstGlobalTypes) + { + const CV_ENTRY_GLOBAL_TYPES* types; + struct codeview_type_parse ctp; + + types = (const CV_ENTRY_GLOBAL_TYPES*)(msc_dbg->root + ent->lfo); + ctp.module = msc_dbg->module; + ctp.offset = (const DWORD*)(types + 1); + ctp.num = types->cTypes; + ctp.table = (const BYTE*)(ctp.offset + types->cTypes); + + cv_current_module = &cv_zmodules[0]; + if (cv_current_module->allowed) FIXME("Already allowed ??\n"); + cv_current_module->allowed = TRUE; + + codeview_parse_type_table(&ctp); + break; + } + } + ent = (const CV_DIRECTORY_ENTRY*)((const BYTE*)hdr + hdr->cbDirHeader); for (i = 0; i < hdr->cDir; i++, ent = next) { - next = (i == hdr->cDir-1)? NULL : + next = (i == hdr->cDir-1) ? NULL : (const CV_DIRECTORY_ENTRY*)((const BYTE*)ent + hdr->cbDirEntry); - prev = (i == 0)? NULL : + prev = (i == 0) ? NULL : (const CV_DIRECTORY_ENTRY*)((const BYTE*)ent - hdr->cbDirEntry); if (ent->subsection == sstAlignSym) @@ -2137,6 +2161,7 @@ static BOOL codeview_process_info(const } msc_dbg->module->module.SymType = SymCv; + codeview_clear_type_table(); ret = TRUE; break; }

1 0

Eric Pouech : dbghelp: MSC handling of function signature's parameters.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 9e6573315d1211a5f1910be43c7937b4db34dc51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e6573315d1211a5f1910be… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:00 2006 +0100 dbghelp: MSC handling of function signature's parameters. - now correctly parsing parameters types for a function signature and storing them in dbghelp internal structures --- dlls/dbghelp/msc.c | 53 +++++++++++++++++++++++++++++++++++++----------- dlls/dbghelp/mscvpdb.h | 16 ++++++++++++++ 2 files changed, 57 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index aa1122a..c8db442 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -684,14 +684,39 @@ static int codeview_add_type_struct(stru return codeview_add_type(typeno, &symt->symt); } -static int codeview_new_func_signature(struct module* module, unsigned typeno, - unsigned ret_type, enum CV_call_e call_conv) -{ - struct symt* symt; - symt = &symt_new_function_signature(module, - codeview_get_type(ret_type, FALSE), - call_conv)->symt; - return codeview_add_type(typeno, symt); +static int codeview_new_func_signature(struct codeview_type_parse* ctp, + unsigned typeno, unsigned ret_type, + unsigned args_list, enum CV_call_e call_conv) +{ + struct symt_function_signature* sym; + const union codeview_reftype* reftype; + + sym = symt_new_function_signature(ctp->module, codeview_get_type(ret_type, FALSE), + call_conv); + reftype = codeview_jump_to_type(ctp, args_list); + if (reftype) + { + int i; + switch (reftype->generic.id) + { + case LF_ARGLIST_V1: + for (i = 0; i < reftype->arglist_v1.num; i++) + symt_add_function_signature_parameter(ctp->module, sym, + codeview_get_type(reftype->arglist_v1.args[i], + FALSE)); + break; + case LF_ARGLIST_V2: + for (i = 0; i < reftype->arglist_v2.num; i++) + symt_add_function_signature_parameter(ctp->module, sym, + codeview_get_type(reftype->arglist_v2.args[i], + FALSE)); + break; + default: + FIXME("Unexpected leaf %x for signature's pmt\n", reftype->generic.id); + } + } + + return codeview_add_type(typeno, &sym->symt); } static int codeview_parse_type_table(struct codeview_type_parse* ctp) @@ -854,29 +879,33 @@ static int codeview_parse_type_table(str break; case LF_PROCEDURE_V1: - retv = codeview_new_func_signature(ctp->module, curr_type, + retv = codeview_new_func_signature(ctp, curr_type, type->procedure_v1.rvtype, + type->procedure_v1.arglist, type->procedure_v1.call); break; case LF_PROCEDURE_V2: - retv = codeview_new_func_signature(ctp->module, curr_type, + retv = codeview_new_func_signature(ctp, curr_type, type->procedure_v2.rvtype, + type->procedure_v2.arglist, type->procedure_v2.call); break; case LF_MFUNCTION_V1: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - retv = codeview_new_func_signature(ctp->module, curr_type, + retv = codeview_new_func_signature(ctp, curr_type, type->mfunction_v1.rvtype, + type->mfunction_v1.arglist, type->mfunction_v1.call); break; case LF_MFUNCTION_V2: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - retv = codeview_new_func_signature(ctp->module, curr_type, + retv = codeview_new_func_signature(ctp, curr_type, type->mfunction_v2.rvtype, + type->mfunction_v2.arglist, type->mfunction_v2.call); break; diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index f106ba7..01796dd 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -387,6 +387,22 @@ union codeview_reftype unsigned char bitoff; } bitfield_v2; + struct + { + unsigned short int len; + short int id; + unsigned short num; + unsigned short args[1]; + } arglist_v1; + + struct + { + unsigned short int len; + short int id; + unsigned num; + unsigned args[1]; + } arglist_v2; + }; union codeview_fieldtype

1 0

Eric Pouech : dbghelp: Cleanup MSC bitfield handling.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 209e175d83674c162a58b05941b5fdaa7694c632 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=209e175d83674c162a58b05… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:56 2006 +0100 dbghelp: Cleanup MSC bitfield handling. - no longer caching bitfield information but accessing it directly when needed - removed all kludges for bitfield handling - reused BOOL parameter to codeview_get_type for monitoring traces (will be used in later patches) --- dlls/dbghelp/msc.c | 186 +++++++++++++++--------------------------------- dlls/dbghelp/mscvpdb.h | 36 +++++---- 2 files changed, 76 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=209e175d83674c162a5…

1 0

Eric Pouech : dbghelp: Fieldlist.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 4c2cec55533abcb53a47a26b3cf244fadffcbfe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c2cec55533abcb53a47a26… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:50 2006 +0100 dbghelp: Fieldlist. - now that we have offset tables to type, we can cleanly parse the field-lists and remove the associated kludges - also adding internal structure for easing parameter sharing across functions (codeview_type_parse) - in mscvpdb.h, also reparated the type records that are referenced from other type records (union codeview_type_ref) from type records referenced by symbols (union codeview_type) --- dlls/dbghelp/msc.c | 210 +++++++++++++++++++++++------------------------- dlls/dbghelp/mscvpdb.h | 30 +++++-- 2 files changed, 121 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4c2cec55533abcb53a4…

1 0

Eric Pouech : dbghelp: MSC types.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 633ab584c1e5e3e3e2c077f9d2cdb2bc612055ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=633ab584c1e5e3e3e2c077f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:44 2006 +0100 dbghelp: MSC types. - enforce the type records that can be accessed by symbols (these are anyway the high level ones) --- dlls/dbghelp/msc.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 559d325..8e269c7 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -752,6 +752,23 @@ static int codeview_parse_type_table(str retv = TRUE; type = (const union codeview_type*)(table + offset[curr_type - 0x1000]); + /* type records we're interested in are the ones referenced by symbols + * The known ranges are (X mark the ones we want): + * X 0000-0016 for V1 types + * 0200-020c for V1 types referenced by other types + * 0400-040f for V1 types (complex lists & sets) + * X 1000-100f for V2 types + * 1200-120c for V2 types referenced by other types + * 1400-140f for V1 types (complex lists & sets) + * X 1500-150d for V3 types + * 8000-8010 for numeric leafes + */ + if ((type->generic.id & 0x8600) && + type->generic.id != LF_BITFIELD_V1 && /* still some cases to fix */ + type->generic.id != LF_BITFIELD_V2 && + type->generic.id != LF_FIELDLIST_V1 && + type->generic.id != LF_FIELDLIST_V2) + continue; switch (type->generic.id) { case LF_MODIFIER_V1: @@ -943,15 +960,6 @@ static int codeview_parse_type_table(str type->mfunction_v2.call); break; - case LF_ARGLIST_V1: - case LF_ARGLIST_V2: - { - static int once; - if (!once++) - FIXME("Not adding parameters' types to function signature\n"); - } - break; - default: FIXME("Unsupported type-id leaf %x\n", type->generic.id); dump(type, 2 + type->generic.len);

1 0

Eric Pouech : dbghelp: Types parsing.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 68a0ca741828d0aa4080b5b5e374a2aca8f6d71a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68a0ca741828d0aa4080b5b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:41 2006 +0100 dbghelp: Types parsing. - our engine for parsing types section now requires in entry an offsets table for getting directly to each type in the section - (re)construct this table for PDB types --- dlls/dbghelp/msc.c | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d956540..559d325 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -738,20 +738,19 @@ static int codeview_new_func_signature(s } static int codeview_parse_type_table(struct module* module, const BYTE* table, - int len) + const DWORD* offset, DWORD num) { unsigned int curr_type = 0x1000; - const BYTE* ptr = table; - int retv; + int retv = TRUE; const union codeview_type* type; int value, leaf_len; const struct p_string* p_name; const char* c_name; - while (ptr - table < len) + for (curr_type = 0x1000; retv && curr_type < 0x1000 + num; curr_type++) { retv = TRUE; - type = (const union codeview_type*)ptr; + type = (const union codeview_type*)(table + offset[curr_type - 0x1000]); switch (type->generic.id) { @@ -843,7 +842,7 @@ static int codeview_parse_type_table(str * the 'real' type will copy the member / enumeration data. */ const unsigned char* list = type->fieldlist.list; - int len = (ptr + type->generic.len + 2) - list; + int len = ((const BYTE*)type + type->generic.len + 2) - list; if (((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V1 || ((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V3) @@ -943,6 +942,7 @@ static int codeview_parse_type_table(str type->mfunction_v2.rvtype, type->mfunction_v2.call); break; + case LF_ARGLIST_V1: case LF_ARGLIST_V2: { @@ -957,12 +957,9 @@ static int codeview_parse_type_table(str dump(type, 2 + type->generic.len); break; } - if (!retv) return FALSE; - curr_type++; - ptr += type->generic.len + 2; } - return TRUE; + return retv; } /*======================================================================== @@ -1789,7 +1786,12 @@ static void pdb_process_types(const stru types_image = pdb_read_file(image, pdb_lookup, 2); if (types_image) { - PDB_TYPES types; + PDB_TYPES types; + DWORD* offset; + DWORD num, total; + const BYTE* table; + const BYTE* ptr; + pdb_convert_types_header(&types, types_image); /* Check for unknown versions */ @@ -1804,9 +1806,22 @@ static void pdb_process_types(const stru ERR("-Unknown type info version %ld\n", types.version); } + /* reconstruct the types offset... + * FIXME: maybe it's present in the newest PDB_TYPES structures + */ + total = types.last_index - types.first_index + 1; + offset = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * total); + table = ptr = types_image + types.type_offset; + num = 0; + while (ptr < table + types.type_size && num < total) + { + offset[num++] = ptr - table; + ptr += ((const union codeview_type*)ptr)->generic.len + 2; + } + /* Read type table */ - codeview_parse_type_table(msc_dbg->module, types_image + types.type_offset, - types.type_size); + codeview_parse_type_table(msc_dbg->module, table, offset, num); + HeapFree(GetProcessHeap(), 0, offset); pdb_free(types_image); } }

1 0

Eric Pouech : dbghelp: CV's ssearch.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: bbf0251c78350ec49c5fcb7f669f9395c57b44ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbf0251c78350ec49c5fcb7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:38 2006 +0100 dbghelp: CV's ssearch. - added definitions for start_search symbol info - silenced warnings from this symbol --- dlls/dbghelp/msc.c | 5 +++++ dlls/dbghelp/mscvpdb.h | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 3b8949e..d956540 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1520,6 +1520,11 @@ static int codeview_snarf(const struct m case S_MSTOOL_V3: /* just to silence a few warnings */ break; + case S_SSEARCH_V1: + TRACE("Start search: seg=0x%x at offset 0x%08x\n", + sym->ssearch_v1.segment, sym->ssearch_v1.offset); + break; + default: FIXME("Unsupported symbol id %x\n", sym->generic.id); dump(sym, 2 + sym->generic.len); diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index 023ce17..fa875f5 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -1112,9 +1112,17 @@ union codeview_symbol unsigned int unknown; char name[1]; } compile_v3; + + struct + { + short int len; + short int id; + unsigned int offset; + unsigned short segment; + } ssearch_v1; }; -#define S_COMPILE_V1 0x0001 +#define S_COMPILE_V1 0x0001 #define S_REGISTER_V1 0x0002 #define S_CONSTANT_V1 0x0003 #define S_UDT_V1 0x0004

1 0

Eric Pouech : dbghelp: Moved codeview structures and definitions from msc. c to mscvpdb.h.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 4143ce5e0b0e347042658c84ac24ff2c5307dbce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4143ce5e0b0e347042658c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:35 2006 +0100 dbghelp: Moved codeview structures and definitions from msc.c to mscvpdb.h. --- dlls/dbghelp/msc.c | 41 --------------------- dlls/dbghelp/mscvpdb.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index bcf9a9b..3b8949e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2100,47 +2100,6 @@ static BOOL pdb_process_file(const struc #define CODEVIEW_NB11_SIG MAKESIG('N','B','1','1') #define CODEVIEW_RSDS_SIG MAKESIG('R','S','D','S') -typedef struct _CODEVIEW_HEADER_NBxx -{ - DWORD dwSignature; - DWORD lfoDirectory; -} CODEVIEW_HEADER_NBxx,* PCODEVIEW_HEADER_NBxx; - -typedef struct _CODEVIEW_HEADER_RSDS -{ - DWORD dwSignature; - GUID guid; - DWORD unknown; - CHAR name[1]; -} CODEVIEW_HEADER_RSDS,* PCODEVIEW_HEADER_RSDS; - -typedef struct _CODEVIEW_PDB_DATA -{ - DWORD timestamp; - DWORD unknown; - CHAR name[1]; -} CODEVIEW_PDB_DATA, *PCODEVIEW_PDB_DATA; - -typedef struct _CV_DIRECTORY_HEADER -{ - WORD cbDirHeader; - WORD cbDirEntry; - DWORD cDir; - DWORD lfoNextDir; - DWORD flags; -} CV_DIRECTORY_HEADER, *PCV_DIRECTORY_HEADER; - -typedef struct _CV_DIRECTORY_ENTRY -{ - WORD subsection; - WORD iMod; - DWORD lfo; - DWORD cb; -} CV_DIRECTORY_ENTRY, *PCV_DIRECTORY_ENTRY; - -#define sstAlignSym 0x125 -#define sstSrcModule 0x127 - static BOOL codeview_process_info(const struct process* pcs, const struct msc_debug_info* msc_dbg) { diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index 31d1c05..023ce17 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -1431,3 +1431,96 @@ struct msc_debug_info /* coff.c */ extern BOOL coff_process_info(const struct msc_debug_info* msc_dbg); + +/* =================================================== + * The old CodeView stuff (for NB09 and NB11) + * =================================================== */ + +#define sstModule 0x120 +#define sstTypes 0x121 +#define sstPublic 0x122 +#define sstPublicSym 0x123 +#define sstSymbols 0x124 +#define sstAlignSym 0x125 +#define sstSrcLnSeg 0x126 +#define sstSrcModule 0x127 +#define sstLibraries 0x128 +#define sstGlobalSym 0x129 +#define sstGlobalPub 0x12a +#define sstGlobalTypes 0x12b +#define sstMPC 0x12c +#define sstSegMap 0x12d +#define sstSegName 0x12e +#define sstPreComp 0x12f +#define sstFileIndex 0x133 +#define sstStaticSym 0x134 + +typedef struct _CODEVIEW_HEADER_NBxx +{ + DWORD dwSignature; + DWORD lfoDirectory; +} CODEVIEW_HEADER_NBxx,* PCODEVIEW_HEADER_NBxx; + +typedef struct _CODEVIEW_HEADER_RSDS +{ + DWORD dwSignature; + GUID guid; + DWORD unknown; + CHAR name[1]; +} CODEVIEW_HEADER_RSDS,* PCODEVIEW_HEADER_RSDS; + +typedef struct _CODEVIEW_PDB_DATA +{ + DWORD timestamp; + DWORD unknown; + CHAR name[1]; +} CODEVIEW_PDB_DATA, *PCODEVIEW_PDB_DATA; + +typedef struct _CV_DIRECTORY_HEADER +{ + WORD cbDirHeader; + WORD cbDirEntry; + DWORD cDir; + DWORD lfoNextDir; + DWORD flags; +} CV_DIRECTORY_HEADER, *PCV_DIRECTORY_HEADER; + +typedef struct _CV_DIRECTORY_ENTRY +{ + WORD subsection; + WORD iMod; + DWORD lfo; + DWORD cb; +} CV_DIRECTORY_ENTRY, *PCV_DIRECTORY_ENTRY; + +typedef struct _CV_ENTRY_MODULE_SEGINFO +{ + WORD seg; + WORD pad; + DWORD offset; + DWORD cbSeg; +} CV_ENTRY_MODULE_SEGINFO; + +typedef struct _CV_ENTRY_MODULE +{ + WORD ovlNumber; + WORD iLib; + WORD cSeg; + WORD Style; +/* + CV_ENTRY_MODULE_SEGINFO SegInfo[cSeg]; + p_string Name; +*/ +} CV_ENTRY_MODULE; + +typedef struct _CV_ENTRY_GLOBAL_TYPES +{ + DWORD flags; + DWORD cTypes; +/* + DWORD offset[cTypes]; + types_record[]; +*/ +} CV_ENTRY_GLOBAL_TYPES; + +

1 0

Eric Pouech : dbghelp: Compiland and source files are not the same thing.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c0e0de6c4e7aea28bf3d707f50f6ca5b47a38b84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0e0de6c4e7aea28bf3d707… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:31 2006 +0100 dbghelp: Compiland and source files are not the same thing. - in MSC debug info parsing, clearly separate a source file information from a compiland (including in linetab structure) - in ELF debug info parsing, now storing compiland directly in symtab_elt while browsing the symtab section (we still create twice the compilands, once in stabs/dwarf parsing, a second time in symtab parsing) --- dlls/dbghelp/elf_module.c | 58 +++++++++++------------------------ dlls/dbghelp/msc.c | 74 ++++++++++++++++++--------------------------- dlls/dbghelp/mscvpdb.h | 22 +++++++++---- 3 files changed, 62 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c0e0de6c4e7aea28bf3…

1 0

Vitaly Lipatov : gdi32: Look for ttf fonts in the Wine font dir.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: a1a54e7bf737e5275ac5ba63bafc51272f12f368 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1a54e7bf737e5275ac5ba6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Mar 17 18:36:11 2006 +0300 gdi32: Look for ttf fonts in the Wine font dir. --- dlls/gdi/freetype.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index f38ef1b..1914f1f 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1499,6 +1499,7 @@ BOOL WineEngInit(void) WCHAR windowsdir[MAX_PATH]; char *unixname; HANDLE font_mutex; + const char *data_dir; TRACE("\n"); @@ -1578,7 +1579,7 @@ BOOL WineEngInit(void) } WaitForSingleObject(font_mutex, INFINITE); - /* load the system fonts */ + /* load the system bitmap fonts */ load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ @@ -1590,6 +1591,15 @@ BOOL WineEngInit(void) HeapFree(GetProcessHeap(), 0, unixname); } + /* load the system truetype fonts */ + data_dir = wine_get_data_dir(); + if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { + strcpy(unixname, data_dir); + strcat(unixname, "/fonts/"); + ReadFontDir(unixname, FALSE); + HeapFree(GetProcessHeap(), 0, unixname); + } + /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their full path as the entry. Also look for any .fon fonts, since ReadFontDir

1 0

Dmitry Timoshkov : gdi: Add a test for bitmap font metrics to ensure that they match the Windows ones .
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 89edaa7bbe42079e7775e7dbada4414393be3fab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89edaa7bbe42079e7775e7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 17 14:01:41 2006 +0800 gdi: Add a test for bitmap font metrics to ensure that they match the Windows ones. --- dlls/gdi/tests/gdiobj.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 463bbf4..2dee9ab 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -198,6 +198,95 @@ todo_wine ReleaseDC(0, hdc); } +static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + LOGFONT *lf = (LOGFONT *)lParam; + + trace("found font %s, height %ld\n", elf->lfFaceName, elf->lfHeight); + + if (elf->lfHeight == lf->lfHeight && !strcmp(elf->lfFaceName, lf->lfFaceName)) + { + *lf = *elf; + return 0; /* stop enumeration */ + } + return 1; /* continue enumeration */ +} + +static void test_bitmap_font_metrics(void) +{ + static const struct font_data + { + const char face_name[LF_FACESIZE]; + int weight, height, ascent, descent, int_leading, ext_leading; + int ave_char_width, max_char_width; + } fd[] = + { + { "MS Sans Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 11 }, + { "MS Sans Serif", FW_NORMAL, 16, 13, 3, 3, 0, 7, 14 }, + { "MS Sans Serif", FW_NORMAL, 20, 16, 4, 4, 0, 8, 16 }, + { "MS Sans Serif", FW_NORMAL, 24, 19, 5, 6, 0, 9, 20 }, + { "MS Sans Serif", FW_NORMAL, 29, 23, 6, 5, 0, 12, 25 }, + { "MS Sans Serif", FW_NORMAL, 37, 29, 8, 5, 0, 16, 32 }, + { "MS Serif", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8 }, + { "MS Serif", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9 }, + { "MS Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 12 }, + { "MS Serif", FW_NORMAL, 16, 13, 3, 3, 0, 6, 16 }, + { "MS Serif", FW_NORMAL, 19, 15, 4, 3, 0, 8, 19 }, + { "MS Serif", FW_NORMAL, 21, 16, 5, 3, 0, 9, 23 }, + { "MS Serif", FW_NORMAL, 27, 21, 6, 3, 0, 12, 27 }, + { "MS Serif", FW_NORMAL, 35, 27, 8, 3, 0, 16, 34 }, +#if 0 /* FIXME: enable once the bug in sfnt2fnt is fixed */ + { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8 }, +#endif + { "Courier", FW_NORMAL, 16, 13, 3, 0, 0, 9, 9 }, + { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12 }, + { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 } + /* FIXME: add "Fixedsys", "Terminal", "Small Fonts" */ + }; + HDC hdc; + LOGFONT lf; + HFONT hfont, old_hfont; + TEXTMETRIC tm; + INT ret, i; + + hdc = CreateCompatibleDC(0); + assert(hdc); + + for (i = 0; i < sizeof(fd)/sizeof(fd[0]); i++) + { + memset(&lf, 0, sizeof(lf)); + + lf.lfHeight = fd[i].height; + strcpy(lf.lfFaceName, fd[i].face_name); + ret = EnumFontFamilies(hdc, fd[i].face_name, find_font_proc, (LPARAM)&lf); + if (ret) + { + trace("font %s height %d not found\n", fd[i].face_name, fd[i].height); + continue; + } + + trace("found font %s, height %ld\n", lf.lfFaceName, lf.lfHeight); + + hfont = create_font(lf.lfFaceName, &lf); + old_hfont = SelectObject(hdc, hfont); + ok(GetTextMetrics(hdc, &tm), "GetTextMetrics error %ld\n", GetLastError()); + + ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); + ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); + ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); + ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); + ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); + ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); + ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); + ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + + SelectObject(hdc, old_hfont); + DeleteObject(hfont); + } + + DeleteDC(hdc); +} + static void test_gdi_objects(void) { BYTE buff[256]; @@ -898,6 +987,7 @@ START_TEST(gdiobj) test_logfont(); test_logpen(); test_bitmap_font(); + test_bitmap_font_metrics(); test_gdi_objects(); test_GdiGetCharDimensions(); test_text_extents();

1 0

Eric Kohl : widl: Do not generate code that initializes a binding handle.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 623f14294534f4cfe3ab3655db3bd27bf2c69497 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=623f14294534f4cfe3ab365… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:48 2006 +0100 widl: Do not generate code that initializes a binding handle. --- tools/widl/server.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 8cc33da..3f7b976 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -79,7 +79,8 @@ static void write_parameters_init(const while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - print_server("%s = 0;\n", var->name); + if (var->type->type != RPC_FC_BIND_PRIMITIVE) + print_server("%s = 0;\n", var->name); var = PREV_LINK(var); }

1 0

Eric Kohl : widl: Fix proc offset calculation.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c7174f9fff45837f21b75c2b5d05d38f398a8e25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7174f9fff45837f21b75c2… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:39 2006 +0100 widl: Fix proc offset calculation. A void return type is represented by a FC_END/FC_PAD sequence in the proc format string. Increment the proc offset by two when a function returns void. --- tools/widl/client.c | 2 ++ tools/widl/server.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 1dbbbc6..3197b73 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -252,6 +252,8 @@ static void write_function_stubs(type_t } if (!is_void(def->type, NULL)) proc_offset += get_size_procformatstring_var(def); + else + proc_offset += 2; /* FC_END and FC_PAD */ indent--; print_client("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index d1ea5f0..8cc33da 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -343,6 +343,8 @@ static void write_function_stubs(type_t } if (!is_void(def->type, NULL)) proc_offset += get_size_procformatstring_var(def); + else + proc_offset += 2; /* FC_END and FC_PAD */ func = PREV_LINK(func); }

1 0

Eric Kohl : widl: 'unsigned char' and 'byte' are must be distinct types.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 919d14c577bfb9262b6bd9f74e64fa60f0cc85c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=919d14c577bfb9262b6bd9f… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:08 2006 +0100 widl: 'unsigned char' and 'byte' are must be distinct types. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 77219d8..eb00304 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -576,7 +576,7 @@ base_type: tBYTE { $$ = make_type(RPC | tSIGNED int_std { $$ = $2; $$->sign = 1; } | tUNSIGNED int_std { $$ = $2; $$->sign = -1; switch ($$->type) { - case RPC_FC_CHAR: $$->type = RPC_FC_BYTE; $$->sign = 0; break; + case RPC_FC_CHAR: break; case RPC_FC_SMALL: $$->type = RPC_FC_USMALL; break; case RPC_FC_SHORT: $$->type = RPC_FC_USHORT; break; case RPC_FC_LONG: $$->type = RPC_FC_ULONG; break;

1 0

Jacek Caban : mshtml.idl: Added more interfaces.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 144bb464c3089456fc19a1580dfa1898ccafb20c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=144bb464c3089456fc19a15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 14:34:46 2006 +0100 mshtml.idl: Added more interfaces. --- include/mshtmdid.h | 179 ++++++++++++++ include/mshtml.idl | 688 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 867 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=144bb464c3089456fc1…

1 0

Jacek Caban : mshtml/tests: Code cleanup.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: cb92214210446ac640fea150284365460844ffc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb92214210446ac640fea15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 12:01:33 2006 +0100 mshtml/tests: Code cleanup. --- dlls/mshtml/tests/protocol.c | 92 ++++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9624b37..309c860 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -28,13 +28,38 @@ #include "initguid.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -static BOOL expect_GetBindInfo = FALSE, called_GetBindInfo = FALSE; -static BOOL expect_ReportProgress = FALSE, called_ReportProgress = FALSE; -static BOOL expect_ReportData = FALSE, called_ReportData = FALSE; -static BOOL expect_ReportResult = FALSE, called_ReportResult = FALSE; +DEFINE_EXPECT(GetBindInfo); +DEFINE_EXPECT(ReportProgress); +DEFINE_EXPECT(ReportData); +DEFINE_EXPECT(ReportResult); static HRESULT expect_hrResult; static BOOL expect_hr_win32err = FALSE; @@ -69,31 +94,33 @@ static HRESULT WINAPI ProtocolSink_Repor { static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - ok(expect_ReportProgress, "unexpected call\n"); + CHECK_EXPECT(ReportProgress); + ok(ulStatusCode == BINDSTATUS_MIMETYPEAVAILABLE - || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); + || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, + "ulStatusCode=%ld\n", ulStatusCode); ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); - expect_ReportProgress = FALSE; - called_ReportProgress = TRUE; + return S_OK; } static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { - ok(expect_ReportData, "unexpected call\n"); + CHECK_EXPECT(ReportData); + ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), "grcf = %08lx\n", grfBSCF); - expect_ReportData = FALSE; - called_ReportData = TRUE; + return S_OK; } static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { - ok(expect_ReportResult, "unexpected call\n"); + CHECK_EXPECT(ReportResult); + if(expect_hr_win32err) ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, "expected win32 err or %08lx got: %08lx\n", expect_hrResult, hrResult); @@ -101,8 +128,7 @@ static HRESULT WINAPI ProtocolSink_Repor ok(hrResult == expect_hrResult, "expected: %08lx got: %08lx\n", expect_hrResult, hrResult); ok(dwError == 0, "dwError = %ld\n", dwError); ok(!szResult, "szResult != NULL\n"); - called_ReportResult = TRUE; - expect_ReportResult = FALSE; + return S_OK; } @@ -141,14 +167,14 @@ static ULONG WINAPI BindInfo_Release(IIn static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ok(expect_GetBindInfo, "unexpected call\n"); + CHECK_EXPECT(GetBindInfo); + ok(grfBINDF != NULL, "grfBINDF == NULL\n"); if(grfBINDF) ok(!*grfBINDF, "*grfBINDF != 0\n"); ok(pbindinfo != NULL, "pbindinfo == NULL\n"); ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %ld\n", pbindinfo->cbSize); - called_GetBindInfo = TRUE; - expect_GetBindInfo = FALSE; + return S_OK; } @@ -176,8 +202,9 @@ static void test_protocol_fail(IInternet { HRESULT hres; - expect_ReportResult = TRUE; - expect_GetBindInfo = TRUE; + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + expect_hrResult = expected_hres; expect_hr_win32err = expect_win32err; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); @@ -186,34 +213,29 @@ static void test_protocol_fail(IInternet "expected win32 err or %08lx got: %08lx\n", expected_hres, hres); else ok(hres == expected_hres, "expected: %08lx got: %08lx\n", expected_hres, hres); - ok(called_ReportResult, "expected ReportResult\n"); - ok(called_GetBindInfo, "expected GetBindInfo\n"); - expect_ReportResult = called_ReportResult = FALSE; - expect_GetBindInfo = called_GetBindInfo = FALSE; + + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportResult); } static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) { HRESULT hres; - expect_GetBindInfo = TRUE; - expect_ReportResult = TRUE; - expect_ReportProgress = TRUE; - expect_ReportData = TRUE; + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + SET_EXPECT(ReportProgress); + SET_EXPECT(ReportData); expect_hrResult = S_OK; expect_hr_win32err = FALSE; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); ok(hres == S_OK, "Start failed: %08lx\n", hres); - ok(called_GetBindInfo, "expected GetBindInfo\n"); - ok(called_ReportProgress, "expected ReportProgress\n"); - ok(called_ReportData, "expected ReportData\n"); - ok(called_ReportResult, "expected ReportResult\n"); - called_GetBindInfo = expect_GetBindInfo = FALSE; - called_ReportProgress = expect_ReportProgress = FALSE; - called_ReportData = expect_ReportData = FALSE; - called_ReportResult = expect_ReportResult = FALSE; + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportProgress); + CHECK_CALLED(ReportData); + CHECK_CALLED(ReportResult); } static void test_res_protocol(void)

1 0

Eric Pouech : dbghelp: Live target detection.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: db90e17d923b809d07f71540ab715dcfb239df22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db90e17d923b809d07f7154… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 10:32:33 2006 +0100 dbghelp: Live target detection. - DBGHELP_NOLIVE env variable is tested earlier to avoid some strange effects in live target detection - in WineDbg, delete DBGHELP_NOLIVE before attaching to a process, because we know it must be a live target --- dlls/dbghelp/dbghelp.c | 4 ++-- programs/winedbg/tgt_active.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index f776190..bd75a60 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -170,8 +170,8 @@ static BOOL WINAPI process_invade_cb(cha static BOOL check_live_target(struct process* pcs) { if (!GetProcessId(pcs->handle)) return FALSE; - if (!elf_read_wine_loader_dbg_info(pcs)) return FALSE; - return getenv("DBGHELP_NOLIVE") == NULL; + if (GetEnvironmentVariableA("DBGHELP_NOLIVE", NULL, 0)) return FALSE; + return elf_read_wine_loader_dbg_info(pcs); } /****************************************************************** diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4eaade..a76f193 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -83,6 +83,8 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL } dbg_curr_process->continue_on_first_exception = cofe; + SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); + if (wfe) /* shall we proceed all debug events until we get an exception ? */ { dbg_interactiveP = FALSE;

1 0

Mike McCormack : Remove some unnecessary uses of windowsx.h
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: d5816d22020da65b07b0d768f84112d48eadc2c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5816d22020da65b07b0d76… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 23:26:20 2006 +0900 Remove some unnecessary uses of windowsx.h --- dlls/user/tests/edit.c | 5 +++-- programs/progman/group.c | 1 - programs/progman/main.c | 1 - programs/progman/program.c | 1 - programs/winecfg/audio.c | 9 ++++----- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index d92b244..1a830c2 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include <windowsx.h> #include <commctrl.h> #include "wine/test.h" @@ -278,7 +277,9 @@ static void ET2_OnCommand(HWND hwnd, int static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { switch (iMsg) { - HANDLE_MSG(hwnd, WM_COMMAND, ET2_OnCommand); + case WM_COMMAND: + ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); + break; } return DefWindowProc(hwnd, iMsg, wParam, lParam); } diff --git a/programs/progman/group.c b/programs/progman/group.c index 2f8c5fc..81d078f 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" /*********************************************************************** diff --git a/programs/progman/main.c b/programs/progman/main.c index d1e2a1e..fd79690 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" GLOBALS Globals; diff --git a/programs/progman/program.c b/programs/progman/program.c index 783d415..d646545 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -22,7 +22,6 @@ #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" /*********************************************************************** diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index b677c2a..ba82e54 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -38,7 +38,6 @@ #include <shlguid.h> #include <shlwapi.h> #include <shlobj.h> -#include <windowsx.h> #include <mmsystem.h> #include <mmreg.h> #include <mmddk.h> @@ -699,8 +698,8 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR DWORD dwPos = GetMessagePos(); HWND tree = ((LPNMHDR)lParam)->hwndFrom; ZeroMemory(&ht, sizeof(ht)); - ht.pt.x = GET_X_LPARAM(dwPos); - ht.pt.y = GET_Y_LPARAM(dwPos); + ht.pt.x = (short)LOWORD(dwPos); + ht.pt.y = (short)HIWORD(dwPos); MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMSTATEICON & ht.flags) @@ -735,8 +734,8 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR HWND tree = ((LPNMHDR)lParam)->hwndFrom; POINT pt; ZeroMemory(&ht, sizeof(ht)); - pt.x = GET_X_LPARAM(dwPos); - pt.y = GET_Y_LPARAM(dwPos); + pt.x = (short)LOWORD(dwPos); + pt.y = (short)HIWORD(dwPos); ht.pt = pt; MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht );

1 0

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 March 2006