October 2012 - Wine-Commits

Hans Leidekker : comctl32: Use the dialog template caption as default propsheet title.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 232a44edafd074c092628d65b513fa0674c2cd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232a44edafd074c092628d65b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:11:24 2012 +0100 comctl32: Use the dialog template caption as default propsheet title. --- dlls/comctl32/propsheet.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b2ceee8..b73c448 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -555,13 +555,12 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, if (IS_INTRESOURCE( lppsp->pszTitle )) { - if (!LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle,szTitle,sizeof(szTitle)/sizeof(szTitle[0]) )) - { - pTitle = pszNull; - FIXME("Could not load resource #%04x?\n",LOWORD(lppsp->pszTitle)); - } - else + if (LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle, szTitle, sizeof(szTitle)/sizeof(szTitle[0]) )) pTitle = szTitle; + else if (*p) + pTitle = p; + else + pTitle = pszNull; } else pTitle = lppsp->pszTitle;

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls when copying from a record to the string table .
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: a7ff2818feaa33c84c19105b8a0b01f9a66644a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ff2818feaa33c84c19105b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:14:44 2012 +0100 msi: Preserve strings with embedded nulls when copying from a record to the string table. --- dlls/msi/table.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 78c00b1..a7798e5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1273,10 +1273,11 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else if ( columninfo.type & MSITYPE_STRING ) { - LPCWSTR sval = MSI_RecordGetString( rec, iField ); + int len; + const WCHAR *sval = msi_record_get_string( rec, iField, &len ); if (sval) { - r = msi_string2id(tv->db->strings, sval, -1, pvalue); + r = msi_string2id( tv->db->strings, sval, len, pvalue ); if (r != ERROR_SUCCESS) return ERROR_NOT_FOUND; } @@ -1360,8 +1361,9 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { - LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, sval, -1, 1, + int len; + const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); + val = msi_addstringW( tv->db->strings, sval, len, 1, persistent ? StringPersistent : StringNonPersistent ); } else @@ -1530,10 +1532,10 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) TRACE("skipping binary column\n"); else if ( tv->columns[i].type & MSITYPE_STRING ) { - LPCWSTR str; + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); - str = MSI_RecordGetString( rec, i+1 ); - if (str == NULL || str[0] == 0) + if (!str || (!str[0] && !len)) { if (column) *column = i; return ERROR_INVALID_DATA; @@ -2383,12 +2385,13 @@ static void dump_record( MSIRECORD *rec ) n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { - LPCWSTR sval; + int len; + const WCHAR *sval; if( MSI_RecordIsNull( rec, i ) ) TRACE("row -> []\n"); - else if( (sval = MSI_RecordGetString( rec, i )) ) - TRACE("row -> [%s]\n", debugstr_w(sval)); + else if( (sval = msi_record_get_string( rec, i, &len )) ) + TRACE("row -> [%s]\n", debugstr_wn(sval, len)); else TRACE("row -> [0x%08x]\n", MSI_RecordGetInteger( rec, i ) ); } @@ -2407,7 +2410,6 @@ static void dump_table( const string_table *st, const USHORT *rawdata, UINT raws static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) { - LPCWSTR str; UINT i, r, *data; data = msi_alloc( tv->num_cols *sizeof (UINT) ); @@ -2422,10 +2424,11 @@ static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) if ( ( tv->columns[i].type & MSITYPE_STRING ) && ! MSITYPE_IS_BINARY(tv->columns[i].type) ) { - str = MSI_RecordGetString( rec, i+1 ); + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); if (str) { - r = msi_string2id( tv->db->strings, str, -1, &data[i] ); + r = msi_string2id( tv->db->strings, str, len, &data[i] ); /* if there's no matching string in the string table, these keys can't match any record, so fail now. */

1 0

Jacek Caban : urlmon.idl: Added ICodeInstall declaration.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: c24f074cd7fd17700309b5a136867d4ccfd5eef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24f074cd7fd17700309b5a13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 14:02:01 2012 +0100 urlmon.idl: Added ICodeInstall declaration. --- include/urlmon.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 140852a..85444f9 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -541,6 +541,39 @@ interface IWindowForBindingUI : IUnknown } /***************************************************************************** + * ICodeInstall interface + */ +[ + local, + object, + uuid(79eac9d1-baf9-11ce-8c82-00aa004ba90b), + pointer_default(unique) +] +interface ICodeInstall : IWindowForBindingUI +{ + typedef [unique] ICodeInstall *LPCODEINSTALL; + + typedef enum { + CIP_DISK_FULL, + CIP_ACCESS_DENIED, + CIP_NEWER_VERSION_EXISTS, + CIP_OLDER_VERSION_EXISTS, + CIP_NAME_CONFLICT, + CIP_TRUST_VERIFICATION_COMPONENT_MISSING, + CIP_EXE_SELF_REGISTERATION_TIMEOUT, + CIP_UNSAFE_TO_ABORT, + CIP_NEED_REBOOT, + CIP_NEED_REBOOT_UI_PERMISSION + } CIP_STATUS; + + HRESULT OnCodeInstallProblem( + [in] ULONG ulStatusCode, + [in, unique] LPCWSTR szDestination, + [in, unique] LPCWSTR szSource, + [in] DWORD dwReserved); +} + +/***************************************************************************** * IHttpSecurity interface */ [

1 0

Frédéric Delanoy : ws2_32/tests: Remove dead code (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 378e86fafaabda04af8e7506dff77b571bea0236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378e86fafaabda04af8e7506d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 27 19:23:12 2012 +0200 ws2_32/tests: Remove dead code (coverity). --- dlls/ws2_32/tests/sock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6fa4249..8860448 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5402,8 +5402,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); memset(&ov, 0, sizeof(ov));

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: f15e36183ec9527d51c64654919044ee17ca0d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15e36183ec9527d51c646549… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 29 11:24:59 2012 +0900 po: Update Korean translation. --- po/ko.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index e121a68..69e3147 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10042,8 +10042,7 @@ msgstr "(예|아니오|모두)" #: cmd.rc:356 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "" -"'%1'을 내부나 외부 명령어,나 배치 스크립트로 인식할 수 없습니다.\n" +msgstr "'%1'을 내부나 외부 명령어,나 배치 스크립트로 인식할 수 없습니다.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: b3d9f50e1d5f67b279cab7cfade14f90c19181bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d9f50e1d5f67b279cab7cfa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Oct 27 11:38:38 2012 +0300 po: Update Finnish translation. --- po/fi.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1e6f51e..1db3fb8 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10062,7 +10062,7 @@ msgstr " (Kyllä|Ei|kAikki)" #: cmd.rc:356 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "" +msgstr "'%1' ei ole sisäinen eikä ulkoinen komento eikä komentojono.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DSURFACE9.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 9ec7cdf12b07779d19d26097ba22bf276fda76ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec7cdf12b07779d19d26097b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:50 2012 +0100 d3dx9: Avoid LPDIRECT3DSURFACE9. --- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 108 +++++++++++++++------------------------------------ 2 files changed, 33 insertions(+), 77 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 909d81e..c5dffce 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown) STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) PURE; - STDMETHOD(BeginScene)(THIS_ LPDIRECT3DSURFACE9 surface, CONST D3DVIEWPORT9 *viewport) PURE; + STDMETHOD(BeginScene)(THIS_ struct IDirect3DSurface9 *surface, const D3DVIEWPORT9 *viewport) PURE; STDMETHOD(EndScene)(THIS_ DWORD mipfilter) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index c551e14..3c4d4c5 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -104,88 +104,44 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D /* Surface Loading/Saving */ -HRESULT WINAPI D3DXLoadSurfaceFromFileA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromFileW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCWSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) - -HRESULT WINAPI D3DXLoadSurfaceFromResourceA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromResourceW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCWSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) - -HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT*destrect, - LPCVOID srcdata, - UINT srcdatasize, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromSurface( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey); +HRESULT WINAPI D3DXLoadSurfaceFromFileA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const char *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromFileW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const WCHAR *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) + +HRESULT WINAPI D3DXLoadSurfaceFromResourceA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const char *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromResourceW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const WCHAR *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) + +HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const void *srcdata, UINT srcdatasize, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); + +HRESULT WINAPI D3DXLoadSurfaceFromSurface(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect, DWORD filter, D3DCOLOR colorkey); HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const void *src_memory, D3DFORMAT src_format, UINT src_pitch, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key); -HRESULT WINAPI D3DXSaveSurfaceToFileInMemory( LPD3DXBUFFER *destbuffer, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileA( LPCSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileW( LPCWSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); -#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) +HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(struct ID3DXBuffer **destbuffer, + D3DXIMAGE_FILEFORMAT destformat, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect); + +HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) /* Volume Loading/Saving */

1 0

Francois Gouget : services: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: cbeae4ca3d302b1ddad78712617b9b41b1885445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeae4ca3d302b1ddad787126… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 19:44:51 2012 +0100 services: Fix compilation on systems that don't support nameless unions. --- programs/services/rpc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9fe81d1..166e2b7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -118,11 +118,11 @@ static void run_after_timeout(void (*func)(struct service_entry*), struct servic elem->service_entry = service; GetSystemTimeAsFileTime(&elem->time); - time.LowPart = elem->time.dwLowDateTime; - time.HighPart = elem->time.dwHighDateTime; + time.u.LowPart = elem->time.dwLowDateTime; + time.u.HighPart = elem->time.dwHighDateTime; time.QuadPart += timeout*10000000; - elem->time.dwLowDateTime = time.LowPart; - elem->time.dwHighDateTime = time.HighPart; + elem->time.dwLowDateTime = time.u.LowPart; + elem->time.dwHighDateTime = time.u.HighPart; EnterCriticalSection(&timeout_queue_cs); list_add_head(&timeout_queue, &elem->entry); @@ -1640,8 +1640,8 @@ DWORD events_loop(void) ULARGE_INTEGER time; GetSystemTimeAsFileTime(&cur_time); - time.LowPart = cur_time.dwLowDateTime; - time.HighPart = cur_time.dwHighDateTime; + time.u.LowPart = cur_time.dwLowDateTime; + time.u.HighPart = cur_time.dwHighDateTime; EnterCriticalSection(&timeout_queue_cs); timeout = INFINITE; @@ -1661,8 +1661,8 @@ DWORD events_loop(void) { ULARGE_INTEGER time_diff; - time_diff.LowPart = iter->time.dwLowDateTime; - time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.u.LowPart = iter->time.dwLowDateTime; + time_diff.u.HighPart = iter->time.dwHighDateTime; time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; if(time_diff.QuadPart < timeout)

1 0

André Hentschel : ole32: Don' t leak memory allocated by ProgIDFromCLSID (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: fbe682a22a28996f5f9e2c7a892545887a52d3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe682a22a28996f5f9e2c7a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:45 2012 +0100 ole32: Don't leak memory allocated by ProgIDFromCLSID (coverity). --- dlls/ole32/clipboard.c | 1 + dlls/ole32/storage32.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 57b0c46..a7308c2 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -664,6 +664,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); + CoTaskMemFree(strProgID); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 70494a1..d2e9f69 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9075,6 +9075,7 @@ static HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DW if(hRes == S_OK) { *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE); + CoTaskMemFree(wstrProgID); } }

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DDEVICE9.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 4ba6974345845030d56289de71ed1ce68d25d8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba6974345845030d56289de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:52 2012 +0100 d3dx9: Avoid LPDIRECT3DDEVICE9. --- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/d3dx9_36/effect.c | 90 ++++++++++------------- dlls/d3dx9_36/font.c | 5 +- dlls/d3dx9_36/line.c | 4 +- dlls/d3dx9_36/mesh.c | 160 ++++++++++++++--------------------------- dlls/d3dx9_36/shader.c | 66 +++++++++-------- dlls/d3dx9_36/sprite.c | 4 +- dlls/d3dx9_36/tests/line.c | 2 +- dlls/d3dx9_36/texture.c | 27 ++------ include/d3dx9anim.h | 13 +++- include/d3dx9core.h | 46 +++++++----- include/d3dx9effect.h | 131 +++++++++------------------------- include/d3dx9mesh.h | 113 ++++++++++++++++++----------- include/d3dx9shader.h | 46 +++++++----- include/d3dx9shape.h | 56 +++----------- include/d3dx9tex.h | 28 ++------ 16 files changed, 329 insertions(+), 464 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ba6974345845030d5628…

1 0