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

Louis Lenders : mscoree: Improve GetCORSytemDirectory.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 127af150e0c8e307efb9980dc29640df3aa0e0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=127af150e0c8e307efb9980dc… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 25 14:53:05 2010 +0200 mscoree: Improve GetCORSytemDirectory. --- dlls/mscoree/mscoree_main.c | 51 +++++++++++++++++++++++++++++++++++++++-- dlls/mscoree/tests/mscoree.c | 4 +- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index d1f035c..e64f9b0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -79,6 +79,28 @@ static BOOL get_mono_path(LPWSTR path) return TRUE; } +static BOOL get_install_root(LPWSTR install_dir) +{ + const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; + const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; + + DWORD len; + HKEY key; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) + return FALSE; + + len = MAX_PATH; + if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) + { + RegCloseKey(key); + return FALSE; + } + RegCloseKey(key); + + return TRUE; +} + static CRITICAL_SECTION mono_lib_cs; static CRITICAL_SECTION_DEBUG mono_lib_cs_debug = { @@ -336,12 +358,35 @@ HRESULT WINAPI _CorValidateImage(PVOID* imageBase, LPCWSTR imageName) HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - FIXME("(%p, %d, %p): stub!\n", pbuffer, cchBuffer, dwLength); + static const WCHAR slash[] = {'\\',0}; + WCHAR system_dir[MAX_PATH]; + WCHAR version[MAX_PATH]; + + FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); if (!dwLength) return E_POINTER; - *dwLength = 0; + if (!pbuffer) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (!get_install_root(system_dir)) + { + ERR("error reading registry key for installroot, returning empty path\n"); + *dwLength = 0; + } + else + { + GetCORVersion(version, MAX_PATH, dwLength); + lstrcatW(system_dir, version); + lstrcatW(system_dir, slash); + *dwLength = lstrlenW(system_dir) + 1; + + if (cchBuffer < *dwLength) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + lstrcpyW(pbuffer, system_dir); + } return S_OK; } @@ -355,7 +400,7 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) if (!dwLength || !pbuffer) return E_POINTER; - *dwLength = lstrlenW(version); + *dwLength = lstrlenW(version) + 1; if (cchBuffer < *dwLength) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index e66a44b..b513ade 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -71,10 +71,10 @@ static void test_versioninfo(void) 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); + 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); + 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);

1 0

Jörg Höhle : mcicda: Opens d, d:, d:\, d: \foo since w2k. Only d: is portable.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 5bff616faa3ce967d2222eda4d2f9700ebf9e130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bff616faa3ce967d2222eda4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Aug 13 14:58:55 2010 +0200 mcicda: Opens d, d:, d:\, d:\foo since w2k. Only d: is portable. --- dlls/mcicda/mcicda.c | 14 +++++++------- dlls/winmm/tests/mcicda.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 51727ee..0334f2e 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -428,23 +428,23 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar if (dwFlags & MCI_OPEN_ELEMENT) { if (dwFlags & MCI_OPEN_ELEMENT_ID) { WARN("MCI_OPEN_ELEMENT_ID %p! Abort\n", lpOpenParms->lpstrElementName); - ret = MCIERR_NO_ELEMENT_ALLOWED; + ret = MCIERR_FLAGS_NOT_COMPATIBLE; goto the_error; } TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || - (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) + /* Only the first letter counts since w2k + * Win9x-NT accept only d: and w98SE accepts d:\foobar as well. + * Play d:\Track03.cda plays from the first track, not #3. */ + if (!isalpha(lpOpenParms->lpstrElementName[0])) { - WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", - debugstr_w(lpOpenParms->lpstrElementName)); - ret = MCIERR_NO_ELEMENT_ALLOWED; + ret = MCIERR_INVALID_FILE; goto the_error; } drive = toupper(lpOpenParms->lpstrElementName[0]); root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; if (GetDriveTypeW(root) != DRIVE_CDROM) { - ret = MCIERR_INVALID_DEVICE_NAME; + ret = MCIERR_INVALID_FILE; goto the_error; } } diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index 14484a5..3dc610a 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -26,6 +26,7 @@ typedef union { MCI_STATUS_PARMS status; MCI_GETDEVCAPS_PARMS caps; + MCI_OPEN_PARMS open; MCI_PLAY_PARMS play; MCI_SEEK_PARMS seek; MCI_SAVE_PARMS save; @@ -151,8 +152,6 @@ static DWORD MSF_Add(DWORD d1, DWORD d2) return MCI_MAKE_MSF(m,s,f); } -/* TODO test_open "open X: type cdaudio" etc. */ -/* TODO demonstrate open X:\ fails on win95 while open X: works. */ /* TODO show that shareable flag is not what Wine implements. */ static void test_play(HWND hwnd) @@ -607,6 +606,46 @@ static void test_play(HWND hwnd) test_notification(hwnd, "STOP final", 0); } +static void test_openclose(HWND hwnd) +{ + MCIDEVICEID wDeviceID; + MCI_PARMS_UNION parm; + MCIERROR err; + char drive[] = {'a',':','\\','X','\0'}; + + /* Bug in native since NT: After OPEN "c" without MCI_OPEN_ALIAS fails with + * MCIERR_DEVICE_OPEN, any subsequent OPEN fails with EXTENSION_NOT_FOUND! */ + parm.open.lpstrAlias = "x"; /* with alias, OPEN "c" behaves normally */ + parm.open.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO; + parm.open.lpstrElementName = drive; + for ( ; strlen(drive); drive[strlen(drive)-1] = 0) + for (drive[0] = 'a'; drive[0] <= 'z'; drive[0]++) { + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID + | MCI_OPEN_SHAREABLE | MCI_OPEN_ALIAS, (DWORD_PTR)&parm); + ok(!err || err == MCIERR_INVALID_FILE, "OPEN %s type: %s\n", drive, dbg_mcierr(err)); + /* open X:\ fails in Win9x/NT. Only open X: works everywhere. */ + if(!err) { + wDeviceID = parm.open.wDeviceID; + trace("ok with %s\n", drive); + err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); + ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + } + } + drive[0] = '\\'; + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID + | MCI_OPEN_SHAREABLE, (DWORD_PTR)&parm); + ok(err == MCIERR_INVALID_FILE, "OPEN %s type: %s\n", drive, dbg_mcierr(err)); + if(!err) mciSendCommand(parm.open.wDeviceID, MCI_CLOSE, 0, 0); + + if (0) { + parm.open.lpstrElementName = (LPCSTR)0xDEADBEEF; + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT|MCI_OPEN_ELEMENT_ID + | MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE, (DWORD_PTR)&parm); + todo_wine ok(err == MCIERR_FLAGS_NOT_COMPATIBLE, "OPEN elt_ID: %s\n", dbg_mcierr(err)); + if(!err) mciSendCommand(parm.open.wDeviceID, MCI_CLOSE, 0, 0); + } +} + START_TEST(mcicda) { MCIERROR err; @@ -615,6 +654,7 @@ START_TEST(mcicda) 0, 0, 0, NULL); test_notification(hwnd, "-prior to tests-", 0); test_play(hwnd); + test_openclose(hwnd); err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_STOP, 0, 0); todo_wine ok(!err || broken(err == MCIERR_HARDWARE /* blank CD or testbot without CD-ROM */), "STOP all returned %s\n", dbg_mcierr(err));

1 0

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

25 Aug '10

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

Matteo Bruni : d3dcompiler: D3DAssemble stub.
by Alexandre Julliard 25 Aug '10

25 Aug '10

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 shader assembler implementation from d3dx9_36.
by Alexandre Julliard 25 Aug '10

25 Aug '10

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

Matteo Bruni : d3dcompiler: Move D3DAssemble tests from d3dx9_36.
by Alexandre Julliard 25 Aug '10

25 Aug '10

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

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

25 Aug '10

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

Jacek Caban : mshtml: Wine Gecko 1.1.0 release.
by Alexandre Julliard 25 Aug '10

25 Aug '10

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

Jacek Caban : mshtml: Added Gecko64 support.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 0b1530545f74e9a75bb2b47a87f44cd13553e223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1530545f74e9a75bb2b47a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 14:22:39 2010 +0200 mshtml: Added Gecko64 support. --- dlls/mshtml/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 65faa5a..1079713 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #ifdef __i386__ #define GECKO_ARCH "x86" +#elif defined(__x86_64__) +#define GECKO_ARCH "x86_64" #else #define GECKO_ARCH "" #endif

1 0

Piotr Caban : msvcrt: Added _set_SSE2_enable stub.
by Alexandre Julliard 25 Aug '10

25 Aug '10

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