August 2010 - Wine-Commits - list.winehq.org

Louis Lenders : mscoree/tests: Add a few tests for GetCORSytemDirectory.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: f317d6b32d1f6e3a68879b139aa9a3bdbc3d8a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f317d6b32d1f6e3a68879b139… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 25 14:34:04 2010 +0200 mscoree/tests: Add a few tests for GetCORSytemDirectory. --- dlls/mscoree/tests/mscoree.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index ba1e938..e66a44b 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -21,6 +21,7 @@ static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static BOOL init_functionpointers(void) { @@ -33,8 +34,8 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); - - if (!pGetCORVersion) + pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); + if (!pGetCORVersion || !pGetCORSystemDirectory) { win_skip("functions not available\n"); FreeLibrary(hmscoree); @@ -47,7 +48,8 @@ static BOOL init_functionpointers(void) static void test_versioninfo(void) { WCHAR version[MAX_PATH]; - DWORD size; + WCHAR path[MAX_PATH]; + DWORD size, path_len; HRESULT hr; hr = pGetCORVersion(NULL, MAX_PATH, &size); @@ -60,6 +62,24 @@ static void test_versioninfo(void) ok(hr == S_OK,"GetCORVersion returned %08x\n", hr); trace("latest installed .net runtime: %s\n", wine_dbgstr_w(version)); + + hr = pGetCORSystemDirectory(path, MAX_PATH , &size); + ok(hr == S_OK, "GetCORSystemDirectory returned %08x\n", hr); + /* size includes terminating null-character */ + ok(size == (lstrlenW(path) + 1),"size is %d instead of %d\n", size, (lstrlenW(path) + 1)); + + path_len = size; + + hr = pGetCORSystemDirectory(path, path_len-1 , &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + + hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + + hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); + ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr); + + trace("latest installed .net installed in directory: %s\n", wine_dbgstr_w(path)); } START_TEST(mscoree)

1 0

Jörg Höhle : mcicda: Access the first CD-ROM unless given a device letter.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: ecb02ec9b78670152d6672299e856e63d18e90a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb02ec9b78670152d6672299… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Aug 23 09:55:22 2010 +0200 mcicda: Access the first CD-ROM unless given a device letter. --- dlls/mcicda/mcicda.c | 16 +++++++++------- dlls/winmm/tests/mcicda.c | 9 ++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 0334f2e..4c67085 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -161,6 +161,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) WINE_MCICDAUDIO* wmcda; if (!modp) return 0xFFFFFFFF; + /* FIXME: MCIERR_CANNOT_LOAD_DRIVER if there's no drive of type CD-ROM */ wmcda = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCICDAUDIO)); @@ -400,11 +401,10 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms */ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) { - DWORD dwDeviceID; - DWORD ret = MCIERR_HARDWARE; + MCIDEVICEID dwDeviceID; + DWORD ret; WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); WCHAR root[7], drive = 0; - unsigned int count; TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpOpenParms); @@ -450,11 +450,10 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar } else { - /* drive letter isn't passed... get the dwDeviceID'th cdrom in the system */ root[0] = 'A'; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; - for (count = 0; root[0] <= 'Z'; root[0]++) + for ( ; root[0] <= 'Z'; root[0]++) { - if (GetDriveTypeW(root) == DRIVE_CDROM && ++count >= dwDeviceID) + if (GetDriveTypeW(root) == DRIVE_CDROM) { drive = root[0]; break; @@ -462,7 +461,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar } if (!drive) { - ret = MCIERR_INVALID_DEVICE_ID; + ret = MCIERR_CANNOT_LOAD_DRIVER; /* drvOpen should return this */ goto the_error; } } @@ -474,7 +473,10 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (wmcda->handle == INVALID_HANDLE_VALUE) + { + ret = MCIERR_MUST_USE_SHAREABLE; goto the_error; + } if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index 3dc610a..b6bb0bf 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -166,13 +166,12 @@ static void test_play(HWND hwnd) parm.gen.dwCallback = (DWORD_PTR)hwnd; /* once to rule them all */ err = mciSendString("open cdaudio alias c notify shareable", buf, sizeof(buf), hwnd); - if (err == MCIERR_INVALID_DEVICE_ID) /* Wine special */ todo_wine - ok(!err, "open cdaudio must succeed even without CD-ROM drive\n"); else - ok(!err || broken(err == MCIERR_MUST_USE_SHAREABLE), + ok(!err || err == MCIERR_CANNOT_LOAD_DRIVER || err == MCIERR_MUST_USE_SHAREABLE, "mci open cdaudio notify returned %s\n", dbg_mcierr(err)); test_notification(hwnd, "open alias notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); - /* Some machines return MUST_USE_SHAREABLE when there's trouble with the hardware - * (e.g. unreadable disk), yet adding that flag does not help get past this error. */ + /* Native returns MUST_USE_SHAREABLE when there's trouble with the hardware + * (e.g. unreadable disk) or when Media Player already has the device open, + * yet adding that flag does not help get past this error. */ if(err) { skip("Cannot open any cdaudio device, %s.\n", dbg_mcierr(err));

1 0

Kai Tietz : include: Fixed LIST_ENTRY macro type casts for win64.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: c74f7496486ac9436c40cd0dc43b85c0c31b3629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74f7496486ac9436c40cd0dc… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Wed Aug 25 15:14:24 2010 +0200 include: Fixed LIST_ENTRY macro type casts for win64. --- include/wine/list.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index da3ce91..9712603 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -227,6 +227,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #undef LIST_ENTRY #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field))) + ((type *)((char *)(elem) - (size_t)(&((type *)0)->field))) #endif /* __WINE_SERVER_LIST_H */

1 0

Piotr Caban : msvcrt: Added _set_purecall_handler implementation.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 898e17f2af8e447981ee041b446a2e854522e806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898e17f2af8e447981ee041b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 25 14:46:47 2010 +0200 msvcrt: Added _set_purecall_handler implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 1 + 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1cd1ada..771b2e0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1078,7 +1078,7 @@ @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output -@ stub _set_purecall_handler +@ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index d3da10e..2483d6b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -510,7 +510,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_purecall_handler +@ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 93c8047..02ba355 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -931,7 +931,7 @@ @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output -@ stub _set_purecall_handler +@ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5e32e32..a5c50b1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -917,7 +917,7 @@ @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output -@ stub _set_purecall_handler +@ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 27bb0d3..80749fc 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static MSVCRT__onexit_t *MSVCRT_atexit_table = NULL; static int MSVCRT_atexit_table_size = 0; static int MSVCRT_atexit_registered = 0; /* Points to free slot */ +static MSVCRT_purecall_handler purecall_handler = NULL; static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; @@ -251,6 +252,15 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } +/* _set_purecall_handler - not exported in native msvcrt */ +MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) +{ + MSVCRT_purecall_handler ret = purecall_handler; + + TRACE("(%p)\n", function); + purecall_handler = function; + return ret; +} /********************************************************************* * _purecall (MSVCRT.@) @@ -258,5 +268,8 @@ int CDECL MSVCRT_atexit(void (*func)(void)) void CDECL _purecall(void) { TRACE("(void)\n"); + + if(purecall_handler) + purecall_handler(); _amsg_exit( 25 ); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f68790b..363223d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -79,6 +79,7 @@ typedef void (*__cdecl MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*__cdecl MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); +typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef struct {long double x;} MSVCRT__LDOUBLE; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 31da01e..254f967 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1475,3 +1475,4 @@ @ cdecl _configthreadlocale(long) @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl ___mb_cur_max_l_func(ptr) +@ cdecl _set_purecall_handler(ptr)

1 0

Huw Davies : winspool.drv: Allow for spaces in either the printer name or the spool file.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 246f741eb31799fec82cfb2908e34a330059f718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246f741eb31799fec82cfb290… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 25 11:47:53 2010 +0100 winspool.drv: Allow for spaces in either the printer name or the spool file. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7bf1bcb..8c6486b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7205,7 +7205,7 @@ BOOL WINAPI GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { char *unixname, *queue, *cmd; - char fmt[] = "lpr -P%s %s"; + char fmt[] = "lpr -P'%s' '%s'"; DWORD len; int r;

1 0

Matteo Bruni : d3dcompiler: Move shader assembler implementation from d3dx9_36.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 5dcb2e4b7ea7f7d1388601e0ad92ba082f71189c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcb2e4b7ea7f7d1388601e0a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 24 23:05:12 2010 +0200 d3dcompiler: Move shader assembler implementation from d3dx9_36. --- .gitignore | 6 +- dlls/d3dcompiler_43/Makefile.in | 7 + dlls/{d3dx9_36 => d3dcompiler_43}/asmparser.c | 2 +- dlls/{d3dx9_36 => d3dcompiler_43}/asmshader.l | 2 +- dlls/{d3dx9_36 => d3dcompiler_43}/asmshader.y | 2 +- dlls/{d3dx9_36 => d3dcompiler_43}/asmutils.c | 3 +- dlls/{d3dx9_36 => d3dcompiler_43}/bytecodewriter.c | 3 +- dlls/d3dcompiler_43/compiler.c | 463 +++++++++++++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 525 ++++++++++++++++++++ dlls/d3dx9_36/Makefile.in | 9 +- dlls/d3dx9_36/d3dx9_36_private.h | 525 -------------------- dlls/d3dx9_36/shader.c | 469 +----------------- 12 files changed, 1018 insertions(+), 998 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5dcb2e4b7ea7f7d138860…

1 0

Piotr Caban : msvcrt: Added _set_SSE2_enable stub.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 76058b14eb3b99744e154f97d2137a903a4126c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76058b14eb3b99744e154f97d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 25 14:46:05 2010 +0200 msvcrt: Added _set_SSE2_enable stub. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 155fea7..1cd1ada 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1067,7 +1067,7 @@ @ stub _searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind -@ stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ stub _set_abort_behavior @ stub _set_controlfp @ stub _set_doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 4d398c0..964a0e6 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -513,7 +513,7 @@ @ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind -@ stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 4c86af2..d3da10e 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -508,7 +508,7 @@ @ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind -@ stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c89e338..93c8047 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -919,7 +919,7 @@ @ stub _searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind -@ stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ stub _set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 84bef26..5e32e32 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -905,7 +905,7 @@ @ stub _searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind -@ stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ stub _set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1895b39..5a31ae1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -51,6 +51,15 @@ typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; +/********************************************************************* + * _set_SSE2_enable (MSVCRT.@) + */ +int CDECL MSVCRT__set_SSE2_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return flag; +} + #ifdef __x86_64__ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0640c65..31da01e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -846,7 +846,7 @@ # stub _searchenv_s # stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) -# stub _set_SSE2_enable +@ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable # stub _set_controlfp # stub _set_doserrno # stub _set_errno

1 0

Matteo Bruni : d3dcompiler: D3DAssemble stub.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 7aa026ccf55b5ae8aadb6e876a00ba5f8bdc2235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa026ccf55b5ae8aadb6e876… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 17 19:22:59 2010 +0200 d3dcompiler: D3DAssemble stub. --- dlls/d3dcompiler_43/Makefile.in | 1 + dlls/d3dcompiler_43/compiler.c | 34 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 806cb08..3e6a7d6 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = dxguid uuid C_SRCS = \ blob.c \ + compiler.c \ d3dcompiler_43_main.c RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c new file mode 100644 index 0000000..edb2118 --- /dev/null +++ b/dlls/d3dcompiler_43/compiler.c @@ -0,0 +1,34 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * 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 "wine/port.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "d3dcompiler_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); + +HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT flags, + ID3DBlob **shader, ID3DBlob **error_messages){ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index 13c13a6..e86acef 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -1,4 +1,4 @@ -@ stub D3DAssemble +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stub DebugSetMute @ stub D3DCompile @ stub D3DCompressShaders

1 0

Matteo Bruni : d3dcompiler: Move D3DAssemble tests from d3dx9_36.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 53a15436f8a3c2c310f0f1f0f1ccf2e074d04b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a15436f8a3c2c310f0f1f0f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 31 00:57:19 2010 +0200 d3dcompiler: Move D3DAssemble tests from d3dx9_36. --- dlls/d3dcompiler_43/tests/Makefile.in | 1 + dlls/d3dcompiler_43/tests/asm.c | 1558 +++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/asm.c | 1468 ------------------------------- 3 files changed, 1559 insertions(+), 1468 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53a15436f8a3c2c310f0f…

1 0

Jacek Caban : mshtml: Wine Gecko 1.1.0 release.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: e9e35e2b091772f1ae0b4723cad93cc4dc5bc7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e35e2b091772f1ae0b4723c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 14:22:25 2010 +0200 mshtml: Wine Gecko 1.1.0 release. --- dlls/mshtml/mutation.c | 13 ++- dlls/mshtml/nsembed.c | 45 +++---- dlls/mshtml/nsiface.idl | 298 +++++++++++++++++++++++++++++++---------------- dlls/mshtml/nsio.c | 20 +++- 4 files changed, 247 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e35e2b091772f1ae0b4…

1 0