September 2010 - Wine-commits

Jörg Höhle : winmm/tests: MCI_STATUS returns DWORD_PTR, unlike other commands.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 0030ef8d267ffac70017be91e5d0b96d2234ffc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0030ef8d267ffac70017be91e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 24 06:44:13 2010 +0100 winmm/tests: MCI_STATUS returns DWORD_PTR, unlike other commands. --- dlls/winmm/tests/mci.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 236a722..2918dc7 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -162,6 +162,83 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } +static void test_mciParser(HWND hwnd) +{ + MCIERROR err; + MCIDEVICEID wDeviceID; + MCI_PARMS_UNION parm; + char buf[1024]; + memset(buf, 0, sizeof(buf)); + test_notification(hwnd, "-prior to parser test-", 0); + + /* Get a handle on an MCI device, works even without sound. */ + parm.open.lpstrDeviceType = "waveaudio"; + parm.open.lpstrElementName = ""; /* "new" at the command level */ + parm.open.lpstrAlias = "x"; /* to enable mciSendString */ + parm.open.dwCallback = (DWORD_PTR)hwnd; + err = mciSendCommand(0, MCI_OPEN, + MCI_OPEN_ELEMENT | MCI_OPEN_TYPE | MCI_OPEN_ALIAS | MCI_NOTIFY, + (DWORD_PTR)&parm); + ok(!err,"mciCommand open new type waveaudio alias x notify: %s\n", dbg_mcierr(err)); + wDeviceID = parm.open.wDeviceID; + ok(!strcmp(parm.open.lpstrDeviceType,"waveaudio"), "open modified device type\n"); + + test_notification(hwnd, "MCI_OPEN", MCI_NOTIFY_SUCCESSFUL); + test_notification(hwnd, "MCI_OPEN no #2", 0); + + /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ + parm.status.dwItem = MCI_STATUS_TIME_FORMAT; + parm.status.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand status time format: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_FORMAT_MILLISECONDS==parm.status.dwReturn,"status time format: %ld\n",parm.status.dwReturn); + + parm.status.dwItem = MCI_STATUS_MODE; + parm.status.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand status mode: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_MODE_STOP==parm.status.dwReturn,"STATUS mode: %ld\n",parm.status.dwReturn); + + err = mciSendString("status x mode", buf, sizeof(buf), hwnd); + ok(!err,"status mode: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "stopped"), "status mode is %s\n", buf); + + parm.caps.dwItem = MCI_GETDEVCAPS_USES_FILES; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps files: %s\n", dbg_mcierr(err)); + if(!err) ok(1==parm.caps.dwReturn,"getdevcaps files: %d\n",parm.caps.dwReturn); + + parm.caps.dwItem = MCI_GETDEVCAPS_HAS_VIDEO; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps video: %s\n", dbg_mcierr(err)); + if(!err) ok(0==parm.caps.dwReturn,"getdevcaps video: %d\n",parm.caps.dwReturn); + + parm.caps.dwItem = MCI_GETDEVCAPS_DEVICE_TYPE; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps video: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_DEVTYPE_WAVEFORM_AUDIO==parm.caps.dwReturn,"getdevcaps device type: %d\n",parm.caps.dwReturn); + + err = mciSendString("capability x uses files", buf, sizeof(buf), hwnd); + ok(!err,"capability files: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "true"), "capability files is %s\n", buf); + + err = mciSendString("capability x has video", buf, sizeof(buf), hwnd); + ok(!err,"capability video: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "false"), "capability video is %s\n", buf); + + err = mciSendString("capability x device type", buf, sizeof(buf), hwnd); + ok(!err,"capability device type: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "waveaudio"), "capability device type is %s\n", buf); + + err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); + ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + + test_notification(hwnd, "-end of 1st set-", 0); +} + static void test_openCloseWAVE(HWND hwnd) { MCIERROR err; @@ -1012,6 +1089,7 @@ START_TEST(mci) HWND hwnd; hwnd = CreateWindowExA(0, "static", "winmm test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); + test_mciParser(hwnd); test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); test_playWAVE(hwnd);

1 0

Jörg Höhle : winmm/tests: Add MCI parser tests.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: d223b30bd6be4cf45a507bd51114fa87ca0cf7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d223b30bd6be4cf45a507bd51… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 6 07:31:55 2010 +0200 winmm/tests: Add MCI parser tests. --- dlls/winmm/tests/mci.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 2918dc7..d490a04 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -186,6 +186,91 @@ static void test_mciParser(HWND hwnd) test_notification(hwnd, "MCI_OPEN", MCI_NOTIFY_SUCCESSFUL); test_notification(hwnd, "MCI_OPEN no #2", 0); + err = mciSendString("open avivideo alias a", buf, sizeof(buf), hwnd); + ok(!err,"open another: %s\n", dbg_mcierr(err)); + + err = mciSendString("", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + + err = mciSendString("open", buf, sizeof(buf), NULL); + ok(err==MCIERR_MISSING_DEVICE_NAME,"open void: %s\n", dbg_mcierr(err)); + + err = mciSendString("open notify", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open notify: %s\n", dbg_mcierr(err)); + + err = mciSendString("open new", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_NEW_REQUIRES_ALIAS,"open new: %s\n", dbg_mcierr(err)); + + err = mciSendString("open new type waveaudio alias r shareable shareable", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_DUPLICATE_FLAGS,"open new: %s\n", dbg_mcierr(err)); + if(!err) mciSendString("close r", NULL, 0, NULL); + + err = mciSendString("status x position wait wait", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_DUPLICATE_FLAGS,"status wait wait: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x length length", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status 2xlength: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x length position", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + + err = mciSendString("set x time format milliseconds time format ms", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + + /* device's response, not a parser test */ + err = mciSendString("status x", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio nokeyword: %s\n", dbg_mcierr(err)); + + err = mciSendString("status a", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_UNSUPPORTED_FUNCTION,"status avivideo nokeyword: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x track", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_INTEGER,"status waveaudio no track: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x track 3", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio track 3: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x 2 track 3", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_OUTOFRANGE,"status 2(position) track 3: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x 4", buf, sizeof(buf), hwnd); + ok(!err,"status 4(mode): %s\n", dbg_mcierr(err)); + if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); + + err = mciSendString("status x 4 notify", buf, sizeof(buf), hwnd); + todo_wine ok(!err,"status 4(mode) notify: %s\n", dbg_mcierr(err)); + if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); + test_notification(hwnd, "status 4 notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); + + err = mciSendString("set x milliseconds", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_UNRECOGNIZED_KEYWORD,"set milliseconds: %s\n", dbg_mcierr(err)); + + err = mciSendString("set x milliseconds ms", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_UNRECOGNIZED_KEYWORD,"set milliseconds ms: %s\n", dbg_mcierr(err)); + + err = mciSendString("capability x can save", buf, sizeof(buf), hwnd); + todo_wine ok(!err,"capability can (space) save: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x nsa", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_BAD_CONSTANT,"status nsa: %s\n", dbg_mcierr(err)); + + err = mciSendString("status all time format", buf, sizeof(buf), hwnd); + ok(err==MCIERR_CANNOT_USE_ALL,"status all: %s\n", dbg_mcierr(err)); + + err = mciSendString("cue all", buf, sizeof(buf), NULL); + ok(err==MCIERR_UNRECOGNIZED_COMMAND,"cue all: %s\n", dbg_mcierr(err)); + + err = mciSendString("open all", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_CANNOT_USE_ALL,"open all: %s\n", dbg_mcierr(err)); + + err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); + + /*w9X-w2k report code from device last opened, newer versions compare them all + * and return the one error code or MCIERR_MULTIPLE if they differ. */ + err = mciSendString("pause all", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MULTIPLE || broken(err==MCIERR_NONAPPLICABLE_FUNCTION),"pause all: %s\n", dbg_mcierr(err)); + /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; parm.status.dwReturn = 0xFEEDABAD; @@ -236,6 +321,9 @@ static void test_mciParser(HWND hwnd) err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + err = mciSendString("close a", buf, sizeof(buf), hwnd); + ok(!err,"close avi: %s\n", dbg_mcierr(err)); + test_notification(hwnd, "-end of 1st set-", 0); }

1 0

Hans Leidekker : msi: Return an error from MsiDatabaseGetPrimaryKeys if the table does not exist .
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 18ebf2c57610e3474876e908bccc5b61ee8d73e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ebf2c57610e3474876e908b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:20:36 2010 +0200 msi: Return an error from MsiDatabaseGetPrimaryKeys if the table does not exist. --- dlls/msi/msiquery.c | 3 +++ dlls/msi/tests/record.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index df81a74..c603e6a 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -901,6 +901,9 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, MSIQUERY *query = NULL; UINT r; + if (!TABLE_Exists( db, table )) + return ERROR_INVALID_TABLE; + r = MSI_OpenQuery( db, &query, sql, table ); if( r != ERROR_SUCCESS ) return r; diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 0b80779..2de43cb 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -589,6 +589,9 @@ static void test_fieldzero(void) MsiCloseHandle(rec); + r = MsiDatabaseGetPrimaryKeysA(hdb, "nosuchtable", &rec); + ok(r == ERROR_INVALID_TABLE, "Expected ERROR_INVALID_TABLE, got %d\n", r); + query = "SELECT * FROM `drone` WHERE `id` = 1"; r = MsiDatabaseOpenView(hdb, query, &hview); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Hans Leidekker : msi: Set the MsiAMD64 and Msix64 properties on 64-bit.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 3730300a298fa05ab04248e41a21ff579517bc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3730300a298fa05ab04248e41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:20:54 2010 +0200 msi: Set the MsiAMD64 and Msix64 properties on 64-bit. --- dlls/msi/package.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 323968c..bb04ab0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -684,6 +684,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + static const WCHAR szMsiAMD64[] = { 'M','s','i','A','M','D','6','4',0 }; + static const WCHAR szMsix64[] = { 'M','s','i','x','6','4',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -845,6 +847,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); msi_set_property( package->db, szIntel, bufstr ); } + else if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); + msi_set_property( package->db, szMsiAMD64, bufstr ); + msi_set_property( package->db, szMsix64, bufstr ); + } /* Screen properties. */ dc = GetDC(0);

1 0

Hans Leidekker : msi: Set the System64Folder property on 64-bit.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: d2f107472537bad5a9f9fd45d53e396c49991d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f107472537bad5a9f9fd45d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:21:12 2010 +0200 msi: Set the System64Folder property on 64-bit. --- dlls/msi/package.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bb04ab0..aa0d1b5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -686,6 +686,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szMsiAMD64[] = { 'M','s','i','A','M','D','6','4',0 }; static const WCHAR szMsix64[] = { 'M','s','i','x','6','4',0 }; + static const WCHAR szSystem64Folder[] = { 'S','y','s','t','e','m','6','4','F','o','l','d','e','r',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -852,6 +853,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); msi_set_property( package->db, szMsiAMD64, bufstr ); msi_set_property( package->db, szMsix64, bufstr ); + + GetSystemDirectoryW( pth, MAX_PATH ); + msi_set_property( package->db, szSystem64Folder, pth ); } /* Screen properties. */

1 0

Hans Leidekker : msi/tests: Add tests for 64-bit properties.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 2fb648c04f706f7318ca27a66885b47b527b5c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb648c04f706f7318ca27a66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:21:29 2010 +0200 msi/tests: Add tests for 64-bit properties. --- dlls/msi/tests/package.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f9d6a63..225a0e3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -41,6 +41,7 @@ static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static void (WINAPI *pGetSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); @@ -63,6 +64,7 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExW) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, GetSystemInfo) hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -9550,6 +9552,7 @@ static void test_installprops(void) UINT r; REGSAM access = KEY_ALL_ACCESS; BOOL wow64; + SYSTEM_INFO si; if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64) access |= KEY_WOW64_64KEY; @@ -9660,6 +9663,31 @@ static void test_installprops(void) r = MsiGetProperty(hpkg, "ScreenY", buf, &size); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + if (pGetSystemInfo) + { + pGetSystemInfo(&si); + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Msix64", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "System64Folder", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + } + } + CloseHandle(hkey1); CloseHandle(hkey2); MsiCloseHandle(hpkg);

1 0

Matteo Bruni : include: Add D3DXCompileShader declarations.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: f26ab721f159dd205aef1fb4f1b6c0d8e7fb87ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26ab721f159dd205aef1fb4f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 1 22:48:02 2010 +0200 include: Add D3DXCompileShader declarations. --- include/d3dx9shader.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index c8380bc..357ace2 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -264,13 +264,13 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); - HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, CONST D3DXMACRO* defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); +#define D3DXAssembleShaderFromFile WINELIB_NAME_AW(D3DXAssembleShaderFromFile) HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, LPCSTR resource, @@ -279,7 +279,6 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); - HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, LPCWSTR resource, CONST D3DXMACRO* defines, @@ -287,6 +286,7 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); +#define D3DXAssembleShaderFromResource WINELIB_NAME_AW(D3DXAssembleShaderFromResource) HRESULT WINAPI D3DXAssembleShader(LPCSTR data, UINT data_len, @@ -296,6 +296,59 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); +HRESULT WINAPI D3DXCompileShader(LPCSTR src_data, + UINT data_len, + const D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR function_name, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table); + +HRESULT WINAPI D3DXCompileShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table); +HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table); +#define D3DXCompileShaderFromFile WINELIB_NAME_AW(D3DXCompileShaderFromFile) + +HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table); +HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table); +#define D3DXCompileShaderFromResource WINELIB_NAME_AW(D3DXCompileShaderFromResource) + HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, DWORD flags, LPD3DXCONSTANTTABLE* constant_table);

1 0

Matteo Bruni : d3dx9: Implement D3DXCompileShaderFromFile.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: de8f35bba87d0dc53e57f197f0ea28b90b5a3ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8f35bba87d0dc53e57f197f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 1 22:53:13 2010 +0200 d3dx9: Implement D3DXCompileShaderFromFile. --- dlls/d3dx9_36/shader.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 35665d6..d6e3ecc 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -383,6 +383,81 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, return hr; } +HRESULT WINAPI D3DXCompileShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + LPWSTR filename_w = NULL; + DWORD len; + HRESULT ret; + + if (!filename) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename_w) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + ret = D3DXCompileShaderFromFileW(filename_w, defines, include, + entrypoint, profile, flags, + shader, error_messages, constant_table); + + HeapFree(GetProcessHeap(), 0, filename_w); + return ret; +} + +HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + void *buffer; + DWORD len; + HRESULT hr; + struct D3DXIncludeImpl includefromfile; + char *filename_a; + + if (FAILED(map_view_of_file(filename, &buffer, &len))) + return D3DXERR_INVALIDDATA; + + if (!include) + { + includefromfile.lpVtbl = &D3DXInclude_Vtbl; + include = (LPD3DXINCLUDE)&includefromfile; + } + + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + { + UnmapViewOfFile(buffer); + return E_OUTOFMEMORY; + } + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = D3DCompile(buffer, len, filename_a, (D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, entrypoint, profile, flags, 0, + (ID3DBlob **)shader, (ID3DBlob **)error_messages); + + if (SUCCEEDED(hr) && constant_table) + hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), + constant_table); + + HeapFree(GetProcessHeap(), 0, filename_a); + UnmapViewOfFile(buffer); + return hr; +} + static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl {

1 0

Matteo Bruni : d3dx9: Implement D3DXCompileShaderFromResource.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 5a5af75f04e2df1813936af24a84dd6a2da20a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5af75f04e2df1813936af24… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 1 23:15:44 2010 +0200 d3dx9: Implement D3DXCompileShaderFromResource. --- dlls/d3dx9_36/shader.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d6e3ecc..1ddcde7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -458,6 +458,52 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, return hr; } +HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, + flags, shader, error_messages, constant_table); +} + +HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, + flags, shader, error_messages, constant_table); +} + static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl {

1 0

Louis Lenders : shell32: Add stubbed SHGetKnownFolderPath.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: dd1a47093e7577a705d64355ac01136edd90f255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1a47093e7577a705d64355a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Sep 2 13:10:44 2010 +0200 shell32: Add stubbed SHGetKnownFolderPath. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 10 ++++++++++ include/shlobj.h | 1 + include/shtypes.idl | 12 ++++++++++++ 4 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 99f9879..719fc9a 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -366,6 +366,7 @@ @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) +@ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNameFromIDList(ptr long ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 451d6ff..6083b45 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -40,6 +40,7 @@ #include "winuser.h" #include "shlobj.h" +#include "shtypes.h" #include "shresdef.h" #include "shell32_main.h" #include "undocshell.h" @@ -2502,3 +2503,12 @@ HRESULT WINAPI SHGetSpecialFolderLocation( hr = SHGetFolderLocation(hwndOwner, nFolder, NULL, 0, ppidl); return hr; } + +/************************************************************************* + * SHGetKnownFolderPath [SHELL32.@] + */ +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PWSTR *path) +{ + FIXME("(%s, %d, %p, %p) stub!\n", debugstr_guid(rfid), flags, token, path); + return E_NOTIMPL; +} diff --git a/include/shlobj.h b/include/shlobj.h index 0aef3cf..cda1306 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -62,6 +62,7 @@ HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) diff --git a/include/shtypes.idl b/include/shtypes.idl index dd0c5f6..091e509 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -111,3 +111,15 @@ typedef [v1_enum] enum tagSHCOLSTATE } SHCOLSTATE; typedef DWORD SHCOLSTATEF; + +typedef GUID KNOWNFOLDERID; + +cpp_quote("#if 0") +typedef KNOWNFOLDERID *REFKNOWNFOLDERID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID &") +cpp_quote("#else") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST") +cpp_quote("#endif")

1 0