September 2010 - Wine-Commits

Hans Leidekker : msi: Fix comparison of table ids in TABLE_Exists.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: d8b58797982ff2b648106e96e74bb50e09763572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b58797982ff2b648106e96e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:01 2010 +0200 msi: Fix comparison of table ids in TABLE_Exists. --- dlls/msi/table.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6755496..464eced 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -988,8 +988,8 @@ done: /* try to find the table name in the _Tables table */ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) { - UINT r, table_id = 0, i, count; - MSITABLE *table = NULL; + UINT r, table_id, i; + MSITABLE *table; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; @@ -1012,10 +1012,11 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) return FALSE; } - count = table->row_count; - for( i=0; i<count; i++ ) - if( table->data[ i ][ 0 ] == table_id ) + for( i = 0; i < table->row_count; i++ ) + { + if( read_table_int( table->data, i, 0, db->bytes_per_strref ) == table_id ) return TRUE; + } return FALSE; }

1 0

Hans Leidekker : msi: Open relocated package database in transacted mode.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: f6e26351d51b97ca0ba7d3da0195a471879e2885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e26351d51b97ca0ba7d3da0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:13 2010 +0200 msi: Open relocated package database in transacted mode. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index aa0d1b5..c386f89 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1354,7 +1354,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) * read/write, which is safe because we always create a copy that is thrown * away when we're done. */ - r = MSI_OpenDatabaseW( file, MSIDBOPEN_DIRECT, &db ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_TRANSACT, &db ); if( r != ERROR_SUCCESS ) { if (file != szPackage)

1 0

Jason Edmeades : cmd: echo.word should echo back the word without the .
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 32c8b46633f0fe5d31d68573ed23f3bf761a8c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c8b46633f0fe5d31d68573e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 7 15:59:43 2010 -0700 cmd: echo.word should echo back the word without the . --- programs/cmd/builtins.c | 9 +++------ programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a4f9a1..5ccbb8f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -668,15 +668,12 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { void WCMD_echo (const WCHAR *command) { int count; + const WCHAR *origcommand = command; - if ((command[0] == '.') && (command[1] == 0)) { - WCMD_output (newline); - return; - } - if (command[0]==' ') + if (command[0]==' ' || command[0]=='.') command++; count = strlenW(command); - if (count == 0) { + if (count == 0 && origcommand[0]!='.') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d596c18..d9f5cf7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -9,6 +9,8 @@ echo "doublequotedword" echo "/?" echo. echo . +echo.word +echo .word echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 306953b..8942cb3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -9,6 +9,8 @@ at-echoed-word "/?" . +word +.word ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar

1 0

Jacek Caban : urlmon: Correctly handle INET_E_USE_DEFAULT_SETTING returned from GetBindString( BINDIND_ACCEPT_MIMES).
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: ed2b72248fef1880e176e88ca46e03cc5769c8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2b72248fef1880e176e88ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 14:56:08 2010 +0200 urlmon: Correctly handle INET_E_USE_DEFAULT_SETTING returned from GetBindString(BINDIND_ACCEPT_MIMES). --- dlls/urlmon/http.c | 13 +++++++++++-- include/urlmon.idl | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index fc0b8c4..04ca232 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -76,6 +76,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ IHttpNegotiate2 *http_negotiate2 = NULL; LPWSTR host, user, pass, path; LPOLESTR accept_mimes[257]; + const WCHAR **accept_types; URL_COMPONENTSW url_comp; BYTE security_id[512]; DWORD len = 0; @@ -113,7 +114,15 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ num = sizeof(accept_mimes)/sizeof(accept_mimes[0])-1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); - if(hres != S_OK) { + if(hres == INET_E_USE_DEFAULT_SETTING) { + static const WCHAR default_accept_mimeW[] = {'*','/','*',0}; + static const WCHAR *default_accept_mimes[] = {default_accept_mimeW, NULL}; + + accept_types = default_accept_mimes; + num = 0; + }else if(hres == S_OK) { + accept_types = (const WCHAR**)accept_mimes; + }else { WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08x\n", hres); return INET_E_NO_VALID_MEDIA; } @@ -130,7 +139,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ This->base.request = HttpOpenRequestW(This->base.connection, This->base.bind_info.dwBindVerb < BINDVERB_CUSTOM ? wszBindVerb[This->base.bind_info.dwBindVerb] : This->base.bind_info.szCustomVerb, - path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD_PTR)&This->base); + path, NULL, NULL, accept_types, request_flags, (DWORD_PTR)&This->base); heap_free(path); while(num--) CoTaskMemFree(accept_mimes[num]); diff --git a/include/urlmon.idl b/include/urlmon.idl index c1d3bec..ac856e8 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1897,6 +1897,7 @@ cpp_quote("#define INET_E_SECURITY_PROBLEM _HRESULT_TYPEDEF_(0x800C000E cpp_quote("#define INET_E_CANNOT_LOAD_DATA _HRESULT_TYPEDEF_(0x800C000F)") cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT _HRESULT_TYPEDEF_(0x800C0010)") cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER _HRESULT_TYPEDEF_(0x800C0011)") +cpp_quote("#define INET_E_USE_DEFAULT_SETTING _HRESULT_TYPEDEF_(0x800C0012L)") cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013)") cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)")

1 0

Roderick Colenbrander : include: Undefine INTERFACE before defining it.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 6154bf1ad85114f1ede62dd7b199c0b74495c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6154bf1ad85114f1ede62dd7b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Sep 8 00:20:12 2010 +0200 include: Undefine INTERFACE before defining it. --- include/d3d.h | 1 + include/d3d8.h | 1 + include/d3d9.h | 1 + include/ddraw.h | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 7297755..409be1b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -202,6 +202,7 @@ typedef DWORD D3DVIEWPORTHANDLE, *LPD3DVIEWPORTHANDLE; /***************************************************************************** * IDirect3D interface */ +#undef INTERFACE #define INTERFACE IDirect3D DECLARE_INTERFACE_(IDirect3D,IUnknown) { diff --git a/include/d3d8.h b/include/d3d8.h index 46e0812..88da40d 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -129,6 +129,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU /***************************************************************************** * IDirect3D8 interface */ +#undef INTERFACE #define INTERFACE IDirect3D8 DECLARE_INTERFACE_(IDirect3D8,IUnknown) { diff --git a/include/d3d9.h b/include/d3d9.h index 09ce3d0..3f9ebf2 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -163,6 +163,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9; /***************************************************************************** * IDirect3D9 interface */ +#undef INTERFACE #define INTERFACE IDirect3D9 DECLARE_INTERFACE_(IDirect3D9,IUnknown) { diff --git a/include/ddraw.h b/include/ddraw.h index eea7e09..88990f0 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1220,6 +1220,7 @@ typedef struct tagDDDEVICEIDENTIFIER2 { /***************************************************************************** * IDirectDrawPalette interface */ +#undef INTERFACE #define INTERFACE IDirectDrawPalette DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown) {

1 0

Henri Verbeet : ddraw: Remove some stray tabs.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: b1a385db110e62a3852c7a2595ff44a09f1c4ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a385db110e62a3852c7a259… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:49 2010 +0200 ddraw: Remove some stray tabs. --- dlls/ddraw/clipper.c | 10 ++-- dlls/ddraw/device.c | 6 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/main.c | 14 +++--- dlls/ddraw/material.c | 30 +++++------ dlls/ddraw/palette.c | 3 +- dlls/ddraw/tests/dsurface.c | 79 +++++++++++++++++------------- dlls/ddraw/utils.c | 4 +- dlls/ddraw/viewport.c | 114 ++++++++++++++++++++++--------------------- 9 files changed, 136 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1a385db110e62a3852c7…

1 0

Henri Verbeet : ddraw: Just pass FOURCC formats through to wined3d.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 50d3f8081e79738b05a40d949fddc3431c7dab24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d3f8081e79738b05a40d949… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:50 2010 +0200 ddraw: Just pass FOURCC formats through to wined3d. --- dlls/ddraw/utils.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f9cc0d9..07c3ccc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -568,47 +568,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } else if(DDPixelFormat->dwFlags & DDPF_FOURCC) { - if(DDPixelFormat->dwFourCC == MAKEFOURCC('U', 'Y', 'V', 'Y')) - { - return WINED3DFMT_UYVY; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'U', 'Y', '2')) - { - return WINED3DFMT_YUY2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'V', '1', '2')) - { - return WINED3DFMT_YV12; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '1')) - { - return WINED3DFMT_DXT1; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '2')) - { - return WINED3DFMT_DXT2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '3')) - { - return WINED3DFMT_DXT3; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '4')) - { - return WINED3DFMT_DXT4; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '5')) - { - return WINED3DFMT_DXT5; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('G', 'R', 'G', 'B')) - { - return WINED3DFMT_G8R8_G8B8; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('R', 'G', 'B', 'G')) - { - return WINED3DFMT_R8G8_B8G8; - } - return WINED3DFMT_UNKNOWN; /* Abuse this as an error value */ + return DDPixelFormat->dwFourCC; } else if(DDPixelFormat->dwFlags & DDPF_BUMPDUDV) {

1 0

Jason Edmeades : cmd: Make tests supply stderr + more diagnostics.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 199b2db50209e9aecb51b6f5fa04f9e38de45940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199b2db50209e9aecb51b6f5f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 7 15:59:41 2010 -0700 cmd: Make tests supply stderr + more diagnostics. --- programs/cmd/tests/batch.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9e93a01..cc8c020 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -31,7 +31,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) char command[] = "test.cmd"; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi; - HANDLE file; + HANDLE file,fileerr; DWORD size; BOOL bres; @@ -53,8 +53,15 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) if(file == INVALID_HANDLE_VALUE) return FALSE; + fileerr = CreateFileA("test.err", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(fileerr != INVALID_HANDLE_VALUE, "CreateFile stderr failed\n"); + if(fileerr == INVALID_HANDLE_VALUE) + return FALSE; + si.dwFlags = STARTF_USESTDHANDLES; si.hStdOutput = file; + si.hStdError = fileerr; bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(bres, "CreateProcess failed: %u\n", GetLastError()); if(!bres) { @@ -66,6 +73,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); CloseHandle(file); + CloseHandle(fileerr); DeleteFileA("test.cmd"); return TRUE; } @@ -185,8 +193,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da exp_ptr++; } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, expected 0x%x\n", line, *exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output\n"); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) @@ -203,6 +211,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, UnmapViewOfFile(out_data); } DeleteFileA("test.out"); + DeleteFileA("test.err"); } static void run_from_file(char *file_name)

1 0

Henri Verbeet : wined3d: IWineD3DSurface_GetDesc() should never fail.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 53183b4cf356b28c79cd3d51307a429f8b673413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53183b4cf356b28c79cd3d513… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:47 2010 +0200 wined3d: IWineD3DSurface_GetDesc() should never fail. --- dlls/d3d8/surface.c | 24 ++++++++++-------------- dlls/d3d9/surface.c | 24 ++++++++++-------------- dlls/ddraw/ddraw.c | 3 +-- dlls/ddraw/surface.c | 8 +------- dlls/wined3d/cubetexture.c | 4 +++- dlls/wined3d/surface_base.c | 4 +--- dlls/wined3d/texture.c | 4 +++- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 2 +- 9 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a71ab12..6e59bd6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -190,27 +190,23 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->Size = wined3ddesc.size; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->Size = wined3ddesc.size; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c7dc895..de3fb77 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -246,27 +246,23 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3DSURFACE_DESC* pDesc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 865d5d0..cb942d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2389,8 +2389,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE IWineD3DSurface_GetClipper(wineD3DSurface, &clipper); /* Get the surface properties */ - hr = IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); - if(hr != D3D_OK) return hr; + IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); Format = Desc.format; Usage = Desc.usage; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a433913..badd46b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3588,13 +3588,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr } surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT; - hr = IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); - if (FAILED(hr)) - { - ERR("Failed to get wined3d surface desc, hr %#x.\n", hr); - IWineD3DSurface_Release(surface->WineD3DSurface); - return hr; - } + IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); format = wined3d_desc.format; if (format == WINED3DFMT_UNKNOWN) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 519efbd..13ec3a8 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -337,7 +337,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture * return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *iface, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index eb64804..172b8a8 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -146,7 +146,7 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) return ((IWineD3DSurfaceImpl *)iface)->resource.parent; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) { IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; @@ -161,8 +161,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSU desc->multisample_quality = surface->currentDesc.MultiSampleQuality; desc->width = surface->currentDesc.Width; desc->height = surface->currentDesc.Height; - - return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8e285f7..a52d7c4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -353,7 +353,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30a5ea5..d9e6e83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2151,7 +2151,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 942ecdc..36a82a5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2373,7 +2373,7 @@ interface IWineD3DClipper : IUnknown ] interface IWineD3DSurface : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DSURFACE_DESC *desc ); HRESULT LockRect(

1 0

Henri Verbeet : wined3d: IWineD3DVolume_GetDesc() should never fail.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 955858e97d215016d8a865a17aa1f246903eacdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=955858e97d215016d8a865a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:48 2010 +0200 wined3d: IWineD3DVolume_GetDesc() should never fail. --- dlls/d3d8/volume.c | 26 +++++++++++--------------- dlls/d3d9/volume.c | 24 ++++++++++-------------- dlls/wined3d/volume.c | 4 +--- dlls/wined3d/volumetexture.c | 4 +++- include/wine/wined3d.idl | 2 +- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index c2b7417..1705822 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -177,28 +177,24 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - HRESULT hr; - WINED3DVOLUME_DESC wined3ddesc; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Size = wined3ddesc.Size; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d87b86..1ecd2b2 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -182,29 +182,25 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - WINED3DVOLUME_DESC wined3ddesc; - HRESULT hr; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 94ea319..8c596fb 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -187,7 +187,7 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type((IWineD3DResource *)iface); } -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) +static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) { IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface; @@ -201,8 +201,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV desc->Width = volume->currentDesc.Width; desc->Height = volume->currentDesc.Height; desc->Depth = volume->currentDesc.Depth; - - return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6abba41..2e9fec9 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,7 +273,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu return WINED3DERR_INVALIDCALL; } - return IWineD3DVolume_GetDesc(volume, desc); + IWineD3DVolume_GetDesc(volume, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36a82a5..80dabac 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2486,7 +2486,7 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DVOLUME_DESC *desc ); HRESULT LockBox(

1 0