March 2007 - Wine-Commits - list.winehq.org

Joris Huizer : winebuild: sign-compare fixes.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: c9f145223368da9f663aaad415aa776eb2b297c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f145223368da9f663aaad41… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 3 05:30:03 2007 -0800 winebuild: sign-compare fixes. --- tools/winebuild/import.c | 12 +++++++----- tools/winebuild/spec32.c | 5 +++-- tools/winebuild/utils.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2241fa5..80c6c12 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -168,7 +168,7 @@ static void free_imports( struct import *imp ) /* check whether a given dll is imported in delayed mode */ static int is_delayed_import( const char *name ) { - int i; + unsigned int i; for (i = 0; i < delayed_imports.count; i++) { @@ -468,7 +468,8 @@ static void check_undefined_exports( DLLSPEC *spec ) static char *create_undef_symbols_file( DLLSPEC *spec ) { char *as_file, *obj_file; - unsigned int i; + int i; + unsigned int j; FILE *f; as_file = get_temp_file_name( output_file_name, ".s" ); @@ -482,8 +483,8 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) if (odp->flags & FLAG_FORWARD) continue; fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); } - for (i = 0; i < extra_ld_symbols.count; i++) - fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(extra_ld_symbols.names[i]) ); + for (j = 0; j < extra_ld_symbols.count; j++) + fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(extra_ld_symbols.names[j]) ); fclose( f ); obj_file = get_temp_file_name( output_file_name, ".o" ); @@ -557,7 +558,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) /* resolve the imports for a Win32 module */ int resolve_imports( DLLSPEC *spec ) { - unsigned int i, j, removed; + int i; + unsigned int j, removed; ORDDEF *odp; sort_names( &ignore_symbols ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6fcc42e..26e66b8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -51,7 +51,7 @@ static inline int needs_relay( const ORDDEF *odp ) /* check if dll will output relay thunks */ int has_relays( DLLSPEC *spec ) { - unsigned int i; + int i; if (target_cpu != CPU_x86) return 0; @@ -70,7 +70,8 @@ int has_relays( DLLSPEC *spec ) */ static void output_relay_debug( DLLSPEC *spec ) { - unsigned int i, j, args, flags; + int i; + unsigned int j, args, flags; /* first the table of entry point offsets */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 3458eb7..656e375 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -454,7 +454,7 @@ unsigned int get_alignment(unsigned int align) case CPU_POWERPC: case CPU_ALPHA: n = 0; - while ((1 << n) != align) n++; + while ((1u << n) != align) n++; return n; } /* unreached */

1 0

Stefan Dösinger : wined3d: Adjust the rhw transformation for offscreen rendering.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 2cdced8193fbf4693298f84d6a121d4ce4607fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdced8193fbf4693298f84d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 3 02:35:17 2007 +0100 wined3d: Adjust the rhw transformation for offscreen rendering. When drawing processed vertices with the fixed function pipeline the projection matrix is set up to map y values from 0 to height to 1.0; -1.0(gl and d3d coord systems are flipped). This moves the y axis to the bottom of the drawing area. When later on the y inversion matrix is applied for offscreen rendering, the coordinate system will get flipped out of the viewport. This patch sets the Y range up upside down when using offscreen rendering, so the invymat will flip it to the correct position. This has to happen before the 0.375 pixel correction. --- dlls/wined3d/state.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 64bce1c..ba421a1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2154,7 +2154,11 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * the Z coordinate does not affect the size of the primitives */ TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); + if(stateblock->wineD3DDevice->render_offscreen) { + glOrtho(X, X + width, Y, Y - height, -minZ, -maxZ); + } else { + glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); + } } else { /* If the app mixes transformed and untransformed primitives we can't use the coordinate system * trick above because this would mess up transformed and untransformed Z order. Pass the z position @@ -2164,7 +2168,11 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * replacement shader. */ TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, 1.0, -1.0); - glOrtho(X, X + width, Y + height, Y, 1.0, -1.0); + if(stateblock->wineD3DDevice->render_offscreen) { + glOrtho(X, X + width, Y, Y - height, 1.0, -1.0); + } else { + glOrtho(X, X + width, Y + height, Y, 1.0, -1.0); + } } checkGLcall("glOrtho");

1 0

Stefan Dösinger : wined3d: Use the scissor test when clearing the full surface too.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 7126b63645747fe035aaa1167f0dcda8cb38be01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7126b63645747fe035aaa1167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 2 09:25:02 2007 +0100 wined3d: Use the scissor test when clearing the full surface too. It was incorrect to disable the scissor test for full surfaces in my clear patch. With back buffer offscreen rendering the viewport does not seem to restrict clearing, and with different sizes of depth stencil and color buffer the final fantasy XI demo seems to expect the clear to be restricted. --- dlls/wined3d/device.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ad2c47..af28e96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4138,14 +4138,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun ENTER_GL(); - if(pRects) { - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); - } else { - glDisable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - } + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); if (Count > 0 && pRects) { @@ -4184,6 +4179,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } if (!curRect) { + glScissor(This->stateBlock->viewport.X, + (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - + (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), + This->stateBlock->viewport.Width, + This->stateBlock->viewport.Height); + checkGLcall("glScissor"); glClear(glMask); checkGLcall("glClear"); } else { @@ -5246,10 +5247,20 @@ static void WINAPI IWineD3DDeviceImpl_SetCursorPosition(IWineD3DDevice* ifa static BOOL WINAPI IWineD3DDeviceImpl_ShowCursor(IWineD3DDevice* iface, BOOL bShow) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; BOOL oldVisible = This->bCursorVisible; + POINT pt; + TRACE("(%p) : visible(%d)\n", This, bShow); if(This->cursorTexture) This->bCursorVisible = bShow; + /* + * When ShowCursor is first called it should make the cursor appear at the OS's last + * known cursor position. Because of this, some applications just repetitively call + * ShowCursor in order to update the cursor's position. This behavior is undocumented. + */ + GetCursorPos(&pt); + This->xScreenSpace = pt.x; + This->yScreenSpace = pt.y; return oldVisible; }

1 0

lostwages/ news/2007030501.xml wwn/wn20070305_ ...
by WineHQ March 5, 2007

March 5, 2007

ChangeSet ID: 30942 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/03/05 11:18:21 Added files: news : 2007030501.xml wwn : wn20070305_324.xml Log message: WWN #324 Patch: http://cvs.winehq.org/patch.py?id=30942 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007030501.xml Added 1.1 +0 -0 lostwages/wwn/wn20070305_324.xml

1 0

Chris Robinson : quartz: Don' t AddRef an object we just created and are handing back to the caller.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: efe156ae8ec4163da2a51511297dee2f6a5d0235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe156ae8ec4163da2a515112… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 5 00:12:29 2007 -0800 quartz: Don't AddRef an object we just created and are handing back to the caller. --- dlls/quartz/filesource.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 691413d..01b9955 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -928,7 +928,6 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe /* FIXME: check we are still aligned */ if (SUCCEEDED(hr)) { - IMemAllocator_AddRef(pPreferred); *ppActual = pPreferred; TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); return S_OK;

1 0

Jason Edmeades : kernel32/tests: Show wrong behaviour with current directory.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 9d00aeafd7a0e4dc9a2df5410fb433a0be1e3ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d00aeafd7a0e4dc9a2df5410… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:37:38 2007 +0000 kernel32/tests: Show wrong behaviour with current directory. --- dlls/kernel32/tests/file.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 96fe96e..89cf0a2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1795,6 +1795,31 @@ static void test_overlapped(void) ok( r == TRUE, "close handle failed\n"); } +static void test_RemoveDirectory(void) +{ + int rc; + char directory[] = "removeme"; + + rc = CreateDirectory(directory, NULL); + ok( rc, "Createdirectory failed, gle=%d\n", GetLastError() ); + + rc = SetCurrentDirectory(directory); + ok( rc, "SetCurrentDirectory failed, gle=%d\n", GetLastError() ); + + rc = RemoveDirectory("."); + todo_wine { + ok( !rc, "RemoveDirectory unexpectedly worked\n" ); + } + + rc = SetCurrentDirectory(".."); + ok( rc, "SetCurrentDirectory failed, gle=%d\n", GetLastError() ); + + rc = RemoveDirectory(directory); + todo_wine { + ok( rc, "RemoveDirectory failed, gle=%d\n", GetLastError() ); + } +} + START_TEST(file) { test__hread( ); @@ -1825,4 +1850,5 @@ START_TEST(file) test_read_write(); test_OpenFile(); test_overlapped(); + test_RemoveDirectory(); }

1 0

Chris Robinson : quartz: Report the previous refcount of a PullPin object.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 7f9becf8547e1e6ff3f02c56619c9d5ee176af3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9becf8547e1e6ff3f02c566… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Mar 4 20:46:04 2007 -0800 quartz: Report the previous refcount of a PullPin object. --- dlls/quartz/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5bc84bf..9cc05da 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1125,7 +1125,7 @@ ULONG WINAPI PullPin_Release(IPin * iface) PullPin *This = (PullPin *)iface; ULONG refCount = InterlockedDecrement(&This->pin.refCount); - TRACE("(%p/%p)->()\n", This, iface); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) {

1 0

Jason Edmeades : cmd.exe: Fix stdio redirects.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 9e518dc79d914062628791b623a1691256374ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e518dc79d914062628791b62… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:39:22 2007 +0000 cmd.exe: Fix stdio redirects. --- programs/cmd/wcmdmain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bb805e6..1bea185 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -47,7 +47,6 @@ const char version_string[] = "CMD Version " PACKAGE_VERSION "\n\n"; const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL; -static HANDLE old_stdin = INVALID_HANDLE_VALUE, old_stdout = INVALID_HANDLE_VALUE; extern struct env_stack *pushd_directories; static char *WCMD_expand_envvar(char *start); @@ -314,6 +313,8 @@ void WCMD_process_command (char *command) char *whichcmd; SECURITY_ATTRIBUTES sa; char *new_cmd; + HANDLE old_stdin = INVALID_HANDLE_VALUE; + HANDLE old_stdout = INVALID_HANDLE_VALUE; /* Move copy of the command onto the heap so it can be expanded */ new_cmd = HeapAlloc( GetProcessHeap(), 0, MAXSTRING ); @@ -587,12 +588,10 @@ void WCMD_process_command (char *command) if (old_stdin != INVALID_HANDLE_VALUE) { CloseHandle (GetStdHandle (STD_INPUT_HANDLE)); SetStdHandle (STD_INPUT_HANDLE, old_stdin); - old_stdin = INVALID_HANDLE_VALUE; } if (old_stdout != INVALID_HANDLE_VALUE) { CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE)); SetStdHandle (STD_OUTPUT_HANDLE, old_stdout); - old_stdout = INVALID_HANDLE_VALUE; } } @@ -606,8 +605,7 @@ static void init_msvcrt_io_block(STARTUPINFO* st) GetStartupInfo(&st_p); st->cbReserved2 = st_p.cbReserved2; st->lpReserved2 = st_p.lpReserved2; - if (st_p.cbReserved2 && st_p.lpReserved2 && - (old_stdin != INVALID_HANDLE_VALUE || old_stdout != INVALID_HANDLE_VALUE)) + if (st_p.cbReserved2 && st_p.lpReserved2) { /* Override the entries for fd 0,1,2 if we happened * to change those std handles (this depends on the way wcmd sets

1 0

Jason Edmeades : cmd.exe: Add support for del file1 file2.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: a97d1200f3481befacb6b629fcf390ede7d1b5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97d1200f3481befacb6b629f… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:35:09 2007 +0000 cmd.exe: Add support for del file1 file2. --- programs/cmd/builtins.c | 270 +++++++++++++++++++++++++---------------------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 146 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a97d1200f3481befacb6b…

1 0

Jason Edmeades : cmd.exe: Add ASSOC command.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 79aa1a009faf5bf60b8cdccbf92c9c59ccb3e7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79aa1a009faf5bf60b8cdccbf… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:34:45 2007 +0000 cmd.exe: Add ASSOC command. --- programs/cmd/Cs.rc | 1 + programs/cmd/De.rc | 1 + programs/cmd/En.rc | 1 + programs/cmd/Es.rc | 1 + programs/cmd/Fr.rc | 1 + programs/cmd/Ja.rc | 1 + programs/cmd/Ko.rc | 1 + programs/cmd/Makefile.in | 2 +- programs/cmd/Nl.rc | 1 + programs/cmd/No.rc | 1 + programs/cmd/Pl.rc | 1 + programs/cmd/Pt.rc | 1 + programs/cmd/Ru.rc | 1 + programs/cmd/Si.rc | 1 + programs/cmd/Tr.rc | 1 + programs/cmd/builtins.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/wcmd.h | 5 +- programs/cmd/wcmdmain.c | 9 +++- 18 files changed, 183 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79aa1a009faf5bf60b8cd…

1 0