January 2013 - Wine-Commits

Piotr Caban : msvcrt: Return child exit code in _pclose function.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: a968a1ad6dccd85548b62b43d7a0e41d2a4058d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a968a1ad6dccd85548b62b43d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:03:51 2013 +0100 msvcrt: Return child exit code in _pclose function. Based on a patch by Borut Ražem. --- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/process.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index ca761ad..6df9ccf 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -118,6 +118,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_PROCESS_DETACH: + msvcrt_free_popen_data(); msvcrt_free_io(); msvcrt_free_mt_locks(); msvcrt_free_console(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4915309..ba67b65 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -269,6 +269,7 @@ extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index d1e8e21..cc64c2d 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include "msvcrt.h" +#include "mtdll.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1022,6 +1023,17 @@ MSVCRT_intptr_t CDECL _wspawnvp(int flags, const MSVCRT_wchar_t* name, const MSV return MSVCRT__wspawnvpe(flags, name, argv, NULL); } +static struct popen_handle { + MSVCRT_FILE *f; + HANDLE proc; +} *popen_handles; +static DWORD popen_handles_size; + +void msvcrt_free_popen_data(void) +{ + MSVCRT_free(popen_handles); +} + /********************************************************************* * _wpopen (MSVCRT.@) * @@ -1036,6 +1048,8 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc MSVCRT_wchar_t *comspec, *fullcmd; unsigned int len; static const MSVCRT_wchar_t flag[] = {' ','/','c',' ',0}; + struct popen_handle *container; + DWORD i; TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); @@ -1069,6 +1083,25 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc fdToDup = readPipe ? 1 : 0; fdToOpen = readPipe ? 0 : 1; + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (!popen_handles[i].f) + break; + } + if (i==popen_handles_size) + { + i = (popen_handles_size ? popen_handles_size*2 : 8); + container = MSVCRT_realloc(popen_handles, i*sizeof(*container)); + if (!container) goto error; + + popen_handles = container; + container = popen_handles+popen_handles_size; + memset(container, 0, (i-popen_handles_size)*sizeof(*container)); + popen_handles_size = i; + } + else container = popen_handles+i; + if ((fdStdHandle = MSVCRT__dup(fdToDup)) == -1) goto error; if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0) @@ -1089,7 +1122,8 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc strcatW(fullcmd, flag); strcatW(fullcmd, command); - if (msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1) == -1) + if ((container->proc = (HANDLE)msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1)) + == INVALID_HANDLE_VALUE) { MSVCRT__close(fds[fdToOpen]); ret = NULL; @@ -1099,7 +1133,9 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc ret = MSVCRT__wfdopen(fds[fdToOpen], mode); if (!ret) MSVCRT__close(fds[fdToOpen]); + container->f = ret; } + _munlock(_POPEN_LOCK); HeapFree(GetProcessHeap(), 0, comspec); HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); @@ -1107,6 +1143,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc return ret; error: + _munlock(_POPEN_LOCK); if (fdStdHandle != -1) MSVCRT__close(fdStdHandle); MSVCRT__close(fds[0]); MSVCRT__close(fds[1]); @@ -1145,7 +1182,38 @@ MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode) */ int CDECL MSVCRT__pclose(MSVCRT_FILE* file) { - return MSVCRT_fclose(file); + HANDLE h; + DWORD i; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (popen_handles[i].f == file) + break; + } + if(i == popen_handles_size) + { + _munlock(_POPEN_LOCK); + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + + h = popen_handles[i].proc; + popen_handles[i].f = NULL; + _munlock(_POPEN_LOCK); + + MSVCRT_fclose(file); + if(WaitForSingleObject(h, INFINITE)==WAIT_FAILED || !GetExitCodeProcess(h, &i)) + { + msvcrt_set_errno(GetLastError()); + CloseHandle(h); + return -1; + } + + CloseHandle(h); + return i; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added support for commit flag in fopen.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 7f4e1c65b1b5697ce7e9b4198e2f72997d1d44b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4e1c65b1b5697ce7e9b4198… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:03:13 2013 +0100 msvcrt: Added support for commit flag in fopen. --- dlls/msvcrt/file.c | 67 +++++++++++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 3 ++ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index dedfa30..0df6a86 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -764,6 +764,34 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) return -1; } +/********************************************************************* + * _commit (MSVCRT.@) + */ +int CDECL MSVCRT__commit(int fd) +{ + HANDLE hand = msvcrt_fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return -1; + + if (!FlushFileBuffers(hand)) + { + if (GetLastError() == ERROR_INVALID_HANDLE) + { + /* FlushFileBuffers fails for console handles + * so we ignore this error. + */ + return 0; + } + TRACE(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(GetLastError()); + return -1; + } + TRACE(":ok\n"); + return 0; +} + /* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file); @@ -811,6 +839,9 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) MSVCRT__lock_file(file); res = msvcrt_flush_buffer(file); + + if(!res && (file->_flag & MSVCRT__IOCOMMIT)) + res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; MSVCRT__unlock_file(file); return res; @@ -852,34 +883,6 @@ int CDECL MSVCRT__close(int fd) } /********************************************************************* - * _commit (MSVCRT.@) - */ -int CDECL MSVCRT__commit(int fd) -{ - HANDLE hand = msvcrt_fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return -1; - - if (!FlushFileBuffers(hand)) - { - if (GetLastError() == ERROR_INVALID_HANDLE) - { - /* FlushFileBuffers fails for console handles - * so we ignore this error. - */ - return 0; - } - TRACE(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(GetLastError()); - return -1; - } - TRACE(":ok\n"); - return 0; -} - -/********************************************************************* * _dup2 (MSVCRT.@) * NOTES * MSDN isn't clear on this point, but the remarks for _pipe @@ -1284,6 +1287,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st return -1; } + *stream_flags |= MSVCRT__commode; + while (*mode && *mode!=',') switch (*mode++) { @@ -1301,6 +1306,12 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'T': *open_flags |= MSVCRT__O_SHORT_LIVED; break; + case 'c': + *stream_flags |= MSVCRT__IOCOMMIT; + break; + case 'n': + *stream_flags &= ~MSVCRT__IOCOMMIT; + break; case '+': case ' ': case 'a': diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9b88d32..4915309 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -238,6 +238,8 @@ extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **) DECLSP MSVCRT_wchar_t *msvcrt_wstrdupa(const char *) DECLSPEC_HIDDEN; +extern unsigned int MSVCRT__commode; + /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. */ @@ -713,6 +715,7 @@ struct MSVCRT__stat64 { #define MSVCRT__IOERR 0x0020 #define MSVCRT__IOSTRG 0x0040 #define MSVCRT__IORW 0x0080 +#define MSVCRT__IOCOMMIT 0x4000 #define MSVCRT__S_IEXEC 0x0040 #define MSVCRT__S_IWRITE 0x0080

1 0

Dmitry Timoshkov : windowscodecs: Add a test for CreateBitmapFromHBITMAP.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 89f044db1552df1e2e3ba7a59d30cc541b6e9c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f044db1552df1e2e3ba7a59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 18 17:59:48 2013 +0800 windowscodecs: Add a test for CreateBitmapFromHBITMAP. --- dlls/windowscodecs/tests/bitmap.c | 188 +++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 189 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index fb7183b..742f45f 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #include <math.h> #define COBJMACROS @@ -42,6 +43,51 @@ static const char *debugstr_guid(const GUID *guid) return buf; } +static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const void *data) +{ + char bmibuf[sizeof(BITMAPINFO) + sizeof(RGBQUAD) * 255]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + void *bits; + HBITMAP hdib; + BITMAP bm; + + memset(bmibuf, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biBitCount = bpp; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + if (pal) + { + WORD i; + + assert(pal->palNumEntries <= 256); + for (i = 0; i < pal->palNumEntries; i++) + { + bmi->bmiColors[i].rgbRed = pal->palPalEntry[i].peRed; + bmi->bmiColors[i].rgbGreen = pal->palPalEntry[i].peGreen; + bmi->bmiColors[i].rgbBlue = pal->palPalEntry[i].peBlue; + bmi->bmiColors[i].rgbReserved = 0; + } + + bmi->bmiHeader.biClrUsed = pal->palNumEntries; + bmi->bmiHeader.biClrImportant = pal->palNumEntries; + } + hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height, bpp); + + GetObject(hdib, sizeof(bm), &bm); + ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth); + ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight); + ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes); + ok(bm.bmBitsPixel == bpp, "expected %d, got %d\n", bpp, bm.bmBitsPixel); + + if (data) memcpy(bits, data, bm.bmWidthBytes * bm.bmHeight); + + return hdib; +} + static void test_createbitmap(void) { HRESULT hr; @@ -582,6 +628,147 @@ static void test_CreateBitmapFromHICON(void) IWICBitmap_Release(bitmap); } +static void test_CreateBitmapFromHBITMAP(void) +{ + /* 8 bpp data must be aligned to a DWORD boundary for a DIB */ + static const BYTE data_8bpp_pal_dib[12] = { 0,1,2,0, 1,2,0,0, 2,1,0,0 }; + static const BYTE data_8bpp_rgb_dib[12] = { 0xf0,0x0f,0xff,0, 0x0f,0xff,0xf0,0, 0xf0,0x0f,0xff,0 }; + static const BYTE data_8bpp_pal_wic[12] = { 0xd,0xe,0x10,0, 0xe,0x10,0xd,0, 0x10,0xe,0xd,0 }; + static const PALETTEENTRY pal_data[3] = { {0xff,0,0,0}, {0,0xff,0,0}, {0,0,0xff,0} }; + char pal_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buf; + HBITMAP hbmp; + HPALETTE hpal; + BYTE data[12]; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height, i, count; + WICPixelFormatGUID format; + IWICPalette *palette; + WICBitmapPaletteType type; + + /* 8 bpp without palette */ + hbmp = create_dib(3, 3, 8, NULL, data_8bpp_rgb_dib); + ok(hbmp != 0, "failed to create bitmap\n"); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_rgb_dib[i], "%u: expected %#x, got %#x\n", i, data_8bpp_rgb_dib[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + + /* 8 bpp with a 3 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 3; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + + IWICPalette_Release(palette); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); + + /* 8 bpp with a 256 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 256; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + IWICPalette_Release(palette); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); +} + START_TEST(bitmap) { HRESULT hr; @@ -596,6 +783,7 @@ START_TEST(bitmap) test_createbitmapfromsource(); test_CreateBitmapFromMemory(); test_CreateBitmapFromHICON(); + test_CreateBitmapFromHBITMAP(); IWICImagingFactory_Release(factory); diff --git a/include/wincodec.idl b/include/wincodec.idl index c727bf3..ba58db7 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -219,6 +219,7 @@ cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") +cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") interface IWICPalette;

1 0

Alexandre Julliard : fusion: Remove an unneeded file.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 1b03bc6645ab74902d0da00687e804abdc56d10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b03bc6645ab74902d0da0068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 13:04:51 2013 +0100 fusion: Remove an unneeded file. --- dlls/fusion/Makefile.in | 3 +- dlls/fusion/fusion.c | 10 ++++++++ dlls/fusion/fusion_main.c | 53 --------------------------------------------- 3 files changed, 11 insertions(+), 55 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 63b1b73..314aba9 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -6,8 +6,7 @@ C_SRCS = \ asmenum.c \ asmname.c \ assembly.c \ - fusion.c \ - fusion_main.c + fusion.c RC_SRCS = version.rc diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index e79fa3a..e638208 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -32,6 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); + +/****************************************************************** + * InitializeFusion (FUSION.@) + */ +HRESULT WINAPI InitializeFusion(void) +{ + FIXME("\n"); + return E_NOTIMPL; +} + /****************************************************************** * ClearDownloadCache (FUSION.@) */ diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c deleted file mode 100644 index 3c7958b..0000000 --- a/dlls/fusion/fusion_main.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * fusion main - * - * Copyright 2008 James Hawkins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - - return TRUE; -} - -HRESULT WINAPI InitializeFusion(void) -{ - FIXME("\n"); - return E_NOTIMPL; -}

1 0

Hans Leidekker : fusion: No longer prefer native.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: d366642519e908556a9c425285d21e78f0a1e101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d366642519e908556a9c42528… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 09:17:45 2013 +0100 fusion: No longer prefer native. --- dlls/fusion/fusion_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c index 8f0906b..3c7958b 100644 --- a/dlls/fusion/fusion_main.c +++ b/dlls/fusion/fusion_main.c @@ -34,8 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Bruno Jesus : ws2_32/tests: Add SO_ERROR [set|get]sockopt tests.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 02c199beed2ae6a0c2925235ce319844771753b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c199beed2ae6a0c2925235c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 17 22:33:05 2013 -0200 ws2_32/tests: Add SO_ERROR [set|get]sockopt tests. --- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8860448..56a64bc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1192,6 +1192,34 @@ static void test_set_getsockopt(void) "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); + /* Test SO_ERROR set/get */ + SetLastError(0xdeadbeef); + i = 1234; + err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); +todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + /* Test invalid optlen */ + SetLastError(0xdeadbeef); + size = 1; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", + err, WSAGetLastError()); + closesocket(s); }

1 0

Hans Leidekker : wbemprox: Reject empty queries.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 9d9c17de2b6cb1139c014ff2ab6c465db488d653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c17de2b6cb1139c014ff2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 10:22:49 2013 +0100 wbemprox: Reject empty queries. --- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/tests/query.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 663d2d0..4bcd824 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -527,7 +527,7 @@ static HRESULT WINAPI wbem_services_ExecQuery( TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), lFlags, pCtx, ppEnum); - if (!strQueryLanguage || !strQuery) return WBEM_E_INVALID_PARAMETER; + if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; if (strcmpiW( strQueryLanguage, wqlW )) return WBEM_E_INVALID_QUERY_TYPE; return exec_query( strQuery, ppEnum ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 71c613a..1096caa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -69,6 +69,7 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC static void test_select( IWbemServices *services ) { + static const WCHAR emptyW[] = {0}; static const WCHAR sqlW[] = {'S','Q','L',0}; static const WCHAR query1[] = {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', @@ -113,6 +114,11 @@ static void test_select( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + SysFreeString( query ); + query = SysAllocString( emptyW ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = exec_query( services, test[i], &result );

1 0

Nikolay Sivov : qmgr: COM cleanup for IBackgroundCopyFile interface.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: d4edda8c4627c76dfa2ef769b864faaec6959caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4edda8c4627c76dfa2ef769b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:38:49 2013 +0400 qmgr: COM cleanup for IBackgroundCopyFile interface. --- dlls/qmgr/enum_files.c | 4 +- dlls/qmgr/file.c | 53 ++++++++++++++++++++++++++++------------------- dlls/qmgr/job.c | 6 +--- dlls/qmgr/qmgr.h | 4 +- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 9f1b505..7b0e505 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -202,8 +202,8 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack i = 0; LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) { - file->lpVtbl->AddRef((IBackgroundCopyFile *) file); - This->files[i] = (IBackgroundCopyFile *) file; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); + This->files[i] = &file->IBackgroundCopyFile_iface; ++i; } LeaveCriticalSection(&job->cs); diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 9d9d9c1..5fa5d09 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundCopyFile *iface) +{ + return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface); +} + static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) { IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); @@ -43,38 +48,43 @@ static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) -{ - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; - return InterlockedIncrement(&This->ref); -} - static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( IBackgroundCopyFile* iface, REFIID riid, - void **ppvObject) + void **obj) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyFile)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyFile_AddRef(iface); + *obj = iface; + IBackgroundCopyFile_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *obj = NULL; return E_NOINTERFACE; } +static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) +{ + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} static ULONG WINAPI BITS_IBackgroundCopyFile_Release( IBackgroundCopyFile* iface) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) BackgroundCopyFileDestructor(This); @@ -86,7 +96,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetRemoteName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.RemoteName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -101,7 +111,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.LocalName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -116,7 +126,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( IBackgroundCopyFile* iface, BG_FILE_PROGRESS *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); EnterCriticalSection(&This->owner->cs); pVal->BytesTotal = This->fileProgress.BytesTotal; @@ -139,13 +149,12 @@ static const IBackgroundCopyFileVtbl BITS_IBackgroundCopyFile_Vtbl = HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj) + BackgroundCopyFileImpl **file) { BackgroundCopyFileImpl *This; int n; - TRACE("(%s,%s,%p)\n", debugstr_w(remoteName), - debugstr_w(localName), ppObj); + TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -170,7 +179,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, } memcpy(This->info.LocalName, localName, n); - This->lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; + This->IBackgroundCopyFile_iface.lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; This->ref = 1; This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; @@ -179,7 +188,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, This->owner = owner; IBackgroundCopyJob2_AddRef(&owner->IBackgroundCopyJob2_iface); - *ppObj = &This->lpVtbl; + *file = This; return S_OK; } @@ -236,7 +245,7 @@ static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) if (ref == 0) { - IBackgroundCopyFile_Release((IBackgroundCopyFile *) This->file); + IBackgroundCopyFile_Release(&This->file->IBackgroundCopyFile_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -365,7 +374,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( return NULL; This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; - IBackgroundCopyFile_AddRef((IBackgroundCopyFile *) file); + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); This->file = file; This->ref = 1; return This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 4d9bf18..26fc43e 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -106,20 +106,18 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( LPCWSTR LocalName) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - IBackgroundCopyFile *pFile; BackgroundCopyFileImpl *file; HRESULT res; /* We should return E_INVALIDARG in these cases. */ FIXME("Check for valid filenames and supported protocols\n"); - res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, (LPVOID *) &pFile); + res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, &file); if (res != S_OK) return res; /* Add a reference to the file to file list */ - IBackgroundCopyFile_AddRef(pFile); - file = (BackgroundCopyFileImpl *) pFile; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); EnterCriticalSection(&This->cs); list_add_head(&This->files, &file->entryFromJob); This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 0039db7..215c200 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -49,7 +49,7 @@ typedef struct /* Background copy file vtbl and related data */ typedef struct { - const IBackgroundCopyFileVtbl *lpVtbl; + IBackgroundCopyFile IBackgroundCopyFile_iface; LONG ref; BG_FILE_INFO info; BG_FILE_PROGRESS fileProgress; @@ -84,7 +84,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj) DECLSPEC_HIDDEN; + BackgroundCopyFileImpl **file) DECLSPEC_HIDDEN; HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgroundCopyFiles**) DECLSPEC_HIDDEN; DWORD WINAPI fileTransfer(void *param) DECLSPEC_HIDDEN; void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : d3dx9_36/tests: Remove useless casts.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: d72394e7fa1ddc6083d5294d47075246466baf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72394e7fa1ddc6083d5294d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 12:30:27 2013 +0100 d3dx9_36/tests: Remove useless casts. --- dlls/d3dx9_36/tests/xfile.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 747fcadf..1238bcd 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -20,23 +20,23 @@ #include "d3dx9.h" #include "d3dx9xof.h" -static char templates_bad_file_type1[] = +static const char templates_bad_file_type1[] = "xOf 0302txt 0064\n"; -static char templates_bad_file_version[] = +static const char templates_bad_file_version[] = "xof 0102txt 0064\n"; -static char templates_bad_file_type2[] = +static const char templates_bad_file_type2[] = "xof 0302foo 0064\n"; -static char templates_bad_file_float_size[] = +static const char templates_bad_file_float_size[] = "xof 0302txt 0050\n"; -static char templates_parse_error[] = +static const char templates_parse_error[] = "xof 0302txt 0064" "foobar;\n"; -static char templates[] = +static const char templates[] = "xof 0302txt 0064" "template Header" "{" @@ -64,22 +64,22 @@ static void test_templates(void) ret = D3DXFileCreate(&d3dxfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type1, (SIZE_T)(sizeof(templates_bad_file_type1) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_version, (SIZE_T)(sizeof(templates_bad_file_version) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_version, sizeof(templates_bad_file_version) - 1); ok(ret == D3DXFERR_BADFILEVERSION, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEVERSION); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type2, (SIZE_T)(sizeof(templates_bad_file_type2) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_type2, sizeof(templates_bad_file_type2) - 1); ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_float_size, (SIZE_T)(sizeof(templates_bad_file_float_size) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_float_size, sizeof(templates_bad_file_float_size) - 1); ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_parse_error, (SIZE_T)(sizeof(templates_parse_error) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); d3dxfile->lpVtbl->Release(d3dxfile); @@ -98,7 +98,7 @@ static void test_lock_unlock(void) ret = D3DXFileCreate(&d3dxfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); memory.lpMemory = objects;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_Lock and ID3DXFileDataImpl_Unlock + tests.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 45e43dc5d047909609db2d90a1df4a58b390823f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e43dc5d047909609db2d90a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 18 08:49:17 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_Lock and ID3DXFileDataImpl_Unlock + tests. --- dlls/d3dx9_36/tests/xfile.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++--- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 3ab30a9..6c29f5e 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -46,6 +46,12 @@ char templates[] = "DWORD flags;" "}\n"; +static char objects[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 2; 3;\n" +"}\n"; static void test_templates(void) { @@ -79,8 +85,49 @@ static void test_templates(void) d3dxfile->lpVtbl->Release(d3dxfile); } +static void test_lock_unlock(void) +{ + ID3DXFile *d3dxfile; + D3DXF_FILELOADMEMORY memory; + ID3DXFileEnumObject *enum_object; + ID3DXFileData *data_object; + const void *data; + SIZE_T size; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + + memory.lpMemory = objects; + memory.dSize = sizeof(objects) - 1; + + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + ret = data_object->lpVtbl->Lock(data_object, &size, &data); + ok(ret == S_OK, "Lock failed with %#x\n", ret); + ret = data_object->lpVtbl->Lock(data_object, &size, &data); + ok(ret == S_OK, "Lock failed with %#x\n", ret); + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + d3dxfile->lpVtbl->Release(d3dxfile); +} START_TEST(xfile) { test_templates(); + test_lock_unlock(); } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index d54ef0f..afc0def 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -178,17 +178,32 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) static HRESULT WINAPI ID3DXFileDataImpl_Lock(ID3DXFileData *iface, SIZE_T *size, const void **data) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, data); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + DWORD dxfile_size; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, size, data); + + if (!size || !data) + return E_POINTER; + + ret = IDirectXFileData_GetData(This->dxfile_data, NULL, &dxfile_size, (void**)data); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *size = dxfile_size; + + return S_OK; } static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) { - FIXME("(%p)->(): stub\n", iface); + TRACE("(%p)->()\n", iface); - return E_NOTIMPL; + /* Nothing to do */ + + return S_OK; }

1 0