October 2014 - Wine-commits

Daniel Lehman : wininet: Remove custom port handling in HTTP_HandleRedirect.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: f3455da6ffda6f1e7d70f82a4dbb7afcc200e053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3455da6ffda6f1e7d70f82a4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 24 07:43:00 2014 -0700 wininet: Remove custom port handling in HTTP_HandleRedirect. --- dlls/wininet/http.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40f8d9a..a98ed53 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4173,20 +4173,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) heap_free(session->hostName); - if(custom_port) { - int len; - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - len = lstrlenW(hostName); - len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ - session->hostName = heap_alloc(len*sizeof(WCHAR)); - sprintfW(session->hostName, fmt, hostName, urlComponents.nPort); - } - else - session->hostName = heap_strdupW(hostName); + session->hostName = heap_strdupW(hostName); session->hostPort = urlComponents.nPort; - HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - heap_free(session->userName); session->userName = NULL; if (userName[0]) @@ -4201,6 +4190,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) server_release(request->server); request->server = new_server; } + + if (custom_port) + HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + else + HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); } heap_free(request->path); request->path=NULL;

1 0

Michael Stefaniuc : oleaut32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 39eede134ea938ff40cba4dab2340bf1a7843e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eede134ea938ff40cba4dab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:01:37 2014 +0100 oleaut32: Clarify cast operation (PVS-Studio). --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48b171b..00f5043 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9144,7 +9144,7 @@ static DWORD WMSFT_append_arraydesc(ARRAYDESC *desc, WMSFT_TLBFile *file) file->arraydesc_seg.data = heap_alloc(file->arraydesc_seg.len); else file->arraydesc_seg.data = heap_realloc(file->arraydesc_seg.data, file->arraydesc_seg.len); - encoded = (DWORD*)((char *)file->arraydesc_seg.data) + offs; + encoded = (DWORD*)((char *)file->arraydesc_seg.data + offs); encoded[0] = WMSFT_append_typedesc(&desc->tdescElem, file, NULL, NULL); encoded[1] = desc->cDims | ((desc->cDims * 2 * sizeof(DWORD)) << 16);

1 0

Michael Stefaniuc : avifil32: Simplify comparing two unsigned ints ( PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 2bf09a9d25dc9b29e8f96e36c71c8256645ec994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf09a9d25dc9b29e8f96e36c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:03:33 2014 +0100 avifil32: Simplify comparing two unsigned ints (PVS-Studio). --- dlls/avifil32/editstream.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 6d38725..3aa8637 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -169,10 +169,9 @@ static HRESULT AVIFILE_RemoveStream(IAVIEditStreamImpl* const This, DWORD nr) /* remove part nr */ IAVIStream_Release(This->pStreams[nr].pStream); This->nStreams--; - if (This->nStreams - nr > 0) { - memmove(This->pStreams + nr, This->pStreams + nr + 1, - (This->nStreams - nr) * sizeof(EditStreamTable)); - } + if (nr < This->nStreams) + memmove(&This->pStreams[nr], &This->pStreams[nr + 1], + (This->nStreams - nr) * sizeof(This->pStreams[0])); This->pStreams[This->nStreams].pStream = NULL; This->pStreams[This->nStreams].dwStart = 0; This->pStreams[This->nStreams].dwLength = 0;

1 0

Bruno Jesus : wininet: Fix InternetGetConnectedStateEx[A|W].
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 5e13e7f809075f28c0a8fb9fe7d3aa6cf0f50e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e13e7f809075f28c0a8fb9fe… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 27 20:41:02 2014 -0200 wininet: Fix InternetGetConnectedStateEx[A|W]. --- dlls/wininet/internet.c | 12 ++++++++++-- dlls/wininet/tests/internet.c | 14 -------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2a2876c..4847ca0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1276,13 +1276,21 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti /* Must be zero */ if(dwReserved) - return FALSE; + return FALSE; if (lpdwStatus) { WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } - return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen) > 0; + + /* When the buffer size is zero LoadStringW fills the buffer with a pointer to + * the resource, avoid it as we must not change the buffer in this case */ + if(lpszConnectionName && dwNameLen) { + *lpszConnectionName = '\0'; + LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + } + + return TRUE; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fc965e2..1548615 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1525,19 +1525,16 @@ static void test_InternetGetConnectedStateExA(void) trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); res = pInternetGetConnectedStateExA(NULL, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); @@ -1558,7 +1555,6 @@ todo_wine flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1580,7 +1576,6 @@ todo_wine buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); @@ -1595,10 +1590,8 @@ todo_wine flags = 0; buffer[0] = 0xDE; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } @@ -1621,12 +1614,10 @@ static void test_InternetGetConnectedStateExW(void) trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); res = pInternetGetConnectedStateExW(NULL, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1635,7 +1626,6 @@ todo_wine res = pInternetGetConnectedStateExW(&flags, buffer, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); buffer[0] = 0; @@ -1654,7 +1644,6 @@ todo_wine flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1676,7 +1665,6 @@ todo_wine buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); @@ -1691,10 +1679,8 @@ todo_wine buffer[0] = 0xDEAD; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); }

1 0

André Hentschel : kernel32: Set COMPUTERNAME environment variable.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: e404d7fea3f889ce273d74e5ec274efe8a45296c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e404d7fea3f889ce273d74e5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 27 23:50:34 2014 +0100 kernel32: Set COMPUTERNAME environment variable. --- dlls/kernel32/process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 138273b..0a087ab 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -512,13 +512,20 @@ static void set_additional_environment(void) 'P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR *profile_dir = NULL, *all_users_dir = NULL; + WCHAR buf[MAX_COMPUTERNAME_LENGTH]; HANDLE hkey; DWORD len; + /* ComputerName */ + len = sizeof(buf) / sizeof(WCHAR); + if (GetComputerNameW( buf, &len )) + SetEnvironmentVariableW( computernameW, buf ); + /* set the ALLUSERSPROFILE variables */ attr.Length = sizeof(attr);

1 0

André Hentschel : gdiplus: Adjust identical conditions (PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: f1ed09fdd961cd3bde36e2cfd96cadcdd56d1083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ed09fdd961cd3bde36e2cfd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 27 23:56:10 2014 +0100 gdiplus: Adjust identical conditions (PVS-Studio). --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 169d92c..d192bf2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1779,7 +1779,7 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * for(i = 1; i < count; i++){ if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){ if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier) - || !(types[i + 1] & PathPointTypeBezier)){ + || !(types[i + 2] & PathPointTypeBezier)){ ERR("Bad bezier points\n"); goto end; }

1 0

André Hentschel : gdi32: Fix typo in a condition ( PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 88e8102570f46826c089415a72f6d9fb8feffce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e8102570f46826c089415a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:07 2014 +0100 gdi32: Fix typo in a condition (PVS-Studio). --- dlls/gdi32/enhmetafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 99a2415..61f541f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1416,7 +1416,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if ((info->state.mode != MM_ISOTROPIC) && (info->state.mode != MM_ANISOTROPIC)) break; if (!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->xDenom || - !lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->yDenom) + !lpScaleWindowExtEx->yNum || !lpScaleWindowExtEx->yDenom) break; info->state.wndExtX = MulDiv(info->state.wndExtX, lpScaleWindowExtEx->xNum, lpScaleWindowExtEx->xDenom);

1 0

André Hentschel : wrc: Remove duplicate code ( PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 9b810cd6e884facde7152a79a6474c3637b260ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b810cd6e884facde7152a79a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:09 2014 +0100 wrc: Remove duplicate code (PVS-Studio). --- tools/wrc/genres.c | 178 ++++++++++++++++++----------------------------------- 1 file changed, 61 insertions(+), 117 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 9cea432..8993a87 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -960,86 +960,48 @@ static res_t *cursorgroup2res(name_id_t *name, cursor_group_t *curg) res = new_res(); restag = put_res_header(res, WRC_RT_GROUP_CURSOR, NULL, name, curg->memopt, &(curg->lvc)); - if(win32) - { - put_word(res, 0); /* Reserved */ - /* FIXME: The ResType in the NEWHEADER structure should - * contain 14 according to the MS win32 doc. This is - * not the case with the BRC compiler and I really doubt - * the latter. Putting one here is compliant to win16 spec, - * but who knows the true value? - */ - put_word(res, 2); /* ResType */ - put_word(res, curg->ncursor); -#if 0 - for(cur = curg->cursorlist; cur; cur = cur->next) -#else - cur = curg->cursorlist; - while(cur->next) - cur = cur->next; - for(; cur; cur = cur->prev) -#endif - { - put_word(res, cur->width); - /* FIXME: The height of a cursor is half the size of - * the bitmap's height. BRC puts the height from the - * BITMAPINFOHEADER here instead of the cursorfile's - * height. MS doesn't seem to care... - */ - put_word(res, cur->height); - /* FIXME: The next two are reversed in BRC and I don't - * know why. Probably a bug. But, we can safely ignore - * it because win16 does not support color cursors. - * A warning should have been generated by the parser. - */ - put_word(res, cur->planes); - put_word(res, cur->bits); - /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I could not find this in the documentation. - * The hotspot bytes must either be included or MS - * doesn't care. - */ - put_dword(res, cur->data->size +4); - put_word(res, cur->id); - } - } - else /* win16 */ - { - put_word(res, 0); /* Reserved */ - put_word(res, 2); /* ResType */ - put_word(res, curg->ncursor); + + put_word(res, 0); /* Reserved */ + /* FIXME: The ResType in the NEWHEADER structure should + * contain 14 according to the MS win32 doc. This is + * not the case with the BRC compiler and I really doubt + * the latter. Putting one here is compliant to win16 spec, + * but who knows the true value? + */ + put_word(res, 2); /* ResType */ + put_word(res, curg->ncursor); #if 0 - for(cur = curg->cursorlist; cur; cur = cur->next) + for(cur = curg->cursorlist; cur; cur = cur->next) #else - cur = curg->cursorlist; - while(cur->next) - cur = cur->next; - for(; cur; cur = cur->prev) + cur = curg->cursorlist; + while(cur->next) + cur = cur->next; + for(; cur; cur = cur->prev) #endif - { - put_word(res, cur->width); - /* FIXME: The height of a cursor is half the size of - * the bitmap's height. BRC puts the height from the - * BITMAPINFOHEADER here instead of the cursorfile's - * height. MS doesn't seem to care... - */ - put_word(res, cur->height); - /* FIXME: The next two are reversed in BRC and I don't - * know why. Probably a bug. But, we can safely ignore - * it because win16 does not support color cursors. - * A warning should have been generated by the parser. - */ - put_word(res, cur->planes); - put_word(res, cur->bits); - /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I could not find this in the documentation. - * The hotspot bytes must either be included or MS - * doesn't care. - */ - put_dword(res, cur->data->size +4); - put_word(res, cur->id); - } - } + { + put_word(res, cur->width); + /* FIXME: The height of a cursor is half the size of + * the bitmap's height. BRC puts the height from the + * BITMAPINFOHEADER here instead of the cursorfile's + * height. MS doesn't seem to care... + */ + put_word(res, cur->height); + /* FIXME: The next two are reversed in BRC and I don't + * know why. Probably a bug. But, we can safely ignore + * it because win16 does not support color cursors. + * A warning should have been generated by the parser. + */ + put_word(res, cur->planes); + put_word(res, cur->bits); + /* FIXME: The +4 is the hotspot in the cursor resource. + * However, I could not find this in the documentation. + * The hotspot bytes must either be included or MS + * doesn't care. + */ + put_dword(res, cur->data->size +4); + put_word(res, cur->id); + } + SetResSize(res, restag); /* Set ResourceSize */ if(win32) put_pad(res); @@ -1103,46 +1065,28 @@ static res_t *icongroup2res(name_id_t *name, icon_group_t *icog) res = new_res(); restag = put_res_header(res, WRC_RT_GROUP_ICON, NULL, name, icog->memopt, &(icog->lvc)); - if(win32) - { - put_word(res, 0); /* Reserved */ - /* FIXME: The ResType in the NEWHEADER structure should - * contain 14 according to the MS win32 doc. This is - * not the case with the BRC compiler and I really doubt - * the latter. Putting one here is compliant to win16 spec, - * but who knows the true value? - */ - put_word(res, 1); /* ResType */ - put_word(res, icog->nicon); - for(ico = icog->iconlist; ico; ico = ico->next) - { - put_byte(res, ico->width); - put_byte(res, ico->height); - put_byte(res, ico->nclr); - put_byte(res, 0); /* Reserved */ - put_word(res, ico->planes); - put_word(res, ico->bits); - put_dword(res, ico->data->size); - put_word(res, ico->id); - } - } - else /* win16 */ - { - put_word(res, 0); /* Reserved */ - put_word(res, 1); /* ResType */ - put_word(res, icog->nicon); - for(ico = icog->iconlist; ico; ico = ico->next) - { - put_byte(res, ico->width); - put_byte(res, ico->height); - put_byte(res, ico->nclr); - put_byte(res, 0); /* Reserved */ - put_word(res, ico->planes); - put_word(res, ico->bits); - put_dword(res, ico->data->size); - put_word(res, ico->id); - } - } + + put_word(res, 0); /* Reserved */ + /* FIXME: The ResType in the NEWHEADER structure should + * contain 14 according to the MS win32 doc. This is + * not the case with the BRC compiler and I really doubt + * the latter. Putting one here is compliant to win16 spec, + * but who knows the true value? + */ + put_word(res, 1); /* ResType */ + put_word(res, icog->nicon); + for(ico = icog->iconlist; ico; ico = ico->next) + { + put_byte(res, ico->width); + put_byte(res, ico->height); + put_byte(res, ico->nclr); + put_byte(res, 0); /* Reserved */ + put_word(res, ico->planes); + put_word(res, ico->bits); + put_dword(res, ico->data->size); + put_word(res, ico->id); + } + SetResSize(res, restag); /* Set ResourceSize */ if(win32) put_pad(res);

1 0

André Hentschel : comdlg32: Remove duplicate code ( PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: c4747f46cfa83a69801f6e961a938ca91fbf80fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4747f46cfa83a69801f6e961… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:11 2014 +0100 comdlg32: Remove duplicate code (PVS-Studio). --- dlls/comdlg32/filedlg.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0f1a144..f76d01e 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3270,7 +3270,6 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) int iIndentation; TEXTMETRICW tm; LPSFOLDER tmpFolder; - LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; @@ -3293,16 +3292,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) shgfi_flags |= SHGFI_SMALLICON; } - if(pDIStruct->itemID == liInfos->uSelectedItem) - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } - else - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } + ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, + 0, &sfi, sizeof (sfi), shgfi_flags ); /* Is this item selected ? */ if(pDIStruct->itemState & ODS_SELECTED) @@ -3320,16 +3311,10 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Do not indent item if drawing in the edit of the combo */ if(pDIStruct->itemState & ODS_COMBOBOXEDIT) - { iIndentation = 0; - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - - } else - { iIndentation = tmpFolder->m_iIndent; - } + /* Draw text and icon */ /* Initialise the icon display area */

1 0

Alexandre Julliard : comdlg32: Use PathAddBackslash to avoid a compiler warning.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 2b40148e1e73165ac0c85fd122657661cc103b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40148e1e73165ac0c85fd12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 14:33:17 2014 +0900 comdlg32: Use PathAddBackslash to avoid a compiler warning. --- dlls/comdlg32/filedlg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f76d01e..2738467 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1599,9 +1599,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* initdir does not have to be a directory. If a file is * specified, the dir part is taken */ if( PathIsDirectoryW(tmpBuf)) { - if (tmpBuf[lstrlenW(tmpBuf)-1] != '\\') { - lstrcatW(tmpBuf, szwSlash); - } + PathAddBackslashW( tmpBuf ); lstrcatW(tmpBuf, szwStar); } result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);

1 0