January 2009 - Wine-commits

Nikolay Sivov : kernel32: Implemented GetErrorMode().
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 2013cdc604a678aba185edc1557a508f880f179a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2013cdc604a678aba185edc15… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 12 23:54:12 2009 +0300 kernel32: Implemented GetErrorMode(). --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 7 +++++++ include/winbase.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c38d27f..13c7cd4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -513,7 +513,7 @@ @ stdcall GetEnvironmentStringsW() @ stdcall GetEnvironmentVariableA(str ptr long) @ stdcall GetEnvironmentVariableW(wstr ptr long) -@ stub GetErrorMode +@ stdcall GetErrorMode() @ stdcall GetExitCodeProcess(long ptr) @ stdcall GetExitCodeThread(long ptr) @ stdcall GetExpandedNameA(str ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8b1fb9f..942b97a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2238,6 +2238,13 @@ UINT WINAPI SetErrorMode( UINT mode ) return old; } +/*********************************************************************** + * GetErrorMode (KERNEL32.@) + */ +UINT WINAPI GetErrorMode( void ) +{ + return process_error_mode; +} /********************************************************************** * TlsAlloc [KERNEL32.@] diff --git a/include/winbase.h b/include/winbase.h index 521bb16..f7a2854 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1604,6 +1604,7 @@ WINBASEAPI LPWSTR WINAPI GetEnvironmentStringsW(void); WINBASEAPI DWORD WINAPI GetEnvironmentVariableA(LPCSTR,LPSTR,DWORD); WINBASEAPI DWORD WINAPI GetEnvironmentVariableW(LPCWSTR,LPWSTR,DWORD); #define GetEnvironmentVariable WINELIB_NAME_AW(GetEnvironmentVariable) +WINBASEAPI UINT WINAPI GetErrorMode(void); WINBASEAPI BOOL WINAPI GetExitCodeProcess(HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetExitCodeThread(HANDLE,LPDWORD); WINBASEAPI DWORD WINAPI GetFileAttributesA(LPCSTR);

1 0

Stefan Dösinger : d3d9: Properly set AutoRestoreDisplayMode.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: b3b60f96028de6550ff2a5b904915cb077ad05ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b60f96028de6550ff2a5b90… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 22 19:31:49 2008 +0100 d3d9: Properly set AutoRestoreDisplayMode. --- dlls/d3d9/swapchain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index eabe366..9f86bea 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -227,6 +227,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters, &object->wineD3DSwapChain, (IUnknown*)object, D3D9CB_CreateRenderTarget, D3D9CB_CreateDepthStencilSurface, SURFACE_OPENGL);

1 0

Stefan Dösinger : d3d9: Use D3DFOG_* constants instead of plain integers.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 903c774263e8d70001670d9102bfb98002a80e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903c774263e8d70001670d910… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 1 20:02:35 2009 +0100 d3d9: Use D3DFOG_* constants instead of plain integers. --- dlls/d3d9/tests/visual.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5574313..1504a53 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1385,83 +1385,83 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) unsigned int color[11]; } test_data[] = { /* only pixel shader: */ - {0, 1, 0, 3, + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 1, 3, + {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 2, 3, + {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 3, 0, + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 3, 3, + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader */ - {1, 0, 0, 0, + {1, 0, D3DFOG_NONE, D3DFOG_NONE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 0, 3, + {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 1, 3, + {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 2, 3, + {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 3, 3, + {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader and pixel shader */ - {1, 1, 0, 3, + {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 1, 3, + {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 2, 3, + {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 3, 3, + {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, #if 0 /* FIXME: these fail on GeForce 8500 */ /* foggy vertex shader */ - {2, 0, 0, 0, + {2, 0, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 1, 0, + {2, 0, D3DFOG_EXP, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 2, 0, + {2, 0, D3DFOG_EXP2, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 3, 0, + {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, #endif /* foggy vertex shader and pixel shader */ - {2, 1, 0, 0, + {2, 1, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 1, 0, + {2, 1, D3DFOG_EXP, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 2, 0, + {2, 1, D3DFOG_EXP2, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 3, 0, + {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},

1 0

Erich Hoover : wcmd: Fix redirecting a pipe to another pipe.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 8defde719af8e51aaf2581f022b707593170c915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8defde719af8e51aaf2581f02… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 11 13:08:50 2009 -0700 wcmd: Fix redirecting a pipe to another pipe. --- programs/cmd/wcmdmain.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 595dbc8..2366fc7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1871,6 +1871,13 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } curCopyTo[(*curLen)++] = *curPos; + + /* If a redirect is immediately followed by '&' (ie. 2>&1) then + do not process that ampersand as an AND operator */ + if (thisChar == '>' && *(curPos+1) == '&') { + curCopyTo[(*curLen)++] = *(curPos+1); + curPos++; + } break; case '|': /* Pipe character only if not || */

1 0

Ge van Geldorp : rpcrt4/tests: Remove NdrVaryingArrayUnmarshall() test, it is broken on Windows.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: a9950e3ceef6a8cfbfa8d4ed60df1210724036f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9950e3ceef6a8cfbfa8d4ed6… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 12 16:51:40 2009 +0100 rpcrt4/tests: Remove NdrVaryingArrayUnmarshall() test, it is broken on Windows. The failures in rpcrt4:server on Windows are caused by an access violation thrown in NdrVaryingArrayUnmarshall() called from get_5numbers(). I've created a minimum get_5numbers() test with Microsoft tools and that throws the same access violation. The access violation disappears when zeroing out the StubMsg before calling NdrClientInitializeNew(), so my guess is Windows NdrVaryingArrayUnmarshall() uses an uninitialized member. --- dlls/rpcrt4/tests/server.c | 18 ------------------ dlls/rpcrt4/tests/server.idl | 1 - 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index fe4a1e8..ce487ee 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -660,19 +660,6 @@ s_context_handle_test(void) } void -s_get_5numbers(int count, pints_t n[5]) -{ - int i; - for (i = 0; i < count; i++) - { - n[i].pi = midl_user_allocate(sizeof(*n[i].pi)); - *n[i].pi = i; - n[i].ppi = NULL; - n[i].pppi = NULL; - } -} - -void s_get_numbers(int length, int size, pints_t n[]) { int i; @@ -1239,11 +1226,6 @@ array_tests(void) pi = HeapAlloc(GetProcessHeap(), 0, sizeof(*pi)); *pi = -1; api[0].pi = pi; - get_5numbers(1, api); - ok(api[0].pi == pi, "RPC varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); - ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); - - api[0].pi = pi; get_numbers(1, 1, api); ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 254551e..7885161 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -335,7 +335,6 @@ cpp_quote("#endif") [size_is(size), length_is(length)] pints_t numbers[]; } numbers_struct_t; - void get_5numbers([in] int count, [out, length_is(count)] pints_t pn[5]); void get_numbers([in] int length, [in] int size, [out, length_is(length), size_is(size)] pints_t pn[]); void get_numbers_struct([out] numbers_struct_t **ns);

1 0

Ge van Geldorp : user32/tests: keybd_event can send HCBT_KEYSKIPPED notifications.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 444f4a7fbcbaa329eed647b675bb9574dcee92c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444f4a7fbcbaa329eed647b67… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 12 18:03:14 2009 +0100 user32/tests: keybd_event can send HCBT_KEYSKIPPED notifications. --- dlls/user32/tests/msg.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 834b687..febace8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8743,11 +8743,22 @@ static const struct message WmKeyDownSkippedSeq[] = { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 1 }, /* XP */ { 0 } }; +static const struct message WmKeyDownWasDownSkippedSeq[] = +{ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 0x40000001 }, /* XP */ + { 0 } +}; static const struct message WmKeyUpSkippedSeq[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 0xc0000001 }, /* XP */ { 0 } }; +static const struct message WmUserKeyUpSkippedSeq[] = +{ + { WM_USER, sent }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 0xc0000001 }, /* XP */ + { 0 } +}; #define EV_STOP 0 #define EV_SENDMSG 1 @@ -9162,6 +9173,7 @@ todo_wine { ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", ret, msg.message, msg.wParam); + ok_sequence(WmKeyDownSkippedSeq, "WmKeyDownSkippedSeq", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); } @@ -9180,6 +9192,7 @@ todo_wine { ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", ret, msg.message, msg.wParam); + ok_sequence(WmKeyDownWasDownSkippedSeq, "WmKeyDownWasDownSkippedSeq", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); } @@ -9215,7 +9228,7 @@ todo_wine { ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N', "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", ret, msg.message, msg.wParam); - ok_sequence(WmUser, "WmUser", FALSE); + ok_sequence(WmUserKeyUpSkippedSeq, "WmUserKeyUpSkippedSeq", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); }

1 0

Austin English : ole32: Add tests for CoInitializeEx.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 753affe48d317025e34cce01c717211fd9559641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753affe48d317025e34cce01c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 13 03:52:41 2009 -0600 ole32: Add tests for CoInitializeEx. --- dlls/ole32/tests/compobj.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 02dc080..450db78 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1017,6 +1017,27 @@ static void test_CoGetObjectContext(void) CoUninitialize(); } +static void test_CoInitializeEx(void) +{ + HRESULT hr; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + /* Calling OleInitialize for the first time should yield S_OK even with + * apartment already initialized by previous CoInitialize(Ex) calls. */ + hr = OleInitialize(NULL); + todo_wine ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + /* Subsequent calls to OleInitialize should return S_FALSE */ + hr = OleInitialize(NULL); + ok(hr == S_FALSE, "Expected S_FALSE, hr = 0x%08x\n", hr); + + /* Cleanup */ + CoUninitialize(); + OleUninitialize(); +} + START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); @@ -1045,4 +1066,5 @@ START_TEST(compobj) test_registered_object_thread_affinity(); test_CoFreeUnusedLibraries(); test_CoGetObjectContext(); + test_CoInitializeEx(); }

1 0

David Adam : d3dx9: Fix falling tests in native windows.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: be964897aaabac04a75a2bc8d8186c81801e6f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be964897aaabac04a75a2bc8d… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Jan 13 12:22:25 2009 +0100 d3dx9: Fix falling tests in native windows. --- dlls/d3dx9_36/math.c | 12 +++++++++++- dlls/d3dx9_36/tests/math.c | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 542e408..13b8bd3 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -37,6 +37,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D( CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation) { + D3DXMATRIX m1, m2, m3, m4, m5; D3DXQUATERNION rot; D3DXVECTOR3 rot_center, trans; @@ -71,7 +72,16 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D( trans.z=0.0f; } - D3DXMatrixAffineTransformation(pout, scaling, &rot_center, &rot, &trans); + D3DXMatrixScaling(&m1, scaling, scaling, 1.0f); + D3DXMatrixTranslation(&m2, -rot_center.x, -rot_center.y, -rot_center.z); + D3DXMatrixTranslation(&m4, rot_center.x, rot_center.y, rot_center.z); + D3DXMatrixRotationQuaternion(&m3, &rot); + D3DXMatrixTranslation(&m5, trans.x, trans.y, trans.z); + + D3DXMatrixMultiply(&m1, &m1, &m2); + D3DXMatrixMultiply(&m1, &m1, &m3); + D3DXMatrixMultiply(&m1, &m1, &m4); + D3DXMatrixMultiply(pout, &m1, &m5); return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2240fb0..50db67b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -147,7 +147,7 @@ static void test_Matrix_AffineTransformation2D(void) U(exp_mat).m[3][1] = 6.401924f; U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f; - U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[2][2] = 1.0f; U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f; @@ -177,7 +177,7 @@ static void test_Matrix_AffineTransformation2D(void) U(exp_mat).m[3][1] = -0.598076f; U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f; - U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[2][2] = 1.0f; U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f; @@ -207,7 +207,7 @@ static void test_Matrix_AffineTransformation2D(void) U(exp_mat).m[3][1] = 7.0f; U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f; - U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[2][2] = 1.0f; U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f; @@ -234,7 +234,7 @@ static void test_Matrix_AffineTransformation2D(void) U(exp_mat).m[3][1] = 0.0f; U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f; - U(exp_mat).m[2][2] = -20.0f; + U(exp_mat).m[2][2] = 1.0f; U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f;

1 0

Andrey Turkin : setupapi: Add support for DIRID_PRINTPROCESSOR.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 000136ac301327a85fecbd0aef788bc1629b6121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000136ac301327a85fecbd0ae… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Jan 13 13:49:28 2009 +0300 setupapi: Add support for DIRID_PRINTPROCESSOR. --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/dirid.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 91bc87b..e6d3e80 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 wintrust ole32 +DELAYIMPORTS = shell32 wintrust ole32 winspool C_SRCS = \ devinst.c \ diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index 89f92fd..419f157 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winspool.h" #include "setupapi.h" #include "shlobj.h" #include "wine/unicode.h" @@ -86,6 +87,7 @@ static const WCHAR *create_system_dirid( int dirid ) WCHAR buffer[MAX_PATH+32], *str; int len; + DWORD needed; switch(dirid) { @@ -138,8 +140,14 @@ static const WCHAR *create_system_dirid( int dirid ) return get_csidl_dir(CSIDL_PROFILE); case DIRID_LOADER: return C_Root; /* FIXME */ + case DIRID_PRINTPROCESSOR: + if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) + { + WARN( "cannot retrieve print processor directory\n" ); + return get_unknown_dirid(); + } + break; case DIRID_COLOR: /* FIXME */ - case DIRID_PRINTPROCESSOR: /* FIXME */ default: FIXME( "unknown dirid %d\n", dirid ); return get_unknown_dirid();

1 0

Erich Hoover : wcmd: Handle batch scripts containing quotes within quotes.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 423929ad1096319a7788ceac1dc4b338c82cbd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=423929ad1096319a7788ceac1… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 11 15:47:53 2009 -0700 wcmd: Handle batch scripts containing quotes within quotes. --- programs/cmd/wcmdmain.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4c513fb..595dbc8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1676,7 +1676,7 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readFrom) { WCHAR *curPos; - BOOL inQuotes = FALSE; + int inQuotes = 0; WCHAR curString[MAXSTRING]; int curStringLen = 0; WCHAR curRedirs[MAXSTRING]; @@ -1900,7 +1900,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } break; - case '"': inQuotes = !inQuotes; + case '"': if (inQuotes && *(curPos+1) == ' ') { + inQuotes--; /* An end quote must be proceeded by a space */ + } else { + inQuotes++; /* Quotes within quotes are fun! */ + } curCopyTo[(*curLen)++] = *curPos; lastWasRedirect = FALSE; break; @@ -2042,7 +2046,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { inRem = FALSE; prevDelim = CMD_NONE; - inQuotes = FALSE; + inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR)); /* Read more, skipping any blank lines */

1 0