February 2013 - Wine-Commits

Ričardas Barkauskas : wined3d: Rename bsize to content_size to reflect usage.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: b5ff0a6983c2b732e90f86ae9e4d15a688aa78fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ff0a6983c2b732e90f86ae9… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:29 2013 +0200 wined3d: Rename bsize to content_size to reflect usage. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e8da805..b069335 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3890,7 +3890,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, TRACE("Created hw pixel shader, prg=%d\n", retval); /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - buffer->bsize, buffer->buffer)); + buffer->content_size, buffer->buffer)); checkGLcall("glProgramStringARB()"); gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); @@ -4303,7 +4303,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, TRACE("Created hw vertex shader, prg=%d\n", ret); /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - buffer->bsize, buffer->buffer)); + buffer->content_size, buffer->buffer)); checkGLcall("glProgramStringARB()"); gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2c65e71..0616f0a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -238,7 +238,7 @@ static const struct wined3d_shader_frontend *shader_select_frontend(DWORD versio void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; - buffer->bsize = 0; + buffer->content_size = 0; buffer->lineNo = 0; buffer->newline = TRUE; } @@ -263,22 +263,22 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->bsize; + char *base = buffer->buffer + buffer->content_size; int rc; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); + rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */) + if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) { ERR("The buffer allocated for the shader program string " "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->bsize = SHADER_PGMSIZE - 1; + buffer->content_size = SHADER_PGMSIZE - 1; return -1; } if (buffer->newline) { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->bsize, base); + TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); buffer->newline = FALSE; } else @@ -286,8 +286,8 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va TRACE("%s", base); } - buffer->bsize += rc; - if (buffer->buffer[buffer->bsize-1] == '\n') + buffer->content_size += rc; + if (buffer->buffer[buffer->content_size-1] == '\n') { ++buffer->lineNo; buffer->newline = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45f6b29..1e9a3a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -407,7 +407,7 @@ enum wined3d_shader_rel_op struct wined3d_shader_buffer { char *buffer; - unsigned int bsize; + unsigned int content_size; unsigned int lineNo; BOOL newline; };

1 0

André Hentschel : winedbg: Add support for XML Target Descriptions to read Cpsr on ARM.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 2d449b76e1b604af5d524c1f613833d1f47c3466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d449b76e1b604af5d524c1f6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 25 21:45:56 2013 +0100 winedbg: Add support for XML Target Descriptions to read Cpsr on ARM. --- programs/winedbg/gdbproxy.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index bbd3898..580fb88 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -213,6 +213,7 @@ struct cpu_register #define REG(r,gs) {FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r), gs} #ifdef __i386__ +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Eax, 4), REG(Ecx, 4), @@ -232,6 +233,7 @@ static struct cpu_register cpu_register_map[] = { REG(SegGs, 4), }; #elif defined(__powerpc__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Gpr0, 4), REG(Gpr1, 4), @@ -308,6 +310,7 @@ static struct cpu_register cpu_register_map[] = { /* see gdb/nlm/ppc.c */ }; #elif defined(__x86_64__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Rax, 8), REG(Rbx, 8), @@ -335,6 +338,7 @@ static struct cpu_register cpu_register_map[] = { REG(SegGs, 4), }; #elif defined(__sparc__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(g0, 4), REG(g1, 4), @@ -370,6 +374,28 @@ static struct cpu_register cpu_register_map[] = { REG(i7, 4), }; #elif defined(__arm__) +static const char target_xml[] = + "l <target><architecture>arm</architecture>\n" + "<feature name=\"org.gnu.gdb.arm.core\">\n" + " <reg name=\"r0\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r1\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r2\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r3\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r4\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r5\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r6\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r7\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r8\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r9\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r10\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r11\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r12\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"sp\" bitsize=\"32\" type=\"data_ptr\"/>\n" + " <reg name=\"lr\" bitsize=\"32\"/>\n" + " <reg name=\"pc\" bitsize=\"32\" type=\"code_ptr\"/>\n" + " <reg name=\"cpsr\" bitsize=\"32\"/>\n" + "</feature></target>\n"; + static struct cpu_register cpu_register_map[] = { REG(R0, 4), REG(R1, 4), @@ -387,8 +413,10 @@ static struct cpu_register cpu_register_map[] = { REG(Sp, 4), REG(Lr, 4), REG(Pc, 4), + REG(Cpsr, 4), }; #elif defined(__aarch64__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(X0, 8), REG(X1, 8), @@ -1930,10 +1958,15 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - /* no features supported */ - packet_reply_open(gdbctx); - packet_reply_close(gdbctx); - return packet_done; + if (strlen(target_xml)) + return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+", -1); + else + { + /* no features supported */ + packet_reply_open(gdbctx); + packet_reply_close(gdbctx); + return packet_done; + } } break; case 'T': @@ -1961,6 +1994,10 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_done; } break; + case 'X': + if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + return packet_reply(gdbctx, target_xml, -1); + break; } if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Unknown or malformed query %*.*s\n",

1 0

Piotr Caban : hlink: Call BindToObject with IID_IUnknown in IHlink_fnNavigate.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: f8e0d2f5db73ad3ab6742e13b7a3435a04b0779b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e0d2f5db73ad3ab6742e13b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:20:42 2013 +0100 hlink: Call BindToObject with IID_IUnknown in IHlink_fnNavigate. --- dlls/hlink/link.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 97164eb..1957cb0 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -487,15 +487,19 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (SUCCEEDED(r)) { IBindCtx *bcxt; - IHlinkTarget *target = NULL; + IUnknown *unk = NULL; + IHlinkTarget *target; CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); - r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IHlinkTarget, - (LPVOID*)&target); - TRACE("IHlinkTarget returned 0x%x\n", r); + r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); + if (r == S_OK) + { + r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void**)&target); + IUnknown_Release(unk); + } if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc);

1 0

Michael Stefaniuc : shell32: Pass an IShellFolder2 to SHELL32_CompareIDs() to avoid casts.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 89e187d3bd45322101c1e5294586bc5a881b4d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e187d3bd45322101c1e5294… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 25 23:46:57 2013 +0100 shell32: Pass an IShellFolder2 to SHELL32_CompareIDs() to avoid casts. --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 3 +-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shlfolder.c | 12 +++++------- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7d2b9ff..29439c5 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -499,7 +499,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnCompareIDs(IShellFolder2 *iface, LPARAM int nReturn; TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 052b040..b6ebfb2 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -46,7 +46,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) DECLSPEC_HIDDEN; -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) DECLSPEC_HIDDEN; +HRESULT SHELL32_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) DECLSPEC_HIDDEN; LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) DECLSPEC_HIDDEN; HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c22335a..227982e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -396,11 +396,10 @@ static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; HRESULT hr; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - hr = SHELL32_CompareIDs ( shell_folder, lParam, pidl1, pidl2); + hr = SHELL32_CompareIDs(iface, lParam, pidl1, pidl2); TRACE ("-- 0x%08x\n", hr); return hr; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 23e9dcc..0d52156 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -503,7 +503,7 @@ IShellFolder_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 77a1c01..766e8d8 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -410,7 +410,7 @@ static HRESULT WINAPI ISF_MyComputer_fnCompareIDs (IShellFolder2 *iface, HRESULT hr; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - hr = SHELL32_CompareIDs ((IShellFolder*)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + hr = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- 0x%08x\n", hr); return hr; } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index a75efef..1cff18d 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -298,7 +298,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCompareIDs (IShellFolder2 * iface, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs ((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 4d9f036..1b53edf 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -482,16 +482,14 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO /*********************************************************************** * SHELL32_CompareIDs */ -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT SHELL32_CompareIDs(IShellFolder2 *sf, LPARAM lParam, LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2) { - int type1, - type2; + int type1, type2; char szTemp1[MAX_PATH]; char szTemp2[MAX_PATH]; HRESULT nReturn; - LPITEMIDLIST firstpidl, - nextpidl1, - nextpidl2; + LPITEMIDLIST firstpidl, nextpidl1, nextpidl2; IShellFolder *psf; /* test for empty pidls */ @@ -539,7 +537,7 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST p } else if (isEmpty2) { return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); /* optimizing end */ - } else if (SUCCEEDED (IShellFolder_BindToObject (iface, firstpidl, NULL, &IID_IShellFolder, (LPVOID *) & psf))) { + } else if (SUCCEEDED(IShellFolder2_BindToObject(sf, firstpidl, NULL, &IID_IShellFolder, (void **)&psf))) { nReturn = IShellFolder_CompareIDs (psf, lParam, nextpidl1, nextpidl2); IShellFolder_Release (psf); }

1 0

Andrew Talbot : rpcrt4: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 49992c3a5e5b0b8022942de19c29d85db6c35d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49992c3a5e5b0b8022942de19… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:13:56 2013 +0000 rpcrt4: Avoid signed-unsigned integer comparisons. --- dlls/rpcrt4/rpc_transport.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e3e428b..fc81bbe 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3117,7 +3117,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeA(RPC_PROTSEQ_VECTORA **protseqs) if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3135,7 +3135,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3150,7 +3150,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) { RPC_PROTSEQ_VECTORW *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs); @@ -3183,7 +3183,7 @@ end: RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) { RPC_PROTSEQ_VECTORA *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs);

1 0

Michael Stefaniuc : shell32: COM clean up for IShellFolder2 in ShellFSFolder.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: febda816df5523c22497f8c5a778584a3f313eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febda816df5523c22497f8c5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 25 23:44:51 2013 +0100 shell32: COM clean up for IShellFolder2 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 52 ++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1ccd2ef..23e9dcc 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { IUnknown IUnknown_inner; LONG ref; - const IShellFolder2Vtbl *lpvtblShellFolder; + IShellFolder2 IShellFolder2_iface; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; @@ -88,9 +88,9 @@ static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); } -static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) +static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) @@ -112,8 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) -#define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) #define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) #define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) @@ -146,10 +144,8 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo if (IsEqualIID (riid, &IID_IUnknown)) *ppvObj = &This->IUnknown_inner; - else if (IsEqualIID (riid, &IID_IShellFolder)) - *ppvObj = _IShellFolder_ (This); - else if (IsEqualIID (riid, &IID_IShellFolder2)) - *ppvObj = _IShellFolder_ (This); + else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) + *ppvObj = &This->IShellFolder2_iface; else if (IsEqualIID (riid, &IID_IPersist)) *ppvObj = _IPersist_ (This); else if (IsEqualIID (riid, &IID_IPersistFolder)) @@ -241,7 +237,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; - sf->lpvtblShellFolder = &sfvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; @@ -259,44 +255,32 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) /************************************************************************** * IShellFolder_fnQueryInterface - * - * PARAMETERS - * REFIID riid [in ] Requested InterfaceID - * LPVOID* ppvObject [out] Interface* to hold the result */ -static HRESULT WINAPI -IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, - LPVOID * ppvObj) +static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, + void **ppvObj) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** * IShellFolder_AddRef */ - -static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) +static ULONG WINAPI IShellFolder_fnAddRef(IShellFolder2 *iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } /************************************************************************** * IShellFolder_fnRelease */ -static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) +static ULONG WINAPI IShellFolder_fnRelease(IShellFolder2 *iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -420,8 +404,8 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, } else { /* it's the last element */ if (pdwAttributes && *pdwAttributes) { - hr = SHELL32_GetItemAttributes (_IShellFolder_ (This), - pidlTemp, pdwAttributes); + hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, + pidlTemp, pdwAttributes); } } } @@ -519,7 +503,7 @@ IShellFolder_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } @@ -600,7 +584,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); + SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } @@ -1182,8 +1166,8 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) lstrcpynW (pwszName, wszNewFolder, uLen); - hr = IShellFolder_fnEnumObjects (_IShellFolder2_ (This), 0, - SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); + hr = IShellFolder2_EnumObjects(&This->IShellFolder2_iface, 0, + SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); if (penum) { LPITEMIDLIST pidl; DWORD dwFetched; @@ -1237,8 +1221,8 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, lstrcpyW(wszNewDir, pwszName); - hres = IShellFolder_ParseDisplayName((IShellFolder*)&This->lpvtblShellFolder, - hwnd, NULL, wszNewDir, NULL, &relPidl, NULL); + hres = IShellFolder2_ParseDisplayName(&This->IShellFolder2_iface, hwnd, NULL, wszNewDir, + NULL, &relPidl, NULL); if (SUCCEEDED(hres)) { LPITEMIDLIST fullPidl;

1 0

Andrew Talbot : shell32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 1a190a9da3bb9616ade6966865901296800c5426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a190a9da3bb9616ade696686… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:14:00 2013 +0000 shell32: Avoid signed-unsigned integer comparisons. --- dlls/shell32/shlview_cmenu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b46820c..92f671a 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -574,7 +574,7 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC { ContextMenu* This; HRESULT hr; - int i; + UINT i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0

Andrew Talbot : sane.ds: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 57b28bce0b485b080ab677a00b8ae77b32275176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b28bce0b485b080ab677a00… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:13:58 2013 +0000 sane.ds: Avoid signed-unsigned integer comparisons. --- dlls/sane.ds/capability.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 1381220..ee7435d 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -174,7 +174,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) if (pCapability->hContainer) { UINT16 *u; - int i; + TW_UINT32 i; a = GlobalLock (pCapability->hContainer); a->ItemType = TWTY_UINT16; a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); @@ -924,7 +924,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 #ifdef SONAME_LIBSANE static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; - int i; + unsigned int i; TW_UINT32 val; TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT);

1 0

Huw Davies : riched20: Return a BOOL that indicates whether the hit is exact.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 41dd421222dee0fb727ba71070c0a9c1b1f6300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dd421222dee0fb727ba7107… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 25 12:59:25 2013 +0000 riched20: Return a BOOL that indicates whether the hit is exact. --- dlls/riched20/caret.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0905700..5556c8e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1177,7 +1177,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) ME_SendSelChange(editor); } -static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, +static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; @@ -1192,7 +1192,7 @@ static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, { cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return; + return FALSE; } if (x >= run_x && x < run_x+width) { @@ -1202,7 +1202,7 @@ static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, cursor->nOffset = ch; cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return; + return TRUE; } } pLastRun = pNext; @@ -1218,7 +1218,7 @@ static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, cursor->pRun = pLastRun; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return; + return FALSE; } static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor)

1 0

Nikolay Sivov : msxml3: Fail to insert a node of unsupported type to a document.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: de9250537dd87ceea070a37318cd77f4650470a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9250537dd87ceea070a3731… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 24 18:04:02 2013 +0400 msxml3: Fail to insert a node of unsupported type to a document. --- dlls/msxml3/domdoc.c | 18 ++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7a3543f..f1915a3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1115,12 +1115,26 @@ static HRESULT WINAPI domdoc_insertBefore( IXMLDOMNode** outNewChild ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + DOMNodeType type; + HRESULT hr; TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild); - return node_insert_before(&This->node, newChild, &refChild, outNewChild); -} + hr = IXMLDOMNode_get_nodeType(newChild, &type); + if (hr != S_OK) return hr; + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_ATTRIBUTE: + case NODE_DOCUMENT: + case NODE_CDATA_SECTION: + if (outNewChild) *outNewChild = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newChild, &refChild, outNewChild); + } +} static HRESULT WINAPI domdoc_replaceChild( IXMLDOMDocument3 *iface, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23ee499..2ff78c2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8270,15 +8270,30 @@ todo_wine { static void test_insertBefore(void) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument *doc, *doc2, *doc3; IXMLDOMAttribute *attr; IXMLDOMElement *elem1, *elem2, *elem3, *elem4, *elem5; - IXMLDOMNode *node, *newnode; + IXMLDOMNode *node, *newnode, *cdata; HRESULT hr; VARIANT v; BSTR p; doc = create_document(&IID_IXMLDOMDocument); + doc3 = create_document(&IID_IXMLDOMDocument); + + /* document to document */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc3, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* document to itself */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); /* insertBefore behaviour for attribute node */ V_VT(&v) = VT_I4; @@ -8289,6 +8304,31 @@ static void test_insertBefore(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(attr != NULL, "got %p\n", attr); + /* attribute to document */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc3, (IXMLDOMNode*)attr, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* cdata to document */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_CDATA_SECTION; + + cdata = NULL; + hr = IXMLDOMDocument_createNode(doc3, v, _bstr_("cdata"), NULL, &cdata); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cdata != NULL, "got %p\n", cdata); + + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + IXMLDOMNode_Release(cdata); + IXMLDOMDocument_Release(doc3); + /* attribute to attribute */ V_VT(&v) = VT_I4; V_I4(&v) = NODE_ATTRIBUTE;

1 0

Huw Davies : riched20: Rewrite ME_FindPixelPos to use ME_GetRunInRow.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a6369b8332ab2afc729e318d28fd436d4c7a407b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6369b8332ab2afc729e318d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 25 12:59:27 2013 +0000 riched20: Rewrite ME_FindPixelPos to use ME_GetRunInRow. --- dlls/riched20/caret.c | 150 ++++++++++++++++--------------------------------- 1 files changed, 48 insertions(+), 102 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 34205c2..82b8e1d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -865,22 +865,48 @@ static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, return para; } -static BOOL ME_ReturnFoundPos(ME_TextEditor *editor, ME_DisplayItem *found, - ME_Cursor *result, int rx, BOOL isExact) +static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, + int x, ME_Cursor *cursor, int *pbCaretAtEnd) { - assert(found); - assert(found->type == diRun); - if ((found->member.run.nFlags & MERF_ENDPARA) || rx < 0) - rx = 0; - result->pRun = found; - result->nOffset = ME_CharFromPoint(editor, rx, &found->member.run, TRUE); - if (result->nOffset == found->member.run.len && rx) + ME_DisplayItem *pNext, *pLastRun; + pNext = ME_FindItemFwd(pRow, diRunOrStartRow); + assert(pNext->type == diRun); + if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; + cursor->nOffset = 0; + do { + int run_x = pNext->member.run.pt.x; + int width = pNext->member.run.nWidth; + if (x < run_x) + { + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return FALSE; + } + if (x >= run_x && x < run_x+width) + { + int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); + if (ch < pNext->member.run.len) + { + cursor->nOffset = ch; + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return TRUE; + } + } + pLastRun = pNext; + pNext = ME_FindItemFwd(pNext, diRunOrStartRow); + } while(pNext && pNext->type == diRun); + + if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) { - result->pRun = ME_FindItemFwd(result->pRun, diRun); - result->nOffset = 0; + cursor->pRun = ME_FindItemFwd(pNext, diRun); + if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; } - result->pPara = ME_GetParagraph(result->pRun); - return isExact; + else + cursor->pRun = pLastRun; + + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return FALSE; } /* Finds the run and offset from the pixel position. @@ -895,8 +921,6 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; - ME_DisplayItem *last = NULL; - int rx = 0; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -925,17 +949,9 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, { ME_DisplayItem *pp; assert(p->type == diStartRow); - if (y < p->member.row.pt.y + p->member.row.nHeight) - { - p = ME_FindItemFwd(p, diRun); - break; - } + if (y < p->member.row.pt.y + p->member.row.nHeight) break; pp = ME_FindItemFwd(p, diStartRow); - if (!pp) - { - p = ME_FindItemFwd(p, diRun); - break; - } + if (!pp) break; p = pp; } if (p == editor->pBuffer->pLast) @@ -945,40 +961,14 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, * determine the offset closest to the pixel position. */ isExact = FALSE; p = ME_FindItemBack(p, diStartRow); - if (p != NULL){ - p = ME_FindItemFwd(p, diRun); - } - else - { - p = editor->pBuffer->pLast; - } - } - for (; p != editor->pBuffer->pLast; p = p->next) - { - switch (p->type) - { - case diRun: - rx = x - p->member.run.pt.x; - if (rx < p->member.run.nWidth) - return ME_ReturnFoundPos(editor, p, result, rx, isExact); - break; - case diStartRow: - isExact = FALSE; - p = ME_FindItemFwd(p, diRun); - if (is_eol) *is_eol = 1; - rx = 0; /* FIXME not sure */ - return ME_ReturnFoundPos(editor, p, result, rx, isExact); - case diCell: - case diParagraph: - case diTextEnd: - isExact = FALSE; - rx = 0; /* FIXME not sure */ - p = last; - return ME_ReturnFoundPos(editor, p, result, rx, isExact); - default: assert(0); - } - last = p; + if (!p) p = editor->pBuffer->pLast; } + + assert( p->type == diStartRow || p == editor->pBuffer->pLast ); + + if( p->type == diStartRow ) + return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; + result->pRun = ME_FindItemBack(p, diRun); result->pPara = ME_GetParagraph(result->pRun); result->nOffset = 0; @@ -1177,50 +1167,6 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) ME_SendSelChange(editor); } -static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor, int *pbCaretAtEnd) -{ - ME_DisplayItem *pNext, *pLastRun; - pNext = ME_FindItemFwd(pRow, diRunOrStartRow); - assert(pNext->type == diRun); - if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; - cursor->nOffset = 0; - do { - int run_x = pNext->member.run.pt.x; - int width = pNext->member.run.nWidth; - if (x < run_x) - { - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; - } - if (x >= run_x && x < run_x+width) - { - int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) - { - cursor->nOffset = ch; - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; - } - } - pLastRun = pNext; - pNext = ME_FindItemFwd(pNext, diRunOrStartRow); - } while(pNext && pNext->type == diRun); - - if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) - { - cursor->pRun = ME_FindItemFwd(pNext, diRun); - if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; - } - else - cursor->pRun = pLastRun; - - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; -} - static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRun = pCursor->pRun;

1 0

Huw Davies : riched20: Only retrieve the next row.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 87163410e5d48aba93909b85a26eb221c9c51776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87163410e5d48aba93909b85a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 25 12:59:26 2013 +0000 riched20: Only retrieve the next row. --- dlls/riched20/caret.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5556c8e..34205c2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -930,8 +930,8 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, p = ME_FindItemFwd(p, diRun); break; } - pp = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); - if (pp->type != diStartRow) + pp = ME_FindItemFwd(p, diStartRow); + if (!pp) { p = ME_FindItemFwd(p, diRun); break;

1 0

Huw Davies : riched20: Change ME_FindRunInRow to fill out a cursor structure.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 0730db2b999a31b360e5beb9e5fb129f5d944e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0730db2b999a31b360e5beb9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 25 12:59:24 2013 +0000 riched20: Change ME_FindRunInRow to fill out a cursor structure. --- dlls/riched20/caret.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ddaa37a..0905700 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1177,28 +1177,32 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) ME_SendSelChange(editor); } -static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, int *pOffset, int *pbCaretAtEnd) +static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, + int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; - if (pOffset) *pOffset = 0; + cursor->nOffset = 0; do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; if (x < run_x) { - return pNext; + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } if (x >= run_x && x < run_x+width) { int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) { - if (pOffset) - *pOffset = ch; - return pNext; + if (ch < pNext->member.run.len) + { + cursor->nOffset = ch; + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } } pLastRun = pNext; @@ -1207,12 +1211,14 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) { - pNext = ME_FindItemFwd(pNext, diRun); + cursor->pRun = ME_FindItemFwd(pNext, diRun); if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; - return pNext; - } else { - return pLastRun; } + else + cursor->pRun = pLastRun; + + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1313,8 +1319,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) /* row not found - ignore */ return; } - pCursor->pRun = ME_FindRunInRow(editor, pItem, x, &pCursor->nOffset, &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pItem, x, pCursor, &editor->bCaretAtEnd); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1367,9 +1372,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, - &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1427,9 +1430,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, - &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun);

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_hostname implementation .
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 6c05460061fdef06150b828a9e1892455a68debf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c05460061fdef06150b828a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 25 12:35:23 2013 +0100 mshtml: Added IHTMLAnchorElement::get_hostname implementation. --- dlls/mshtml/htmlanchor.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 2b6d818..2478472 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -374,8 +374,14 @@ static HRESULT WINAPI HTMLAnchorElement_put_hostname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_hostname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString hostname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&hostname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHostname(This->nsanchor, &hostname_str); + return return_nsstr(nsres, &hostname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2013b53..70ba26d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1370,6 +1370,21 @@ static void _test_anchor_put_name(unsigned line, IUnknown *unk, const char *name _test_anchor_name(line, unk, name); } +#define test_anchor_hostname(a,h) _test_anchor_hostname(__LINE__,a,h) +static void _test_anchor_hostname(unsigned line, IUnknown *unk, const char *hostname) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_hostname(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(hostname) + ok_(__FILE__,line)(!strcmp_wa(str, hostname), "hostname = %s, expected %s\n", wine_dbgstr_w(str), hostname); + else + ok_(__FILE__,line)(str == NULL, "hostname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) @@ -6035,10 +6050,12 @@ static void test_elems(IHTMLDocument2 *doc) /* Change the href */ test_anchor_put_href((IUnknown*)elem, "http://test1/"); test_anchor_href((IUnknown*)elem, "http://test1/"); + test_anchor_hostname((IUnknown*)elem, "test1"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, "http://test/"); test_anchor_href((IUnknown*)elem, "http://test/"); + test_anchor_hostname((IUnknown*)elem, "test"); /* target */ test_anchor_get_target((IUnknown*)elem, NULL);

1 0

Jacek Caban : mshtml: Don' t report IHTMLTextContainer as supported in anchor element.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: f242d1ba838aa9a911f0919fe50796d8a742616a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f242d1ba838aa9a911f0919fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 25 12:35:11 2013 +0100 mshtml: Don't report IHTMLTextContainer as supported in anchor element. --- dlls/mshtml/htmlanchor.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index bfcf466..2b6d818 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -686,7 +686,6 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, HTMLELEMENT_TIDS, - IHTMLTextContainer_tid, IHTMLUniqueName_tid, 0 };

1 0

Rico Schüller : d3d9/tests: Use lower base hexadecimal values.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 08e20e9d693ff8904ebffb373370a2cd0a076400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e20e9d693ff8904ebffb373… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 25 12:21:39 2013 +0100 d3d9/tests: Use lower base hexadecimal values. --- dlls/d3d9/tests/visual.c | 102 +++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08e20e9d693ff8904ebff…

1 0

Alessandro Pignotti : quartz: Properly implement IGraphVersion in IFilterGraph.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: ebc37f45e654b2b3ad82cda73893dcc3def4a8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc37f45e654b2b3ad82cda73… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 19 16:15:20 2013 +0100 quartz: Properly implement IGraphVersion in IFilterGraph. --- dlls/quartz/filtergraph.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fb0f977..4140d23 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -204,6 +204,7 @@ typedef struct _IFilterGraphImpl { LONGLONG stop_position; LONG recursioncount; IUnknown *pSite; + LONG version; } IFilterGraphImpl; static inline IFilterGraphImpl *impl_from_IUnknown(IUnknown *iface) @@ -457,6 +458,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * This->ppFiltersInGraph[This->nFilters] = pFilter; This->pFilterNames[This->nFilters] = wszFilterName; This->nFilters++; + This->version++; IBaseFilter_SetSyncSource(pFilter, This->refClock); } else @@ -542,6 +544,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte memmove(This->ppFiltersInGraph+i, This->ppFiltersInGraph+i+1, sizeof(IBaseFilter*)*(This->nFilters - 1 - i)); memmove(This->pFilterNames+i, This->pFilterNames+i+1, sizeof(LPWSTR)*(This->nFilters - 1 - i)); This->nFilters--; + This->version++; /* Invalidate interfaces in the cache */ for (i = 0; i < This->nItfCacheEntries; i++) if (pFilter == This->ItfCacheEntries[i].filter) @@ -5580,9 +5583,13 @@ static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *pVer { IFilterGraphImpl *This = impl_from_IGraphVersion(iface); - FIXME("(%p)->(%p): stub!\n", This, pVersion); + if(!pVersion) + return E_POINTER; - return E_NOTIMPL; + TRACE("(%p)->(%p): current version %i\n", This, pVersion, This->version); + + *pVersion = This->version; + return S_OK; } static const IGraphVersionVtbl IGraphVersion_VTable = @@ -5653,6 +5660,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; + fimpl->version = 0; if (pUnkOuter) fimpl->outer_unk = pUnkOuter;

1 0

Rico Schüller : d3dx9: Fix typos.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a3277ed666f927bac8e1730afb519ecdf173ebe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3277ed666f927bac8e1730af… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 25 12:21:44 2013 +0100 d3dx9: Fix typos. --- dlls/d3dx9_36/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 69c3297..43c0c78 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -876,7 +876,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z) { - TRACE("pout %p, x %f, y %f, z%f\n", pout, x, y, z); + TRACE("pout %p, x %f, y %f, z %f\n", pout, x, y, z); D3DXMatrixIdentity(pout); pout->u.m[3][0] = x; @@ -1571,7 +1571,7 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou { D3DXQUATERNION q, temp1, temp2, temp3, zero; - TRACE("paout %p, pbout %p, pcout %p, pq0 %p, 1 %p, pq2 %p, pq3 %p\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); + TRACE("paout %p, pbout %p, pcout %p, pq0 %p, pq1 %p, pq2 %p, pq3 %p\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); zero.x = 0.0f; zero.y = 0.0f;

1 0

Piotr Caban : oleaut32: Fixed VARIANT_FormatDate behavior on dates before year 1600.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a2d74e5f0cac7d7e167bd8d302b6b8ffd433228e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d74e5f0cac7d7e167bd8d30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 25 11:40:56 2013 +0100 oleaut32: Fixed VARIANT_FormatDate behavior on dates before year 1600. --- dlls/oleaut32/varformat.c | 2 +- dlls/oleaut32/variant.h | 2 ++ dlls/oleaut32/vartype.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 351529c..e02ad39 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1908,7 +1908,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, WCHAR fmt_buff[80]; if (!GetLocaleInfoW(lcid, dwFmt, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || - !GetDateFormatW(lcid, 0, &udate.st, fmt_buff, pBuff, + !get_date_format(lcid, 0, &udate.st, fmt_buff, pBuff, sizeof(buff)/sizeof(WCHAR)-(pBuff-buff))) { hRes = E_INVALIDARG; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index b6af547..765c0c4 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -127,3 +127,5 @@ typedef struct tagVARIANT_NUMBER_CHARS BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; +BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, + const WCHAR *, WCHAR *, int) DECLSPEC_HIDDEN; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 28795a7..74f66de 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6596,7 +6596,7 @@ static inline int output_int_len(int o, int min_len, WCHAR *date, int date_len) } /* format date string, similar to GetDateFormatW function but works on bigger range of dates */ -static BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, +BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, const WCHAR *fmt, WCHAR *date, int date_len) { static const LCTYPE dayname[] = {

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_DiskPartition.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 30630b4da29b20da647ce161fa3ade3765b2a329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30630b4da29b20da647ce161f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 11:04:29 2013 +0100 wbemprox: Add a partial implementation of Win32_DiskPartition. --- dlls/wbemprox/builtin.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 92f3030..f48eaff 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -53,6 +53,8 @@ static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; static const WCHAR class_diskdriveW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; +static const WCHAR class_diskpartitionW[] = + {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = @@ -81,6 +83,8 @@ static const WCHAR prop_acceptstopW[] = {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; +static const WCHAR prop_bootableW[] = + {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -107,12 +111,14 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; -static const WCHAR prop_driveW[] = - {'D','r','i','v','e',0}; +static const WCHAR prop_diskindexW[] = + {'D','i','s','k','I','n','d','e','x',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; +static const WCHAR prop_driveW[] = + {'D','r','i','v','e',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_filesystemW[] = @@ -125,6 +131,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_indexW[] = + {'I','n','d','e','x',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = @@ -177,6 +185,8 @@ static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = {'S','p','e','e','d',0}; +static const WCHAR prop_startingoffsetW[] = + {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; static const WCHAR prop_strvalueW[] = @@ -240,6 +250,17 @@ static const struct column col_diskdrive[] = { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } }; +static const struct column col_diskpartition[] = +{ + { prop_bootableW, CIM_BOOLEAN }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_diskindexW, CIM_UINT32, VT_I4 }, + { prop_indexW, CIM_UINT32, VT_I4 }, + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sizeW, CIM_UINT64 }, + { prop_startingoffsetW, CIM_UINT64 }, + { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -446,6 +467,17 @@ struct record_diskdrive const WCHAR *name; const WCHAR *serialnumber; }; +struct record_diskpartition +{ + int bootable; + const WCHAR *device_id; + UINT32 diskindex; + UINT32 index; + const WCHAR *pnpdevice_id; + UINT64 size; + UINT64 startingoffset; + const WCHAR *type; +}; struct record_logicaldisk { const WCHAR *device_id; @@ -745,6 +777,54 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) return free.QuadPart; } +static void fill_diskpartition( struct table *table ) +{ + static const WCHAR fmtW[] = + {'D','i','s','k',' ','#','%','u',',',' ','P','a','r','t','i','t','i','o','n',' ','#','0',0}; + WCHAR device_id[32], root[] = {'A',':','\\',0}; + struct record_diskpartition *rec; + UINT i, num_rows = 0, offset = 0, count = 4, type, index = 0; + UINT64 size = 1024 * 1024 * 1024; + DWORD drives = GetLogicalDrives(); + + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) return; + + for (i = 0; i < sizeof(drives); i++) + { + if (drives & (1 << i)) + { + root[0] = 'A' + i; + type = GetDriveTypeW( root ); + if (type != DRIVE_FIXED && type != DRIVE_REMOVABLE) + continue; + + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) return; + table->data = data; + } + rec = (struct record_diskpartition *)(table->data + offset); + rec->bootable = (i == 2) ? -1 : 0; + sprintfW( device_id, fmtW, index ); + rec->device_id = heap_strdupW( device_id ); + rec->diskindex = index; + rec->index = 0; + rec->pnpdevice_id = heap_strdupW( device_id ); + get_freespace( root, &size ); + rec->size = size; + rec->startingoffset = 0; + rec->type = get_filesystem( root ); + offset += sizeof(*rec); + num_rows++; + index++; + } + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; +} + static void fill_logicaldisk( struct table *table ) { static const WCHAR fmtW[] = {'%','c',':',0}; @@ -1314,6 +1394,7 @@ static struct table builtin_classes[] = { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, + { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, NULL, fill_diskpartition }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os },

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_CDROMDrive.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 8b27b1d0da31e3bac0a7c6b2ea3b812ca382e498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b27b1d0da31e3bac0a7c6b2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 11:03:56 2013 +0100 wbemprox: Implement more properties of Win32_CDROMDrive. --- dlls/wbemprox/builtin.c | 65 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d97ca67..92f3030 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -107,6 +107,8 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR prop_driveW[] = + {'D','r','i','v','e',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -215,7 +217,10 @@ static const struct column col_bios[] = }; static const struct column col_cdromdrive[] = { - { prop_nameW, CIM_STRING } + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driveW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING } }; static const struct column col_compsys[] = { @@ -364,6 +369,11 @@ static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = {'W','i','n','e',' ','C','D','-','R','O','M',' ','A','T','A',' ','D','e','v','i','c','e',0}; +static const WCHAR cdromdrive_pnpdeviceidW[]= + {'I','D','E','\\','C','D','R','O','M','W','I','N','E','_','C','D','-','R','O','M', + '_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_', + '_','_','_','_','_','_','_','1','.','0','_','_','_','_','_','\\','5','&','3','A','2', + 'A','5','8','5','4','&','0','&','1','.','0','.','0',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; static const WCHAR compsys_domainW[] = @@ -413,7 +423,10 @@ struct record_bios }; struct record_cdromdrive { + const WCHAR *device_id; + const WCHAR *drive; const WCHAR *name; + const WCHAR *pnpdevice_id; }; struct record_computersystem { @@ -553,10 +566,6 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } }; -static const struct record_cdromdrive data_cdromdrive[] = -{ - { cdromdrive_nameW } -}; static const struct record_diskdrive data_diskdrive[] = { { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } @@ -603,6 +612,45 @@ static const struct record_stdregprov data_stdregprov[] = { reg_enum_key, reg_enum_values, reg_get_stringvalue } }; +static void fill_cdromdrive( struct table *table ) +{ + static const WCHAR fmtW[] = {'%','c',':',0}; + WCHAR drive[3], root[] = {'A',':','\\',0}; + struct record_cdromdrive *rec; + UINT i, num_rows = 0, offset = 0, count = 1; + DWORD drives = GetLogicalDrives(); + + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) return; + + for (i = 0; i < sizeof(drives); i++) + { + if (drives & (1 << i)) + { + root[0] = 'A' + i; + if (GetDriveTypeW( root ) != DRIVE_CDROM) + continue; + + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) return; + table->data = data; + } + rec = (struct record_cdromdrive *)(table->data + offset); + rec->device_id = cdromdrive_pnpdeviceidW; + sprintfW( drive, fmtW, 'A' + i ); + rec->drive = heap_strdupW( drive ); + rec->name = cdromdrive_nameW; + rec->pnpdevice_id = cdromdrive_pnpdeviceidW; + offset += sizeof(*rec); + num_rows++; + } + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; +} + static UINT get_processor_count(void) { SYSTEM_BASIC_INFORMATION info; @@ -1263,7 +1311,7 @@ static struct table builtin_classes[] = { { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), (BYTE *)data_baseboard }, { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios }, - { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, SIZEOF(data_cdromdrive), (BYTE *)data_cdromdrive }, + { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, @@ -1284,9 +1332,6 @@ void init_table_list( void ) static struct list tables = LIST_INIT( tables ); UINT i; - for (i = 0; i < SIZEOF(builtin_classes); i++) - { - list_add_tail( &tables, &builtin_classes[i].entry ); - } + for (i = 0; i < SIZEOF(builtin_classes); i++) list_add_tail( &tables, &builtin_classes[i].entry ); table_list = &tables; }

1 0

Hans Leidekker : wbemprox: Avoid a crash in destroy_view.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a247c7cf2326ee95f83c5e17d3e716554d55aa12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247c7cf2326ee95f83c5e17d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 11:03:33 2013 +0100 wbemprox: Avoid a crash in destroy_view. --- dlls/wbemprox/query.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 2d416ef..028b334 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -47,6 +47,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, void destroy_view( struct view *view ) { + if (!view) return; if (view->table) release_table( view->table ); heap_free( view->result ); heap_free( view );

1 0

Alessandro Pignotti : quartz: IEnumFiltersImpl needs to access data from IGraphFilterImpl.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: ea16925d8c531828090084ae8aa05b80581e00e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea16925d8c531828090084ae8… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 19 15:56:17 2013 +0100 quartz: IEnumFiltersImpl needs to access data from IGraphFilterImpl. --- dlls/quartz/enumfilters.c | 51 ++++++++++++++++++++++++++-------------- dlls/quartz/filtergraph.c | 53 +++++++++++++++++++++++++++++++++++++++-- dlls/quartz/quartz_private.h | 2 +- 3 files changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 2b9dc53..735fd79 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -28,8 +28,10 @@ typedef struct IEnumFiltersImpl { IEnumFilters IEnumFilters_iface; LONG refCount; - IBaseFilter ** ppFilters; - int nFilters; + IGraphVersion * pVersionSource; + LONG Version; + IBaseFilter *** pppFilters; + ULONG * pNumFilters; ULONG uIndex; } IEnumFiltersImpl; @@ -40,13 +42,15 @@ static inline IEnumFiltersImpl *impl_from_IEnumFilters(IEnumFilters *iface) return CONTAINING_RECORD(iface, IEnumFiltersImpl, IEnumFilters_iface); } -HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) +HRESULT IEnumFiltersImpl_Construct(IGraphVersion * pVersionSource, IBaseFilter *** pppFilters, ULONG * pNumFilters, IEnumFilters ** ppEnum) { /* Note: The incoming IBaseFilter interfaces are not AddRef'd here as in Windows, * they should have been previously AddRef'd. */ IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl)); + HRESULT hr; + LONG currentVersion; - TRACE("(%p, %d, %p)\n", ppFilters, nFilters, ppEnum); + TRACE("(%p, %p, %p)\n", pppFilters, pNumFilters, ppEnum); *ppEnum = NULL; @@ -58,15 +62,14 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn pEnumFilters->IEnumFilters_iface.lpVtbl = &IEnumFiltersImpl_Vtbl; pEnumFilters->refCount = 1; pEnumFilters->uIndex = 0; - pEnumFilters->nFilters = nFilters; - pEnumFilters->ppFilters = CoTaskMemAlloc(sizeof(IBaseFilter*) * nFilters); - if (!pEnumFilters->ppFilters) - { - CoTaskMemFree(pEnumFilters); - return E_OUTOFMEMORY; - } + pEnumFilters->pNumFilters = pNumFilters; + pEnumFilters->pppFilters = pppFilters; + IGraphVersion_AddRef(pVersionSource); + pEnumFilters->pVersionSource = pVersionSource; - memcpy(pEnumFilters->ppFilters, ppFilters, nFilters * sizeof(IBaseFilter*)); + /* Store the current version of the graph */ + hr = IGraphVersion_QueryVersion(pVersionSource, &currentVersion); + pEnumFilters->Version = (hr==S_OK) ? currentVersion : 0; *ppEnum = &pEnumFilters->IEnumFilters_iface; return S_OK; @@ -113,8 +116,7 @@ static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) if (!refCount) { - CoTaskMemFree(This->ppFilters); - CoTaskMemFree(This); + IGraphVersion_Release(This->pVersionSource); return 0; } else @@ -125,18 +127,26 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters { ULONG cFetched; ULONG i; + LONG currentVersion; IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); + HRESULT hr; - cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; + cFetched = min(*This->pNumFilters, This->uIndex + cFilters) - This->uIndex; TRACE("(%p)->(%u, %p, %p)\n", iface, cFilters, ppFilters, pcFetched); + /* First of all check if the graph has changed */ + hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); + if (hr==S_OK && This->Version != currentVersion) + return VFW_E_ENUM_OUT_OF_SYNC; + + if (!ppFilters) return E_POINTER; for (i = 0; i < cFetched; i++) { - ppFilters[i] = This->ppFilters[This->uIndex + i]; + ppFilters[i] = (*This->pppFilters)[This->uIndex + i]; IBaseFilter_AddRef(ppFilters[i]); } @@ -156,7 +166,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters TRACE("(%p)->(%u)\n", iface, cFilters); - if (This->uIndex + cFilters < This->nFilters) + if (This->uIndex + cFilters < *This->pNumFilters) { This->uIndex += cFilters; return S_OK; @@ -167,10 +177,15 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) { IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); + HRESULT hr; + LONG currentVersion; TRACE("(%p)->()\n", iface); This->uIndex = 0; + hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); + if (!hr) + This->Version = currentVersion; return S_OK; } @@ -181,7 +196,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters TRACE("(%p)->(%p)\n", iface, ppEnum); - hr = IEnumFiltersImpl_Construct(This->ppFilters, This->nFilters, ppEnum); + hr = IEnumFiltersImpl_Construct(This->pVersionSource, This->pppFilters, This->pNumFilters, ppEnum); if (FAILED(hr)) return hr; return IEnumFilters_Skip(*ppEnum, This->uIndex); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c31de59..fb0f977 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -162,11 +162,11 @@ typedef struct _IFilterGraphImpl { IGraphConfig IGraphConfig_iface; IMediaPosition IMediaPosition_iface; IObjectWithSite IObjectWithSite_iface; + IGraphVersion IGraphVersion_iface; /* IAMGraphStreams */ /* IAMStats */ /* IFilterChain */ /* IFilterMapper2 */ - /* IGraphVersion */ /* IQueueCommand */ /* IRegisterServiceProvider */ /* IResourceMananger */ @@ -179,7 +179,7 @@ typedef struct _IFilterGraphImpl { IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; - int nFilters; + ULONG nFilters; int filterCapacity; LONG nameIndex; IReferenceClock *refClock; @@ -269,6 +269,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { + *ppvObj = &This->IGraphConfig_iface; + TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -562,7 +565,7 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - return IEnumFiltersImpl_Construct(This->ppFiltersInGraph, This->nFilters, ppEnum); + return IEnumFiltersImpl_Construct(&This->IGraphVersion_iface, &This->ppFiltersInGraph, &This->nFilters, ppEnum); } static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, LPCWSTR pName, @@ -5547,6 +5550,49 @@ static const IGraphConfigVtbl IGraphConfig_VTable = GraphConfig_RemoveFilterEx }; +static inline IFilterGraphImpl *impl_from_IGraphVersion(IGraphVersion *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IGraphVersion_iface); +} + +static HRESULT WINAPI GraphVersion_QueryInterface(IGraphVersion *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI GraphVersion_AddRef(IGraphVersion *iface) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI GraphVersion_Release(IGraphVersion *iface) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *pVersion) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + FIXME("(%p)->(%p): stub!\n", This, pVersion); + + return E_NOTIMPL; +} + +static const IGraphVersionVtbl IGraphVersion_VTable = +{ + GraphVersion_QueryInterface, + GraphVersion_AddRef, + GraphVersion_Release, + GraphVersion_QueryVersion, +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5579,6 +5625,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; + fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7498ea9..d8bcdbf 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -59,7 +59,7 @@ HRESULT VMR9Impl_create(IUnknown *pUnkOuter, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum) DECLSPEC_HIDDEN; HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG size, IEnumRegFilters ** ppEnum) DECLSPEC_HIDDEN; -HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) DECLSPEC_HIDDEN; +HRESULT IEnumFiltersImpl_Construct(IGraphVersion * pVersionSource, IBaseFilter *** pppFilters, ULONG * pNumFilters, IEnumFilters ** ppEnum) DECLSPEC_HIDDEN; extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN; extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : gdiplus: Round up when converting from 32-bit ARGB to PARGB.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: d23bfd8dfc74a1955a0270feaf07ccd7a23a723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23bfd8dfc74a1955a0270fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:30:32 2013 +0800 gdiplus: Round up when converting from 32-bit ARGB to PARGB. --- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 1c016be..f199055 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -442,9 +442,9 @@ void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, for (x=0; x<width; x++) { BYTE alpha=src[3]; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; *dst++ = *src++; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a075b42..feab70b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4129,7 +4129,6 @@ static void test_ARGB_conversion(void) ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); match = !memcmp(data.Scan0, pargb, sizeof(pargb)); -todo_wine ok(match, "bits don't match\n"); if (!match) {

1 0

Ken Thomases : winemac: Implement GetCursorPos().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 38f7a4d518c66537d0919ac07904332cb8f4e208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f7a4d518c66537d0919ac07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:29 2013 -0600 winemac: Implement GetCursorPos(). --- dlls/winemac.drv/cocoa_app.m | 17 +++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 19 +++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 44fa282..d22596e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -815,3 +815,20 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) } } } + +/*********************************************************************** + * macdrv_get_cursor_position + * + * Obtains the current cursor position. Returns zero on failure, + * non-zero on success. + */ +int macdrv_get_cursor_position(CGPoint *pos) +{ + OnMainThread(^{ + NSPoint location = [NSEvent mouseLocation]; + location = [NSApp flippedMouseLocation:location]; + *pos = NSPointToCGPoint(location); + }); + + return TRUE; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 269dbea..c3ad6ba 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -120,6 +120,7 @@ extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN; +extern int macdrv_get_cursor_position(CGPoint *pos) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 8e16388..b0288f6 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -736,6 +736,25 @@ void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) /*********************************************************************** + * GetCursorPos (MACDRV.@) + */ +BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) +{ + CGPoint pt; + BOOL ret; + + ret = macdrv_get_cursor_position(&pt); + if (ret) + { + TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); + pos->x = pt.x; + pos->y = pt.y; + } + return ret; +} + + +/*********************************************************************** * SetCursor (MACDRV.@) */ void CDECL macdrv_SetCursor(HCURSOR cursor) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 6fd4bef..99746b4 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -13,6 +13,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText

1 0