September 2010 - Wine-commits

Rudolf Mayerhofer : kernel32: Implement GetUserDefaultLocaleName using users default LCID.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 2637bb9de7feacf2df5a8c1528bd22dab2920174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2637bb9de7feacf2df5a8c152… Author: Rudolf Mayerhofer <rm(a)eightyfive.net> Date: Wed Sep 15 11:08:20 2010 +0200 kernel32: Implement GetUserDefaultLocaleName using users default LCID. --- dlls/kernel32/locale.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8d8042b..168bb19 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3801,6 +3801,10 @@ INT WINAPI GetGeoInfoA(GEOID GeoId, GEOTYPE GeoType, LPSTR lpGeoData, INT WINAPI GetUserDefaultLocaleName(LPWSTR localename, int buffersize) { - FIXME("(%p, %d) stub!\n", localename, buffersize); - return 0; + LCID userlcid; + + TRACE("%p, %d\n", localename, buffersize); + + userlcid = GetUserDefaultLCID(); + return LCIDToLocaleName(userlcid, localename, buffersize, 0); }

1 0

Alexander Morozov : crypt32/tests: Add a test for CryptSignMessage.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 665ede7517a8a1cabfd82dad09e28bda42951abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=665ede7517a8a1cabfd82dad0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jul 1 16:23:00 2010 +0400 crypt32/tests: Add a test for CryptSignMessage. --- dlls/crypt32/tests/message.c | 401 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 401 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=665ede7517a8a1cabfd82…

1 0

Alexandre Julliard : ntdll/tests: Fix the image protection test on Mac OS where the image limits are only approximative .
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: e317b6068e8b9b303fe9e07df58306984477b73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e317b6068e8b9b303fe9e07df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 10:58:00 2010 -0500 ntdll/tests: Fix the image protection test on Mac OS where the image limits are only approximative. --- dlls/ntdll/tests/info.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ffeb22a..ee3d0c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1077,11 +1077,14 @@ static void test_queryvirtualmemory(void) static char rwtestbuf[42]; MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; + HMODULE module; trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); + module = GetModuleHandle( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); @@ -1105,9 +1108,11 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); trace("Check flags of read-only data at %p\n", teststring); + module = GetModuleHandle( NULL ); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); if (mbi.Protect != PAGE_READONLY) @@ -1117,6 +1122,7 @@ static void test_queryvirtualmemory(void) status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); @@ -1125,9 +1131,13 @@ static void test_queryvirtualmemory(void) status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + if (mbi.AllocationBase == module) + { + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + } + else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ } static void test_affinity(void)

1 0

Andrew Nguyen : msxml3: Correct the prototype of DOMDocument_create when compiling without libxml2 .
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: c858e583cdb4c4cecd77d93895891a4028a2b48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c858e583cdb4c4cecd77d9389… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Sep 15 11:16:30 2010 -0500 msxml3: Correct the prototype of DOMDocument_create when compiling without libxml2. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8aa5332..f086e80 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2521,7 +2521,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) #else -HRESULT DOMDocument_create(IUnknown *pUnkOuter, void **ppObj) +HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) { MESSAGE("This program tried to use a DOMDocument object, but\n" "libxml2 support was not present at compile time.\n");

1 0

Alexandre Julliard : winebuild: Don' t add extra CPU flags to stubs if they have some already.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: efc88fe317ca34b01b48955252be1f10ae2c08bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc88fe317ca34b01b4895525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 12:45:04 2010 -0500 winebuild: Don't add extra CPU flags to stubs if they have some already. --- tools/winebuild/parser.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bc483c9..755084e 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -385,7 +385,11 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) { odp->u.func.nb_args = 0; odp->link_name = xstrdup(""); - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); /* don't bother generating stubs for Winelib */ + /* don't bother generating stubs for Winelib */ + if (odp->flags & FLAG_CPU_MASK) + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + else + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); return 1; }

1 0

Alexandre Julliard : winemp3.acm: Fix a couple of compiler warnings on Mac OS.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 6dc12cdb31b185f913c0ad5d92b5fe5ef257b5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc12cdb31b185f913c0ad5d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 18:03:41 2010 -0500 winemp3.acm: Fix a couple of compiler warnings on Mac OS. --- dlls/winemp3.acm/mpegl3.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 3c60fff..2ee8430 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -290,7 +290,7 @@ static const unsigned short Mp3SampleRates[2][4] = typedef struct tagAcmMpeg3Data { - LRESULT (*convert)(PACMDRVSTREAMINSTANCE adsi, const unsigned char*, + LRESULT (*convert)(PACMDRVSTREAMINSTANCE adsi, unsigned char*, LPDWORD, unsigned char*, LPDWORD); AudioConverterRef acr; AudioStreamBasicDescription in,out; @@ -395,7 +395,7 @@ static SInt32 Mp3GetPacketLength(const unsigned char* src) and *nsrc to the length of the unwanted data and return no error. */ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, + unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) { OSStatus err; @@ -406,7 +406,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, TRACE("ndst %u %p <- %u %p\n", *ndst, dst, *nsrc, src); - TRACE("First 16 bytes to input: %s\n", wine_dbgstr_an(src, 16)); + TRACE("First 16 bytes to input: %s\n", wine_dbgstr_an((const char *)src, 16)); /* Parse ID3 tag */ if (!memcmp(src, "ID3", 3) && amd->tagBytesLeft == -1) @@ -429,7 +429,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, { src += amd->tagBytesLeft; *nsrc -= amd->tagBytesLeft; - TRACE("Skipping %d for ID3 tag\n", amd->tagBytesLeft); + TRACE("Skipping %ld for ID3 tag\n", amd->tagBytesLeft); } /* @@ -460,7 +460,7 @@ static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, syncSkip = psrc - src; src += syncSkip; *nsrc -= syncSkip; - TRACE("Skipping %d for frame sync\n", syncSkip); + TRACE("Skipping %ld for frame sync\n", syncSkip); } break; }

1 0

Henri Verbeet : ntdll: Do not return STATUS_SUCCESS on failure in NtQueryObject().
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 689c45b9b9f1815e9567d26570a491f6692d61d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689c45b9b9f1815e9567d2657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:03 2010 +0200 ntdll: Do not return STATUS_SUCCESS on failure in NtQueryObject(). --- dlls/ntdll/om.c | 8 +++++--- dlls/ntdll/tests/om.c | 22 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0e64ddd..85ac0bf 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -95,18 +95,20 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, if (!(status = server_get_unix_name( handle, &unix_name ))) { UNICODE_STRING nt_name; - NTSTATUS status; if (!(status = wine_unix_to_nt_file_name( &unix_name, &nt_name ))) { - if (sizeof(*p) + nt_name.MaximumLength <= len) + if (len < sizeof(*p)) + status = STATUS_INFO_LENGTH_MISMATCH; + else if (len < sizeof(*p) + nt_name.MaximumLength) + status = STATUS_BUFFER_OVERFLOW; + else { p->Name.Buffer = (WCHAR *)(p + 1); p->Name.Length = nt_name.Length; p->Name.MaximumLength = nt_name.MaximumLength; memcpy( p->Name.Buffer, nt_name.Buffer, nt_name.MaximumLength ); } - else status = STATUS_INFO_LENGTH_MISMATCH; if (used_len) *used_len = sizeof(*p) + nt_name.MaximumLength; RtlFreeUnicodeString( &nt_name ); } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c6a3cbf..7c03886 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -661,7 +661,7 @@ static void test_query_object(void) HANDLE handle; char buffer[1024]; NTSTATUS status; - ULONG len; + ULONG len, expected_len; UNICODE_STRING *str; char dir[MAX_PATH]; @@ -713,10 +713,26 @@ static void test_query_object(void) ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; - ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len || - broken(sizeof(UNICODE_STRING) + str->Length == len), /* NT4 */ + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ "unexpected len %u\n", len ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INSUFFICIENT_RESOURCES), + "NtQueryObject failed %x\n", status ); + ok( len == expected_len || broken(!len || len == sizeof(UNICODE_STRING)), + "unexpected len %u\n", len ); + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); + ok( status == STATUS_BUFFER_OVERFLOW || broken(status == STATUS_INSUFFICIENT_RESOURCES + || status == STATUS_INFO_LENGTH_MISMATCH), + "NtQueryObject failed %x\n", status ); + ok( len == expected_len || broken(!len), + "unexpected len %u\n", len ); + pNtClose( handle ); }

1 0

Henri Verbeet : wined3d: Introduce a separate structure for stateblock states.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 1ef4f075c160a826a57e8cf5613a3211005c8eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef4f075c160a826a57e8cf56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:04 2010 +0200 wined3d: Introduce a separate structure for stateblock states. We'd like to not pass an entire stateblock to things like state handlers and the shader backend, because those then use the stateblock to get to the device and through there to all the rest of wined3d. This would also be required for serialization of wined3d draw and state change commands into a single GL context. Resource updates would be explicitly excluded from serialization. --- dlls/wined3d/arb_program_shader.c | 36 +-- dlls/wined3d/ati_fragment_shader.c | 4 +- dlls/wined3d/device.c | 30 +- dlls/wined3d/drawprim.c | 20 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 15 +- dlls/wined3d/state.c | 552 ++++++++++++++++++---------------- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/utils.c | 36 ++- dlls/wined3d/wined3d_private.h | 9 +- 10 files changed, 382 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef4f075c160a826a57e8…

1 0

Henri Verbeet : wined3d: Move the scissor rect to wined3d_state.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 937eb7e600b963e77a8e9ba3182b52d6b7ab6283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937eb7e600b963e77a8e9ba31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:05 2010 +0200 wined3d: Move the scissor rect to wined3d_state. --- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 5 ++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb9bcdb..3bf1eac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -567,7 +567,7 @@ void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) if (stateblock->state.render_states[WINED3DRS_SCISSORTESTENABLE]) { - IntersectRect(rect, rect, &stateblock->scissorRect); + IntersectRect(rect, rect, &stateblock->state.scissor_rect); } } @@ -3138,11 +3138,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->updateStateBlock->changed.scissorRect = TRUE; - if(EqualRect(&This->updateStateBlock->scissorRect, pRect)) { - TRACE("App is setting the old scissor rectangle over, nothing to do\n"); + if (EqualRect(&This->updateStateBlock->state.scissor_rect, pRect)) + { + TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); return WINED3D_OK; } - CopyRect(&This->updateStateBlock->scissorRect, pRect); + CopyRect(&This->updateStateBlock->state.scissor_rect, pRect); if(This->isRecordingState) { TRACE("Recording... not performing anything\n"); @@ -3157,7 +3158,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *pRect = This->updateStateBlock->scissorRect; + *pRect = This->updateStateBlock->state.scissor_rect; TRACE("(%p)Returning a Scissor Rect of %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); return WINED3D_OK; } @@ -5759,10 +5760,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, device->stateBlock->viewport.MinZ = 0.0f; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); - device->stateBlock->scissorRect.top = 0; - device->stateBlock->scissorRect.left = 0; - device->stateBlock->scissorRect.right = device->stateBlock->viewport.Width; - device->stateBlock->scissorRect.bottom = device->stateBlock->viewport.Height; + device->stateBlock->state.scissor_rect.top = 0; + device->stateBlock->state.scissor_rect.left = 0; + device->stateBlock->state.scissor_rect.right = device->stateBlock->viewport.Width; + device->stateBlock->state.scissor_rect.bottom = device->stateBlock->viewport.Height; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4d17cf3..ebd89b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4880,7 +4880,7 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3 static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { IWineD3DSurfaceImpl *target = stateblock->device->render_targets[0]; - RECT *pRect = &stateblock->scissorRect; + RECT *pRect = &stateblock->state.scissor_rect; UINT height; UINT width; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6eb4713..3f20ae5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -755,12 +755,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->viewport = targetStateBlock->viewport; } - if(This->changed.scissorRect - && memcmp(&targetStateBlock->scissorRect, &This->scissorRect, sizeof(This->scissorRect))) + if (This->changed.scissorRect && memcmp(&targetStateBlock->state.scissor_rect, + &This->state.scissor_rect, sizeof(This->state.scissor_rect))) { TRACE("Updating scissor rect.\n"); - This->scissorRect = targetStateBlock->scissorRect; + This->state.scissor_rect = targetStateBlock->state.scissor_rect; } map = This->changed.streamSource; @@ -1000,7 +1000,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.scissorRect) { - IWineD3DDevice_SetScissorRect(device, &This->scissorRect); + IWineD3DDevice_SetScissorRect(device, &This->state.scissor_rect); } map = This->changed.streamSource; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd357c2..ed8ea55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,8 @@ struct wined3d_stream_state struct wined3d_state { + RECT scissor_rect; + DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -2425,9 +2427,6 @@ struct IWineD3DStateBlockImpl /* Sampler States */ DWORD samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - /* Scissor test rectangle */ - RECT scissorRect; - /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states;

1 0

Henri Verbeet : wined3d: Move the viewport to wined3d_state.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 16d9c91b97745916eb3afc10f15f20681394fe62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d9c91b97745916eb3afc10f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:00:06 2010 +0200 wined3d: Move the viewport to wined3d_state. --- dlls/wined3d/device.c | 22 +++++++++++----------- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3bf1eac..15df5ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -561,7 +561,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) { IWineD3DStateBlockImpl *stateblock = device->stateBlock; - WINED3DVIEWPORT *vp = &stateblock->viewport; + WINED3DVIEWPORT *vp = &stateblock->state.viewport; SetRect(rect, vp->X, vp->Y, vp->X + vp->Width, vp->Y + vp->Height); @@ -2998,7 +2998,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS TRACE("(%p)\n", This); This->updateStateBlock->changed.viewport = TRUE; - This->updateStateBlock->viewport = *pViewport; + This->updateStateBlock->state.viewport = *pViewport; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -3017,7 +3017,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetViewport(IWineD3DDevice *iface, WINED3DVIEWPORT* pViewport) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)\n", This); - *pViewport = This->stateBlock->viewport; + *pViewport = This->stateBlock->state.viewport; return WINED3D_OK; } @@ -5752,18 +5752,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, /* Set the viewport and scissor rectangles, if requested. Tests show * that stateblock recording is ignored, the change goes directly * into the primary stateblock. */ - device->stateBlock->viewport.Height = device->render_targets[0]->currentDesc.Height; - device->stateBlock->viewport.Width = device->render_targets[0]->currentDesc.Width; - device->stateBlock->viewport.X = 0; - device->stateBlock->viewport.Y = 0; - device->stateBlock->viewport.MaxZ = 1.0f; - device->stateBlock->viewport.MinZ = 0.0f; + device->stateBlock->state.viewport.Height = device->render_targets[0]->currentDesc.Height; + device->stateBlock->state.viewport.Width = device->render_targets[0]->currentDesc.Width; + device->stateBlock->state.viewport.X = 0; + device->stateBlock->state.viewport.Y = 0; + device->stateBlock->state.viewport.MaxZ = 1.0f; + device->stateBlock->state.viewport.MinZ = 0.0f; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); device->stateBlock->state.scissor_rect.top = 0; device->stateBlock->state.scissor_rect.left = 0; - device->stateBlock->state.scissor_rect.right = device->stateBlock->viewport.Width; - device->stateBlock->state.scissor_rect.bottom = device->stateBlock->viewport.Height; + device->stateBlock->state.scissor_rect.right = device->stateBlock->state.viewport.Width; + device->stateBlock->state.scissor_rect.bottom = device->stateBlock->state.viewport.Height; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ebd89b3..50447b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1516,7 +1516,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if (stateblock->state.render_states[WINED3DRS_POINTSCALEENABLE]) { GLfloat scaleFactor; - DWORD h = stateblock->viewport.Height; + DWORD h = stateblock->state.viewport.Height; if (pointSize.f < gl_info->limits.pointsize_min) { @@ -3943,10 +3943,10 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock if (context->last_was_rhw) { - double x = stateblock->viewport.X; - double y = stateblock->viewport.Y; - double w = stateblock->viewport.Width; - double h = stateblock->viewport.Height; + double x = stateblock->state.viewport.X; + double y = stateblock->state.viewport.Y; + double w = stateblock->state.viewport.Width; + double h = stateblock->state.viewport.Height; TRACE("Calling glOrtho with x %.8e, y %.8e, w %.8e, h %.8e.\n", x, y, w, h); if (context->render_offscreen) @@ -4010,8 +4010,8 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * filling convention. We want the difference to be large enough that * it doesn't get lost due to rounding inside the driver, but small * enough to prevent it from interfering with any anti-aliasing. */ - GLfloat xoffset = (63.0f / 64.0f) / stateblock->viewport.Width; - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat xoffset = (63.0f / 64.0f) / stateblock->state.viewport.Width; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; if (context->render_offscreen) { @@ -4597,7 +4597,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, s */ if (useVertexShaderFunction) { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; device->posFixup[1] = context->render_offscreen ? -1.0f : 1.0f; device->posFixup[3] = device->posFixup[1] * yoffset; } @@ -4723,7 +4723,7 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s { IWineD3DSurfaceImpl *target = stateblock->device->render_targets[0]; UINT width, height; - WINED3DVIEWPORT vp = stateblock->viewport; + WINED3DVIEWPORT vp = stateblock->state.viewport; if(vp.Width > target->currentDesc.Width) vp.Width = target->currentDesc.Width; if(vp.Height > target->currentDesc.Height) vp.Height = target->currentDesc.Height; @@ -4748,9 +4748,9 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; - stateblock->device->posFixup[2] = (63.0f / 64.0f) / stateblock->viewport.Width; + stateblock->device->posFixup[2] = (63.0f / 64.0f) / stateblock->state.viewport.Width; stateblock->device->posFixup[3] = stateblock->device->posFixup[1] * yoffset; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3f20ae5..5a6d58e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -747,12 +747,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->material = targetStateBlock->material; } - if (This->changed.viewport - && memcmp(&targetStateBlock->viewport, &This->viewport, sizeof(This->viewport))) + if (This->changed.viewport && memcmp(&targetStateBlock->state.viewport, + &This->state.viewport, sizeof(This->state.viewport))) { TRACE("Updating viewport.\n"); - This->viewport = targetStateBlock->viewport; + This->state.viewport = targetStateBlock->state.viewport; } if (This->changed.scissorRect && memcmp(&targetStateBlock->state.scissor_rect, @@ -995,7 +995,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.viewport) { - IWineD3DDevice_SetViewport(device, &This->viewport); + IWineD3DDevice_SetViewport(device, &This->state.viewport); } if (This->changed.scissorRect) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed8ea55..49e741a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,7 @@ struct wined3d_stream_state struct wined3d_state { + WINED3DVIEWPORT viewport; RECT scissor_rect; DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; @@ -2404,9 +2405,6 @@ struct IWineD3DStateBlockImpl double clipplane[MAX_CLIPPLANES][4]; WINED3DCLIPSTATUS clip_status; - /* ViewPort */ - WINED3DVIEWPORT viewport; - /* Material */ WINED3DMATERIAL material;

1 0