January 2011 - Wine-Commits

Marcus Meissner : user32: Get MDI icon as close the "small icon" as possible.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 6e077e0bc0454ba6d024353e33f569f06be796e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e077e0bc0454ba6d024353e3… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jan 27 16:38:03 2011 +0100 user32: Get MDI icon as close the "small icon" as possible. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index bcaef76..6385476 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -866,7 +866,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) if (!hIcon) hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) - hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC;

1 0

Alexander Law : programs/notepad: Correct sharing mode for opening file in notepad.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: a8308dd017541e9dd2ceca3d07a9ba8a566d8b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8308dd017541e9dd2ceca3d0… Author: Alexander Law <exclusion(a)gmail.com> Date: Fri Jan 28 08:34:23 2011 +0300 programs/notepad: Correct sharing mode for opening file in notepad. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e9a650d..4a99ec2 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -356,7 +356,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) if (!DoCloseFile()) return; - hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) {

1 0

Alexandre Julliard : dbghelp: Use wine64 as loader name on 64-bit.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 16a2ea5c8f008c583fe6309fe330e24469e6b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a2ea5c8f008c583fe6309fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 11:54:56 2011 +0100 dbghelp: Use wine64 as loader name on 64-bit. --- dlls/dbghelp/module.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 50cf114..ce5e63e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -108,23 +108,39 @@ void module_set_module(struct module* module, const WCHAR* name) const WCHAR *get_wine_loader_name(void) { + static const int is_win64 = sizeof(void *) > sizeof(int); /* FIXME: should depend on target process */ static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; static const WCHAR *loader; - const char *ptr; if (!loader) { + WCHAR *p, *buffer; + const char *ptr; + /* All binaries are loaded with WINELOADER (if run from tree) or by the * main executable */ if ((ptr = getenv("WINELOADER"))) { - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); - loader = buffer; } - else loader = wineW; + else + { + buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + p = buffer + strlenW( buffer ) - strlenW( suffixW ); + if (p > buffer && !strcmpW( p, suffixW )) + { + if (!is_win64) *p = 0; + } + else if (is_win64) strcatW( buffer, suffixW ); + + TRACE( "returning %s\n", debugstr_w(buffer) ); + loader = buffer; } return loader; }

1 0

Henri Verbeet : wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 1b726498ed97c2b424916200ae0c64c65e3b7cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b726498ed97c2b424916200a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:10 2011 +0100 wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92bc151..676eafc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2218,6 +2218,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + TRACE("Releasing the render target at %p\n", This->render_targets[0]); IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]);

1 0

Vincent Povirk : mscoree: Implement GetFileVersion.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 8a8808984e3ef5de3da2c6dd10fe5111d9ef3882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8808984e3ef5de3da2c6dd1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 27 16:05:34 2011 -0600 mscoree: Implement GetFileVersion. --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ dlls/mscoree/mscoree_private.h | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 889e1fb..2cafcb8 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -963,7 +963,7 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, return CLR_E_SHIM_RUNTIME; } -static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, +HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { ASSEMBLY *assembly; diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 1d4d7f7..8cf548d 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -43,7 +43,7 @@ @ stdcall GetCORSystemDirectory(ptr long ptr) @ stdcall GetCORVersion(ptr long ptr) @ stub GetCompileInfo -@ stub GetFileVersion +@ stdcall GetFileVersion(wstr ptr long ptr) @ stub GetHashFromAssemblyFile @ stub GetHashFromAssemblyFileW @ stub GetHashFromBlob diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1f2cfb0..a3e1cec 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -250,6 +250,17 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST return ret; } +HRESULT WINAPI GetFileVersion(LPCWSTR szFilename, LPWSTR szBuffer, DWORD cchBuffer, DWORD *dwLength) +{ + TRACE("(%s, %p, %d, %p)\n", debugstr_w(szFilename), szBuffer, cchBuffer, dwLength); + + if (!szFilename || !dwLength) + return E_POINTER; + + *dwLength = cchBuffer; + return CLRMetaHost_GetVersionFromFile(0, szFilename, szBuffer, dwLength); +} + HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll) { HRESULT ret=S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9ece9cc..222b3ca 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -28,6 +28,9 @@ extern char *WtoA(LPCWSTR wstr); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); +extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, + LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer); + typedef struct tagASSEMBLY ASSEMBLY; HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file);

1 0

Henri Verbeet : widl: Support forward type declarations.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 7421bb0b61b708108a6005be541e1b1b293ca2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7421bb0b61b708108a6005be5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:13 2011 +0100 widl: Support forward type declarations. --- tools/widl/parser.y | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 30ae5f4..3850e65 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -384,8 +384,11 @@ statement: typedecl: enumdef + | tENUM aIDENTIFIER { $$ = type_new_enum($2, FALSE, NULL); } | structdef + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } | uniondef + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); }

1 0

Henri Verbeet : ddraw: Link directly to wined3d.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 8872239088c5e1b096cfc9203e008add68336ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8872239088c5e1b096cfc9203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:12 2011 +0100 ddraw: Link directly to wined3d. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw.c | 14 +------------- dlls/ddraw/ddraw_private.h | 4 ---- dlls/ddraw/main.c | 28 ---------------------------- 5 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 8ef4542..1d49e79 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -1,6 +1,6 @@ MODULE = ddraw.dll IMPORTLIB = ddraw -IMPORTS = dxguid uuid ole32 user32 gdi32 advapi32 +IMPORTS = dxguid uuid wined3d user32 gdi32 advapi32 C_SRCS = \ clipper.c \ diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index b4c493c..905f006 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -307,7 +307,7 @@ HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) { clipper->lpVtbl = &ddraw_clipper_vtbl; clipper->ref = 1; - clipper->wineD3DClipper = pWineDirect3DCreateClipper(); + clipper->wineD3DClipper = WineDirect3DCreateClipper(); if (!clipper->wineD3DClipper) { WARN("Failed to create wined3d clipper.\n"); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6aa3af6..f148e29 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3964,12 +3964,6 @@ DirectDrawCreateClipper(DWORD Flags, return CLASS_E_NOAGGREGATION; } - if (!LoadWineD3D()) - { - LeaveCriticalSection(&ddraw_cs); - return DDERR_NODIRECTDRAWSUPPORT; - } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawClipperImpl)); if (object == NULL) @@ -6016,13 +6010,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - if (!LoadWineD3D()) - { - ERR("Failed to load wined3d - broken OpenGL setup?\n"); - return DDERR_NODIRECTDRAWSUPPORT; - } - - ddraw->wineD3D = pWineDirect3DCreate(7, &ddraw->IDirectDraw7_iface); + ddraw->wineD3D = WineDirect3DCreate(7, &ddraw->IDirectDraw7_iface); if (!ddraw->wineD3D) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 56df02d..1fea09f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -187,10 +187,6 @@ IWineD3DVertexDeclaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DEC /* The default surface type */ extern WINED3DSURFTYPE DefaultSurfaceType DECLSPEC_HIDDEN; -extern typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN; -extern typeof(WineDirect3DCreate) *pWineDirect3DCreate DECLSPEC_HIDDEN; - - /***************************************************************************** * IDirectDrawSurface implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 89a8680..757d9c4 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -39,9 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; -typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN; -typeof(WineDirect3DCreate) *pWineDirect3DCreate DECLSPEC_HIDDEN; - /* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); @@ -170,31 +167,6 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha return entry->object; } -/* - * Helper Function for DDRAW_Create and DirectDrawCreateClipper for - * lazy loading of the Wine D3D driver. - * - * Returns - * TRUE on success - * FALSE on failure. - */ - -BOOL LoadWineD3D(void) -{ - static HMODULE hWineD3D = (HMODULE) -1; - if (hWineD3D == (HMODULE) -1) - { - hWineD3D = LoadLibraryA("wined3d"); - if (hWineD3D) - { - pWineDirect3DCreate = (typeof(WineDirect3DCreate) *)GetProcAddress(hWineD3D, "WineDirect3DCreate"); - pWineDirect3DCreateClipper = (typeof(WineDirect3DCreateClipper) *) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper"); - return TRUE; - } - } - return hWineD3D != NULL; -} - /*********************************************************************** * * Helper function for DirectDrawCreate and friends

1 0

Michael Stefaniuc : d3d8: Use impl_from_IDirect3DDevice8() instead of the iface to object cast.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: dec337acac63dffc4b401d1c4eb2425bba8e21f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec337acac63dffc4b401d1c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 28 01:16:06 2011 +0100 d3d8: Use impl_from_IDirect3DDevice8() instead of the iface to object cast. --- dlls/d3d8/device.c | 489 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 309 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dec337acac63dffc4b401…

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IWineD3DDeviceParent_iface.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 7f184144ff747da3375eedf582f7a5e037b6046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f184144ff747da3375eedf58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 28 01:19:57 2011 +0100 d3d8: COM cleanup for the IWineD3DDeviceParent_iface. --- dlls/d3d8/d3d8_private.h | 10 +++++----- dlls/d3d8/device.c | 34 ++++++++++++++++------------------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3bfceb2..372d51c 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -178,18 +178,18 @@ struct IDirect3DDevice8Impl { /* IUnknown fields */ IDirect3DDevice8 IDirect3DDevice8_iface; - const IWineD3DDeviceParentVtbl *device_parent_vtbl; - LONG ref; + IWineD3DDeviceParent IWineD3DDeviceParent_iface; + LONG ref; /* But what about baseVertexIndex in state blocks? hmm... it may be a better idea to pass this to wined3d */ - IWineD3DDevice *WineD3DDevice; - struct d3d8_handle_table handle_table; + IWineD3DDevice *WineD3DDevice; + struct d3d8_handle_table handle_table; /* FVF management */ struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; /* Avoids recursion with nested ReleaseRef to 0 */ - BOOL inDestruction; + BOOL inDestruction; }; HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5582b33..73d2228 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -286,8 +286,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(IDirect3DDevice8 *ifac if (IsEqualGUID(riid, &IID_IWineD3DDeviceParent)) { - IUnknown_AddRef((IUnknown *)&This->device_parent_vtbl); - *ppobj = &This->device_parent_vtbl; + IWineD3DDeviceParent_AddRef(&This->IWineD3DDeviceParent_iface); + *ppobj = &This->IWineD3DDeviceParent_iface; return S_OK; } @@ -2713,29 +2713,27 @@ static const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = IDirect3DDevice8Impl_DeletePatch }; -/* IWineD3DDeviceParent IUnknown methods */ - -static inline struct IDirect3DDevice8Impl *device_from_device_parent(IWineD3DDeviceParent *iface) +static inline IDirect3DDevice8Impl *impl_from_IWineD3DDeviceParent(IWineD3DDeviceParent *iface) { - return (struct IDirect3DDevice8Impl *)((char*)iface - - FIELD_OFFSET(struct IDirect3DDevice8Impl, device_parent_vtbl)); + return CONTAINING_RECORD(iface, IDirect3DDevice8Impl, IWineD3DDeviceParent_iface); } -static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, + REFIID riid, void **object) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_QueryInterface(&This->IDirect3DDevice8_iface, riid, object); } static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_AddRef(&This->IDirect3DDevice8_iface); } static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_Release(&This->IDirect3DDevice8_iface); } @@ -2750,7 +2748,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; BOOL lockable = TRUE; HRESULT hr; @@ -2789,7 +2787,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; @@ -2819,7 +2817,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; @@ -2849,7 +2847,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent IUnknown *superior, UINT width, UINT height, UINT depth, enum wined3d_format_id format, WINED3DPOOL pool, DWORD usage, IWineD3DVolume **volume) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DVolume8Impl *object; HRESULT hr; @@ -2888,7 +2886,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDeviceParent *iface, WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSwapChain8Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; HRESULT hr; @@ -2975,7 +2973,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte HRESULT hr; device->IDirect3DDevice8_iface.lpVtbl = &Direct3DDevice8_Vtbl; - device->device_parent_vtbl = &d3d8_wined3d_device_parent_vtbl; + device->IWineD3DDeviceParent_iface.lpVtbl = &d3d8_wined3d_device_parent_vtbl; device->ref = 1; device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)); @@ -2990,7 +2988,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, - (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); + &device->IWineD3DDeviceParent_iface, &device->WineD3DDevice); if (FAILED(hr)) { WARN("Failed to create wined3d device, hr %#x.\n", hr);

1 0

Nikolay Sivov : msvcrt: Forward _realloc_crt to realloc.
by Alexandre Julliard Jan. 28, 2011

Jan. 28, 2011

Module: wine Branch: master Commit: 81c4f2a25f5532c60fddc1422fb93846464e8ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c4f2a25f5532c60fddc1422… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 03:21:06 2011 +0300 msvcrt: Forward _realloc_crt to realloc. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d079728..703a78d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1042,7 +1042,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3ece44c..c622b0e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -890,7 +890,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 38cf0fb..52f49c5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -876,7 +876,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index eeb8842..d4a7262 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -75,6 +75,9 @@ static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); +static void* (__cdecl *p_realloc_crt)(void*, size_t); +static void* (__cdecl *p_malloc)(size_t); +static void (__cdecl *p_free)(void*); static void* (WINAPI *pEncodePointer)(void *); @@ -753,6 +756,36 @@ static void test__wsopen_s(void) ok(fd == -1, "got %d\n", fd); } +static void test__realloc_crt(void) +{ + void *mem; + + if(!p_realloc_crt) + { + win_skip("_realloc_crt not found\n"); + return; + } + +if (0) +{ + /* crashes on some systems starting Vista */ + mem = p_realloc_crt(NULL, 10); +} + + mem = p_malloc(10); + ok(mem != NULL, "memory not allocated\n"); + + mem = p_realloc_crt(mem, 20); + ok(mem != NULL, "memory not reallocated\n"); + + mem = p_realloc_crt(mem, 0); + ok(mem == NULL, "memory not freed\n"); + + mem = p_realloc_crt(NULL, 0); + ok(mem != NULL, "memory not (re)allocated for size 0\n"); + p_free(mem); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -788,6 +821,9 @@ START_TEST(msvcr90) p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); p_sopen_s = (void*) GetProcAddress(hcrt, "_sopen_s"); p_wsopen_s = (void*) GetProcAddress(hcrt, "_wsopen_s"); + p_realloc_crt = (void*) GetProcAddress(hcrt, "_realloc_crt"); + p_malloc = (void*) GetProcAddress(hcrt, "malloc"); + p_free = (void*)GetProcAddress(hcrt, "free"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -804,4 +840,5 @@ START_TEST(msvcr90) test__set_abort_behavior(); test__sopen_s(); test__wsopen_s(); + test__realloc_crt(); }

1 0