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

Paul Vriens : shlwapi/tests: Fix a typo.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 1b4e61c07accf4f85eadfaa6940d868ebf7c0fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e61c07accf4f85eadfaa69… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 3 09:46:25 2009 +0100 shlwapi/tests: Fix a typo. --- dlls/shlwapi/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 86c8198..89a61c3 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -396,7 +396,7 @@ static void test_PathCombineW(void) broken(wszString[0] = 'a'), /* Win95 and some W2K */ "Expected a NULL return\n"); ok (wszString2[0] == 0 || - broken(wszString[0] = 'a'), /* Win95 and some W2K */ + broken(wszString2[0] = 'a'), /* Win95 and some W2K */ "Destination string not empty\n"); HeapFree(GetProcessHeap(), 0, wszString2);

1 0

Henri Verbeet : d3d10: Simplify DXBC chunk handlers.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 26b24ed8a5392c34ddcaf63644d5d57139282292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b24ed8a5392c34ddcaf6364… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Simplify DXBC chunk handlers. --- dlls/d3d10/effect.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bb7f7a8..656325c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -60,7 +60,7 @@ static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) } static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, void *ctx), void *ctx) + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { const char *ptr = data; HRESULT hr = S_OK; @@ -92,12 +92,19 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, for (i = 0; i < chunk_count; ++i) { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; DWORD chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - hr = chunk_handler(data + chunk_offset, ctx); + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); if (FAILED(hr)) break; } @@ -170,18 +177,15 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons return hr; } -static HRESULT shader_chunk_handler(const char *data, void *ctx) +static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - const char *ptr = data; - DWORD chunk_size; char tag_str[5]; - DWORD tag; - read_tag(&ptr, &tag, tag_str); + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; TRACE("tag: %s\n", tag_str); - read_dword(&ptr, &chunk_size); - TRACE("chunk size: %#x\n", chunk_size); + TRACE("chunk size: %#x\n", data_size); switch(tag) { @@ -393,24 +397,21 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s return parse_fx10_body(e, ptr, data_size - (ptr - data)); } -static HRESULT fx10_chunk_handler(const char *data, void *ctx) +static HRESULT fx10_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct d3d10_effect *e = ctx; - const char *ptr = data; - DWORD chunk_size; char tag_str[5]; - DWORD tag; - read_tag(&ptr, &tag, tag_str); + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; TRACE("tag: %s\n", tag_str); - read_dword(&ptr, &chunk_size); - TRACE("chunk size: %#x\n", chunk_size); + TRACE("chunk size: %#x\n", data_size); switch(tag) { case TAG_FX10: - return parse_fx10(e, ptr, chunk_size); + return parse_fx10(e, data, data_size); default: FIXME("Unhandled chunk %s\n", tag_str);

1 0

Ken Thomases : dsound: Don't use HEAP_ZERO_MEMORY when we' re about to overwrite the buffer.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: f85a7b16cab608ac1daa1881857a172d2cf29dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a7b16cab608ac1daa18818… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 2 23:17:00 2009 -0600 dsound: Don't use HEAP_ZERO_MEMORY when we're about to overwrite the buffer. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 688ad71..251c436 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->dsb->notifies = HeapAlloc(GetProcessHeap(), 0, howmuch * sizeof(DSBPOSITIONNOTIFY)); if (This->dsb->notifies == NULL) {

1 0

Francois Gouget : sane.ds: Fix compilation with older SANE headers.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 4dc89871127d220f4764939841653a4f7c2be297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc89871127d220f476493984… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 3 00:16:10 2009 +0100 sane.ds: Fix compilation with older SANE headers. --- dlls/sane.ds/capability.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index aacc6de..17005cc 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -31,6 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +#ifndef SANE_VALUE_SCAN_MODE_COLOR +#define SANE_VALUE_SCAN_MODE_COLOR SANE_I18N("Color") +#endif +#ifndef SANE_VALUE_SCAN_MODE_GRAY +#define SANE_VALUE_SCAN_MODE_GRAY SANE_I18N("Gray") +#endif +#ifndef SANE_VALUE_SCAN_MODE_LINEART +#define SANE_VALUE_SCAN_MODE_LINEART SANE_I18N("Lineart") +#endif + static TW_UINT16 get_onevalue(pTW_CAPABILITY pCapability, TW_UINT16 *type, TW_UINT32 *value) { if (pCapability->hContainer)

1 0

Jeremy White : sane.ds: Downgrade inappropriate FIXMEs.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 29df24600571f19d48fa2c0c7d7c7568317522c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29df24600571f19d48fa2c0c7… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Mar 2 16:47:47 2009 -0600 sane.ds: Downgrade inappropriate FIXMEs. --- dlls/sane.ds/sane_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 3bd231e..49a7cb3 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -656,7 +656,7 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { break; } if (!sane_devlist[i]) { - FIXME("Scanner not found.\n"); + WARN("Scanner not found.\n"); return TWRC_FAILURE; } status = psane_open(sane_devlist[i]->name,&activeDS.deviceHandle); @@ -665,7 +665,7 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = TWRC_SUCCESS; return TWRC_SUCCESS; } - FIXME("sane_open(%s): %s\n", sane_devlist[i]->name, psane_strstatus (status)); + ERR("sane_open(%s): %s\n", sane_devlist[i]->name, psane_strstatus (status)); return TWRC_FAILURE; } #endif

1 0

Michael Stefaniuc : regedit: Cast to LPARAM the 4th argument passed to SendMessage.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 3c80f741c2d37c471e86531da2edaf3bcfa41db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c80f741c2d37c471e86531da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 2 23:33:19 2009 +0100 regedit: Cast to LPARAM the 4th argument passed to SendMessage. --- programs/regedit/framewnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 6c8745e..d88ef0e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -87,7 +87,7 @@ static void OnEnterMenuLoop(HWND hWnd) /* Update the status bar pane sizes */ nParts = -1; - SendMessageW(hStatusBar, SB_SETPARTS, 1, (long)&nParts); + SendMessageW(hStatusBar, SB_SETPARTS, 1, (LPARAM)&nParts); bInMenuLoop = TRUE; SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)&empty); }

1 0

Jeremy White : sane.ds: Add a few trace messages useful in following color format.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 1d58b7e1ccb12a3185790c9e67e461eaa722bd79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d58b7e1ccb12a3185790c9e6… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Mar 2 16:48:10 2009 -0600 sane.ds: Add a few trace messages useful in following color format. --- dlls/sane.ds/capability.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 0604734..63a8361 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -386,6 +386,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { + TRACE("Setting pixeltype to %d\n", val); if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) return TWCC_BADVALUE; @@ -430,6 +431,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio case MSG_GETCURRENT: twCC = set_onevalue(pCapability, TWTY_UINT16, current_pixeltype); + TRACE("Returning current pixeltype of %d\n", current_pixeltype); break; } @@ -507,6 +509,7 @@ static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) /* .. Fall through intentional .. */ case MSG_GETCURRENT: + TRACE("Returning current bitdepth of %d\n", activeDS.sane_param.depth); twCC = set_onevalue(pCapability, TWTY_UINT16, activeDS.sane_param.depth); break; }

1 0

Jeremy White : sane.ds: Implement grayscale and B&W scanning for native image transfers.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 2c0fea94e8b8a6f868c1db6066043b9e915d2ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0fea94e8b8a6f868c1db606… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Mar 2 17:08:11 2009 -0600 sane.ds: Implement grayscale and B&W scanning for native image transfers. --- dlls/sane.ds/capability.c | 11 ++++++--- dlls/sane.ds/ds_image.c | 47 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 63a8361..aacc6de 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -685,9 +685,11 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti /* ICAP_PIXELFLAVOR */ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 action) { + TW_UINT16 twCC = TWCC_BADCAP; +#ifdef SONAME_LIBSANE static const TW_UINT32 possible_values[] = { TWPF_CHOCOLATE, TWPF_VANILLA }; TW_UINT32 val; - TW_UINT16 twCC = TWCC_BADCAP; + TW_UINT32 flavor = activeDS.sane_param.depth == 1 ? TWPF_VANILLA : TWPF_CHOCOLATE; TRACE("ICAP_PIXELFLAVOR\n"); @@ -700,7 +702,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act case MSG_GET: twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), - TWTY_UINT16, TWPF_CHOCOLATE, TWPF_CHOCOLATE); + TWTY_UINT16, flavor, flavor); break; case MSG_SET: @@ -712,16 +714,17 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GETDEFAULT: - twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE); + twCC = set_onevalue(pCapability, TWTY_UINT16, flavor); break; case MSG_RESET: /* .. fall through intentional .. */ case MSG_GETCURRENT: - twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE); + twCC = set_onevalue(pCapability, TWTY_UINT16, flavor); break; } +#endif return twCC; } diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 38689da..a78ec4e 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -142,7 +142,10 @@ TW_UINT16 SANE_ImageInfoGet (pTW_IDENTITY pOrigin, pImageInfo->Planar = TRUE; pImageInfo->SamplesPerPixel = 1; pImageInfo->BitsPerSample[0] = activeDS.sane_param.depth; - pImageInfo->PixelType = TWPT_GRAY; + if (activeDS.sane_param.depth == 1) + pImageInfo->PixelType = TWPT_BW; + else + pImageInfo->PixelType = TWPT_GRAY; } else { @@ -366,7 +369,10 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, int dib_bytes; int dib_bytes_per_line; BYTE *line; + RGBQUAD *colors; + int color_size = 0; int i; + BYTE *p; TRACE("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET\n"); @@ -397,9 +403,23 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } - if (activeDS.sane_param.format != SANE_FRAME_RGB) + if (activeDS.sane_param.format == SANE_FRAME_GRAY) { - FIXME("For NATIVE, we support only RGB, not %d\n", activeDS.sane_param.format); + if (activeDS.sane_param.depth == 8) + color_size = (1 << 8) * sizeof(*colors); + else if (activeDS.sane_param.depth == 1) + ; + else + { + FIXME("For NATIVE, we support only 1 bit monochrome and 8 bit Grayscale, not %d\n", activeDS.sane_param.depth); + psane_cancel (activeDS.deviceHandle); + activeDS.twCC = TWCC_OPERATIONERROR; + return TWRC_FAILURE; + } + } + else if (activeDS.sane_param.format != SANE_FRAME_RGB) + { + FIXME("For NATIVE, we support only GRAY and RGB, not %d\n", activeDS.sane_param.format); psane_cancel (activeDS.deviceHandle); activeDS.twCC = TWCC_OPERATIONERROR; return TWRC_FAILURE; @@ -413,7 +433,7 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, dib_bytes_per_line = ((activeDS.sane_param.bytes_per_line + 3) / 4) * 4; dib_bytes = activeDS.sane_param.lines * dib_bytes_per_line; - hDIB = GlobalAlloc(GMEM_ZEROINIT, dib_bytes + sizeof(*header)); + hDIB = GlobalAlloc(GMEM_ZEROINIT, dib_bytes + sizeof(*header) + color_size); if (hDIB) header = GlobalLock(hDIB); @@ -430,18 +450,31 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, header->biWidth = activeDS.sane_param.pixels_per_line; header->biHeight = activeDS.sane_param.lines; header->biPlanes = 1; - header->biBitCount = activeDS.sane_param.depth * 3; header->biCompression = BI_RGB; + if (activeDS.sane_param.format == SANE_FRAME_RGB) + header->biBitCount = activeDS.sane_param.depth * 3; + if (activeDS.sane_param.format == SANE_FRAME_GRAY) + header->biBitCount = activeDS.sane_param.depth; header->biSizeImage = dib_bytes; header->biXPelsPerMeter = 0; header->biYPelsPerMeter = 0; header->biClrUsed = 0; header->biClrImportant = 0; + p = (BYTE *)(header + 1); + + if (color_size > 0) + { + colors = (RGBQUAD *) p; + p += color_size; + for (i = 0; i < (color_size / sizeof(*colors)); i++) + colors[i].rgbBlue = colors[i].rgbRed = colors[i].rgbGreen = i; + } + + /* Sane returns data in top down order. Acrobat does best with a bottom up DIB being returned. */ - line = (BYTE *)(header + 1) + - (activeDS.sane_param.lines - 1) * dib_bytes_per_line; + line = p + (activeDS.sane_param.lines - 1) * dib_bytes_per_line; for (i = activeDS.sane_param.lines - 1; i >= 0; i--) { activeDS.progressWnd = ScanningDialogBox(activeDS.progressWnd,

1 0

Michael Stefaniuc : taskmgr: Cast to LPARAM the 4th argument passed to SendMessage.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: 87b15bb9fd1753993d169f610bca579db683667b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b15bb9fd1753993d169f610… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 2 23:26:51 2009 +0100 taskmgr: Cast to LPARAM the 4th argument passed to SendMessage. Casting to long would truncate the pointers when compiling with MSVC for Win64. --- programs/taskmgr/taskmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 8ba832e..b30ed8e 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -151,7 +151,7 @@ static BOOL OnCreate(HWND hWnd) nParts[0] = 100; nParts[1] = 210; nParts[2] = 400; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (long)nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); /* Create tab pages */ hTabWnd = GetDlgItem(hWnd, IDC_TAB); @@ -518,7 +518,7 @@ static void TaskManager_OnEnterMenuLoop(HWND hWnd) /* Update the status bar pane sizes */ nParts = -1; - SendMessageW(hStatusWnd, SB_SETPARTS, 1, (long)&nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM)&nParts); bInMenuLoop = TRUE; SendMessageW(hStatusWnd, SB_SETTEXTW, 0, 0); } @@ -538,7 +538,7 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) nParts[0] = 100; nParts[1] = 210; nParts[2] = rc.right; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (long)nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); SendMessageW(hStatusWnd, SB_SETTEXT, 0, 0); wsprintfW(text, wszCPU_Usage, PerfDataGetProcessorUsage()); SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text);

1 0

Jacek Caban : urlmon: Use pluggable protocol for ftp binding.
by Alexandre Julliard March 3, 2009

March 3, 2009

Module: wine Branch: master Commit: e18e6ba3d8d7edb286dde64b2f6e22bc83e6b474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18e6ba3d8d7edb286dde64b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 19:58:07 2009 +0100 urlmon: Use pluggable protocol for ftp binding. --- dlls/urlmon/umon.c | 65 ++++++++++----------------------------------------- 1 files changed, 13 insertions(+), 52 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index bbaed5b..c338b15 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -532,8 +532,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, if(SUCCEEDED(hres)) { URL_COMPONENTSW url; WCHAR *host, *path, *user, *pass; - DWORD dwService = 0; - BOOL bSuccess; TRACE("got bindinfo. bindf = %08x extrainfo = %s bindinfof = %08x bindverb = %08x iid %s\n", bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); @@ -583,23 +581,10 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, break; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_FTP_PORT; - dwService = INTERNET_SERVICE_FTP; - break; - - case INTERNET_SCHEME_GOPHER: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_GOPHER_PORT; - dwService = INTERNET_SERVICE_GOPHER; - break; - } - + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_GOPHER_PORT; bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, - dwService, 0, (DWORD_PTR)bind); + INTERNET_SERVICE_GOPHER, 0, (DWORD_PTR)bind); if (!bind->hconnect) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -612,37 +597,12 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - bSuccess = FALSE; - - switch (dwService) - { - case INTERNET_SERVICE_GOPHER: - bind->hrequest = GopherOpenFileW(bind->hconnect, - path, - 0, - INTERNET_FLAG_RELOAD, - 0); - if (bind->hrequest) - bSuccess = TRUE; - else - hres = HRESULT_FROM_WIN32(GetLastError()); - break; - - case INTERNET_SERVICE_FTP: - bind->hrequest = FtpOpenFileW(bind->hconnect, - path, - GENERIC_READ, - FTP_TRANSFER_TYPE_BINARY | - INTERNET_FLAG_TRANSFER_BINARY | - INTERNET_FLAG_RELOAD, - 0); - if (bind->hrequest) - bSuccess = TRUE; - else - hres = HRESULT_FROM_WIN32(GetLastError()); - break; - } - if(bSuccess) + bind->hrequest = GopherOpenFileW(bind->hconnect, + path, + 0, + INTERNET_FLAG_RELOAD, + 0); + if (bind->hrequest) { TRACE("res = %d gle = %u url len = %d\n", hres, GetLastError(), bind->expected_size); @@ -660,7 +620,10 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, } InternetCloseHandle(bind->hrequest); hres = S_OK; + }else { + hres = HRESULT_FROM_WIN32(GetLastError()); } + InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); @@ -704,9 +667,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, return E_FAIL; } - if(IsEqualGUID(&IID_IStream, riid) && - ( url.nScheme == INTERNET_SCHEME_FTP - || url.nScheme == INTERNET_SCHEME_GOPHER)) + if(IsEqualGUID(&IID_IStream, riid) && url.nScheme == INTERNET_SCHEME_GOPHER) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject);

1 0