October 2016 - Wine-Commits

Józef Kucia : wined3d: Introduce wined3d_buffer_get_memory().
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 2e15ae85a1f7f0799a296cd8b7627a4ec5e2db3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e15ae85a1f7f0799a296cd8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:57 2016 +0200 wined3d: Introduce wined3d_buffer_get_memory(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 26 +++++++++++++++++++++++++- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e559586..86493db 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -611,7 +611,7 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, +static void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -635,6 +635,30 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co } } +void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, + struct wined3d_bo_address *data, DWORD locations) +{ + TRACE("buffer %p, data %p, locations %s.\n", + buffer, data, wined3d_debug_location(locations)); + + if (locations & WINED3D_LOCATION_BUFFER) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + if (locations & WINED3D_LOCATION_SYSMEM) + { + data->buffer_object = 0; + data->addr = buffer->resource.heap_memory; + return; + } + + ERR("Unexpected locations %s.\n", wined3d_debug_location(locations)); + data->buffer_object = 0; + data->addr = NULL; +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1ca12bc..88d34e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3201,7 +3201,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { wined3d_buffer_load(buffer, context, state); - buffer_get_memory(buffer, context, &data); + wined3d_buffer_get_memory(buffer, &data, buffer->locations); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8001e5e..4e7bb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,9 +3179,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, + struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 4e7ef680e3cecaeccb96a0e827f97019efa751cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7ef680e3cecaeccb96a0e82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:54 2016 +0200 wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8f356d8..e559586 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -162,20 +162,20 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) +static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) { - GLenum gl_usage = GL_STATIC_DRAW_ARB; - GLenum error; const struct wined3d_gl_info *gl_info = context->gl_info; + GLenum gl_usage = GL_STATIC_DRAW; + GLenum error; - TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", - This, debug_d3dusage(This->resource.usage)); + TRACE("Creating an OpenGL buffer object for wined3d_buffer %p with usage %s.\n", + buffer, debug_d3dusage(buffer->resource.usage)); /* Make sure that the gl error is cleared. Do not use checkGLcall - * here because checkGLcall just prints a fixme and continues. However, - * if an error during VBO creation occurs we can fall back to non-vbo operation - * with full functionality(but performance loss) - */ + * here because checkGLcall just prints a fixme and continues. However, + * if an error during VBO creation occurs we can fall back to non-VBO operation + * with full functionality(but performance loss). + */ while (gl_info->gl_ops.gl.p_glGetError() != GL_NO_ERROR); /* Basically the FVF parameter passed to CreateVertexBuffer is no good. @@ -184,72 +184,72 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &This->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!This->buffer_object || error != GL_NO_ERROR) + if (!buffer->buffer_object || error != GL_NO_ERROR) { - ERR("Failed to create a VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - buffer_bind(This, context); + buffer_bind(buffer, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("Failed to bind the VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to bind the BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - if (This->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; - if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); - This->flags |= WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE"); + buffer->flags |= WINED3D_BUFFER_APPLESYNC; } - /* No setup is needed here for GL_ARB_map_buffer_range */ + /* No setup is needed here for GL_ARB_map_buffer_range. */ } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and * calling glBufferSubData on updates. Upload the actual data in case - * we're not double buffering, so we can release the heap mem afterwards + * we're not double buffering, so we can release the heap mem afterwards. */ - GL_EXTCALL(glBufferData(This->buffer_type_hint, This->resource.size, This->resource.heap_memory, gl_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, buffer->resource.heap_memory, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("glBufferData failed with error %s (%#x)\n", debug_glerror(error), error); + ERR("glBufferData failed with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - This->buffer_object_usage = gl_usage; + buffer->buffer_object_usage = gl_usage; - if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_invalidate_bo_range(This, 0, 0); + buffer_invalidate_bo_range(buffer, 0, 0); } else { - wined3d_resource_free_sysmem(&This->resource); - wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); - wined3d_buffer_invalidate_location(This, WINED3D_LOCATION_SYSMEM); + wined3d_resource_free_sysmem(&buffer->resource); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); } - return; + return TRUE; fail: - /* Clean up all VBO init, but continue because we can work without a VBO :-) */ - ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur.\n"); - This->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(This, gl_info); - buffer_clear_dirty_areas(This); + /* Clean up all BO init, but continue because we can work without a BO :-) */ + ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + delete_gl_buffer(buffer, gl_info); + buffer_clear_dirty_areas(buffer); + return FALSE; } static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, @@ -530,8 +530,15 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - FIXME("Not implemented yet.\n"); - return FALSE; + if (buffer->buffer_object) + return TRUE; + + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); + return FALSE; + } + return buffer_create_buffer_object(buffer, context); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -612,7 +619,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co { if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, context); + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); if (buffer->buffer_object) { data->buffer_object = buffer->buffer_object; @@ -878,20 +885,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_mark_used(buffer); - if (!buffer->buffer_object) + /* TODO: Make converting independent from VBOs */ + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) { - /* TODO: Make converting independent from VBOs */ - if (buffer->flags & WINED3D_BUFFER_USE_BO) - { - buffer_create_buffer_object(buffer, context); - } - else - { - /* Not doing any conversion */ - return; - } + /* Not doing any conversion */ + return; } + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */ if (state)

1 0

Józef Kucia : wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem().
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 8db3b5512e034ee448bbbb7631e4cd79cc362edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3b5512e034ee448bbbb763… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:53 2016 +0200 wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4a4d367..8f356d8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -504,31 +504,6 @@ static inline unsigned int fixup_transformed_pos(float *p) return 4 * sizeof(*p); } -/* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) -{ - data->buffer_object = buffer->buffer_object; - if (!buffer->buffer_object) - { - if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) - { - buffer_create_buffer_object(buffer, context); - if (buffer->buffer_object) - { - data->buffer_object = buffer->buffer_object; - data->addr = NULL; - return; - } - } - data->addr = buffer->resource.heap_memory; - } - else - { - data->addr = NULL; - } -} - ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedIncrement(&buffer->resource.ref); @@ -628,6 +603,31 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } +/* Context activation is done by the caller. */ +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, + struct wined3d_bo_address *data) +{ + data->buffer_object = buffer->buffer_object; + if (!buffer->buffer_object) + { + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) + { + buffer_create_buffer_object(buffer, context); + if (buffer->buffer_object) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + } + data->addr = buffer->resource.heap_memory; + } + else + { + data->addr = NULL; + } +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource);

1 0

Jeremy Newman : update for 2016
by Jeremy Newman Oct. 21, 2016

Oct. 21, 2016

Module: website Branch: master Commit: 51af701cec7f1a555269e689ef0b560a1a718b1a URL: http://source.winehq.org/git/website.git/?a=commit;h=51af701cec7f1a555269e6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 21 11:44:30 2016 -0500 update for 2016 --- templates/en/wineconf/rsvp.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 3b4db57..7df2564 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,4 +1,4 @@ - + <iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe>

1 0

Austin English : api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 80aee498f0082f5b346f30c4628348306b5cd7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=80aee498f0082f5b346f30c46… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 01:09:25 2016 -0500 api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 69136d5..d2966f5 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,4 +1,15 @@ +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Alexandre Julliard : rpcrt4: Remove noisy fixme.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 7b0c2cdbcd64cffa2f5c5a37f55799b114132b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c2cdbcd64cffa2f5c5a37f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 15:19:02 2016 -0700 rpcrt4: Remove noisy fixme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4ba17a0..67a0220 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -400,7 +400,6 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ - FIXME("Using local computer name as NetworkAddr\n"); new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) {

1 0

Detlef Riekenberg : winspool: Add our driver for all usable Printer environments.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 686cfe3aaf21467e02118c324cd69ab84eca56f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686cfe3aaf21467e02118c324… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 19 12:53:24 2016 +0200 winspool: Add our driver for all usable Printer environments. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4dea531..2f0ff3d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -583,31 +583,38 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) { DRIVER_INFO_3W di3; + unsigned int i; + BOOL res; ZeroMemory(&di3, sizeof(DRIVER_INFO_3W)); di3.cVersion = 3; di3.pName = (WCHAR*)name; - di3.pEnvironment = envname_x86W; di3.pDriverPath = driver_nt; di3.pDataFile = ppd; di3.pConfigFile = driver_nt; di3.pDefaultDataType = rawW; - if (AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ) || - (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) + for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) { - di3.cVersion = 0; - di3.pEnvironment = envname_win40W; - di3.pDriverPath = driver_9x; - di3.pConfigFile = driver_9x; - if (AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ) || - (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) + di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; + if (all_printenv[i]->envname == envname_win40W) { - return TRUE; + /* We use wineps16.drv as driver for 16 bit */ + di3.pDriverPath = driver_9x; + di3.pConfigFile = driver_9x; + } + res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); + TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); + + if (!res & (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + { + ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), + debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath)); + return FALSE; } } - ERR("failed with %u for %s (%s)\n", GetLastError(), debugstr_w(di3.pDriverPath), debugstr_w(di3.pEnvironment)); - return FALSE; + + return TRUE; } static inline char *expand_env_string( char *str, DWORD type )

1 0

Andrey Gusev : wpc: Fix TRACE for WindowsParentalControls_CreateInstance.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 8a3f1a0754bd9db2c913ed531ccdc47b4f1233de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3f1a0754bd9db2c913ed531… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Oct 16 19:45:42 2016 +0300 wpc: Fix TRACE for WindowsParentalControls_CreateInstance. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/wpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 10468e9..ef2d6dd 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -104,7 +104,7 @@ static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *ifac { static IWindowsParentalControls wpc = { &WindowsParentalControlsVtbl }; - TRACE("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); return IWindowsParentalControls_QueryInterface(&wpc, riid, ppv); }

1 0

Pierre Schweitzer : mpr: Implement connected resources enumeration.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: d9c9d9b10f58844a780d8bfc9ed1b6713e37d487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9d9b10f58844a780d8bfc9… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Sep 12 21:48:51 2016 +0200 mpr: Implement connected resources enumeration. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 176 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9c9d9b10f58844a780d8…

1 0

Iván Matellanes : msvcirt/tests: Add tests of ostrstream::pcount.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 2d4e7d405055b3151c4cd5ac9a2c2f6bf0ce3b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4e7d405055b3151c4cd5ac9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:54 2016 +0200 msvcirt/tests: Add tests of ostrstream::pcount. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e656866..db3ee3b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -336,6 +336,7 @@ static ostream* (*__thiscall p_ostrstream_ctor)(ostream*, BOOL); static void (*__thiscall p_ostrstream_dtor)(ios*); static void (*__thiscall p_ostrstream_vbase_dtor)(ostream*); static ostream* (*__thiscall p_ostrstream_assign)(ostream*, const ostream*); +static int (*__thiscall p_ostrstream_pcount)(const ostream*); /* istream */ static istream* (*__thiscall p_istream_copy_ctor)(istream*, const istream*, BOOL); @@ -608,6 +609,7 @@ static BOOL init(void) SET(p_ostrstream_dtor, "??1ostrstream@@UEAA(a)XZ"); SET(p_ostrstream_vbase_dtor, "??_Dostrstream@@QEAAXXZ"); SET(p_ostrstream_assign, "??4ostrstream@@QEAAAEAV0(a)AEBV0@@Z"); + SET(p_ostrstream_pcount, "?pcount(a)ostrstream@@QEBAHXZ"); SET(p_istream_copy_ctor, "??0istream@@IEAA(a)AEBV0@@Z"); SET(p_istream_ctor, "??0istream@@IEAA(a)XZ"); @@ -794,6 +796,7 @@ static BOOL init(void) SET(p_ostrstream_dtor, "??1ostrstream@@UAE(a)XZ"); SET(p_ostrstream_vbase_dtor, "??_Dostrstream@@QAEXXZ"); SET(p_ostrstream_assign, "??4ostrstream@@QAEAAV0(a)ABV0@@Z"); + SET(p_ostrstream_pcount, "?pcount(a)ostrstream@@QBEHXZ"); SET(p_istream_copy_ctor, "??0istream@@IAE(a)ABV0@@Z"); SET(p_istream_ctor, "??0istream@@IAE(a)XZ"); @@ -3996,6 +3999,7 @@ static void test_ostrstream(void) ostream os1, os2, *pos, *pos2; strstreambuf *pssb; char buffer[32]; + int ret; memset(&os1, 0xab, sizeof(ostream)); memset(&os2, 0xab, sizeof(ostream)); @@ -4253,6 +4257,28 @@ static void test_ostrstream(void) ok(os2.base_ios.fill == ' ', "expected 32 got %d\n", os2.base_ios.fill); ok(os2.base_ios.width == 0, "expected 0 got %d\n", os2.base_ios.width); ok(os2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, os2.base_ios.do_lock); + + /* pcount */ + pos = call_func2(p_ostrstream_ctor, &os1, TRUE); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + pssb = (strstreambuf*) os1.base_ios.sb; + pssb->base.pptr = (char*) 5; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 5, "expected 5 got %d\n", ret); + pssb->base.pbase = (char*) 2; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 3, "expected 3 got %d\n", ret); + pssb->base.pptr = NULL; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + if (0) /* crashes on native */ + os1.base_ios.sb = NULL; + pssb->base.pptr = (char*) 1; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + call_func1(p_ostrstream_vbase_dtor, &os1); } static void test_istream(void)

1 0