wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Ričardas Barkauskas : wined3d: Make shader buffer dynamic.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: cf12f51b1520546dc855e8e8e43135a06e7a0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf12f51b1520546dc855e8e8e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:38 2013 +0200 wined3d: Make shader buffer dynamic. --- dlls/wined3d/shader.c | 28 +++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0616f0a..6444896 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) ERR("Failed to allocate shader buffer memory.\n"); return FALSE; } + buffer->buffer_size = SHADER_PGMSIZE; shader_buffer_clear(buffer); return TRUE; @@ -265,15 +266,28 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va { char *base = buffer->buffer + buffer->content_size; int rc; + char *new_buffer; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) + while(1) { - ERR("The buffer allocated for the shader program string " - "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->content_size = SHADER_PGMSIZE - 1; - return -1; + rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) + { + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); + if (!new_buffer) + { + ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); + buffer->content_size = buffer->buffer_size - 1; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; + base = buffer->buffer + buffer->content_size; + } + else + { + break; + } } if (buffer->newline) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9a3a9..b81e018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -402,11 +402,12 @@ enum wined3d_shader_rel_op * Shader model 3 according to msdn (and for software shaders) */ #define MAX_LABELS 16 -#define SHADER_PGMSIZE 65535 +#define SHADER_PGMSIZE 16384 struct wined3d_shader_buffer { char *buffer; + unsigned int buffer_size; unsigned int content_size; unsigned int lineNo; BOOL newline;

1 0

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

26 Feb '13

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 26 Feb '13

26 Feb '13

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

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

26 Feb '13

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

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

26 Feb '13

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 : sane.ds: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 26 Feb '13

26 Feb '13

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

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

26 Feb '13

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

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

26 Feb '13

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

Huw Davies : riched20: Rewrite ME_FindPixelPos to use ME_GetRunInRow.
by Alexandre Julliard 25 Feb '13

25 Feb '13

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 25 Feb '13

25 Feb '13

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

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013