wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aurimas Fišeras : avifil32: Add Lithuanian translation .
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: ce349981a2e70c920cf974327658458a145fd158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce349981a2e70c920cf974327… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 23 17:29:49 2009 +0300 avifil32: Add Lithuanian translation. --- dlls/avifil32/avifile_Lt.rc | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Lt.rc b/dlls/avifil32/avifile_Lt.rc new file mode 100644 index 0000000..51ee84d --- /dev/null +++ b/dlls/avifil32/avifile_Lt.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Glaudinimo parametrai" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Pasirinkite srautą:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Parinktys...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Įtarpuoti kas",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "kadrų",-1,129,43,36,9 + LTEXT "Dabartinis formatas:",-1,3,56,73,9 + LTEXT "Ši vieta išnuomojama",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "Gerai",IDOK,170,42,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Bangos forma: %s" + IDS_WAVEFILETYPE "Bangos forma" + IDS_ALLMULTIMEDIA "Visi multimedijos failai" + IDS_ALLFILES "Visi failai (*.*)(a)*.*" + IDS_VIDEO "vaizdas" + IDS_AUDIO "garsas" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine numatyta-AVI-doroklė" + IDS_UNCOMPRESSED "neglaudintas" +} + +#pragma code_page(default) diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index 68fbab3..5eda656 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -48,6 +48,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_It.rc" #include "avifile_Ja.rc" #include "avifile_Ko.rc" +#include "avifile_Lt.rc" #include "avifile_Nl.rc" #include "avifile_No.rc" #include "avifile_Pl.rc"

1 0

Alexandre Julliard : configure: Rename the shared heap segment to avoid a Mac OS linker bug with 16-char names .
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 691bdbd12396678ef25e342333a3112d40a264f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691bdbd12396678ef25e34233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 20:51:37 2009 +0200 configure: Rename the shared heap segment to avoid a Mac OS linker bug with 16-char names. --- configure | 2 +- configure.ac | 2 +- loader/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2d40991..2b759b7 100755 --- a/configure +++ b/configure @@ -7274,7 +7274,7 @@ fi IOKITLIB="-framework IOKit -framework CoreFoundation" - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000" if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then diff --git a/configure.ac b/configure.ac index 7f15375..eb276b6 100644 --- a/configure.ac +++ b/configure.ac @@ -580,7 +580,7 @@ case $host_os in AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"]) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found diff --git a/loader/main.c b/loader/main.c index c3189ec..0ead6d4 100644 --- a/loader/main.c +++ b/loader/main.c @@ -41,7 +41,7 @@ #ifdef __APPLE__ asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000"); -asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x03000000"); +asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); extern char __wine_dos[0x60000000], __wine_shared_heap[0x03000000]; static const struct wine_preload_info wine_main_preload_info[] =

1 0

Huw Davies : gdi32: Add tests for SetVirtualResolution.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e920f5f7d75635545d9cebb9f2e17fb22d0c2338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920f5f7d75635545d9cebb9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 14:58:17 2009 +0100 gdi32: Add tests for SetVirtualResolution. --- dlls/gdi32/tests/mapping.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 0342817..cb8160d 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -342,9 +342,101 @@ static void test_isotropic_mapping(void) ReleaseDC(0, hdc); } +static void test_setvirtualresolution(void) +{ + HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); + DWORD r; + DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); + INT horz_res = GetDeviceCaps(hdc, HORZRES); + INT horz_size = GetDeviceCaps(hdc, HORZSIZE); + INT log_pixels_x = GetDeviceCaps(hdc, LOGPIXELSX); + SIZE orig_lometric_vp, orig_lometric_wnd; + + pSetVirtualResolution = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetVirtualResolution"); + + if(!pSetVirtualResolution) + { + win_skip("Don't have SetVirtualResolution\n"); + return; + } + + /* Get the true resolution limits */ + SetMapMode(hdc, MM_LOMETRIC); + GetViewportExtEx(hdc, &orig_lometric_vp); + GetWindowExtEx(hdc, &orig_lometric_wnd); + SetMapMode(hdc, MM_TEXT); + + r = pSetVirtualResolution(hdc, 4000, 1000, 400, 200); /* 10 pix/mm x 5 pix/mm */ + ok(r == TRUE, "got %d\n", r); + expect_LPtoDP(hdc, 1000, 1000); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 1000, -500); + expect_viewport_ext(hdc, 4000, -1000); + expect_window_ext(hdc, 4000, 2000); + + /* Doesn't change the device caps */ + ok(horz_res == GetDeviceCaps(hdc, HORZRES), "horz_res changed\n"); + ok(horz_size == GetDeviceCaps(hdc, HORZSIZE), "horz_size changed\n"); + ok(log_pixels_x == GetDeviceCaps(hdc, LOGPIXELSX), "log_pixels_x changed\n"); + + r = pSetVirtualResolution(hdc, 8000, 1000, 400, 200); /* 20 pix/mm x 5 pix/mm */ + ok(r == TRUE, "got %d\n", r); + expect_LPtoDP(hdc, 1000, -500); /* No change, need to re-set the mapping mode */ + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 2000, -500); + expect_viewport_ext(hdc, 8000, -1000); + expect_window_ext(hdc, 4000, 2000); + + r = pSetVirtualResolution(hdc, 8000, 1000, 200, 200); /* 40 pix/mm x 5 pix/mm */ + ok(r == TRUE, "got %d\n", r); + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 4000, -500); + expect_viewport_ext(hdc, 8000, -1000); + expect_window_ext(hdc, 2000, 2000); + + r = pSetVirtualResolution(hdc, 8000, 1000, 200, 200); /* 40 pix/mm x 5 pix/mm */ + ok(r == TRUE, "got %d\n", r); + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 4000, -500); + expect_viewport_ext(hdc, 8000, -1000); + expect_window_ext(hdc, 2000, 2000); + + r = pSetVirtualResolution(hdc, 8000, 2000, 200, 200); /* 40 pix/mm x 10 pix/mm */ + ok(r == TRUE, "got %d\n", r); + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 4000, -1000); + expect_viewport_ext(hdc, 8000, -2000); + expect_window_ext(hdc, 2000, 2000); + + r = pSetVirtualResolution(hdc, 0, 0, 10, 0); /* Error */ + ok(r == FALSE, "got %d\n", r); + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_LPtoDP(hdc, 4000, -1000); + expect_viewport_ext(hdc, 8000, -2000); + expect_window_ext(hdc, 2000, 2000); + + r = pSetVirtualResolution(hdc, 0, 0, 0, 0); /* Reset to true resolution */ + ok(r == TRUE, "got %d\n", r); + SetMapMode(hdc, MM_TEXT); + SetMapMode(hdc, MM_LOMETRIC); + expect_viewport_ext(hdc, orig_lometric_vp.cx, orig_lometric_vp.cy); + expect_window_ext(hdc, orig_lometric_wnd.cx, orig_lometric_wnd.cy); + + DeleteDC(hdc); +} + START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); test_isotropic_mapping(); + test_setvirtualresolution(); }

1 0

Huw Davies : gdi32: Implement SetVirtualResolution.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 5c386041fc0814b52887f8e208e0215e32c54809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c386041fc0814b52887f8e20… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 14:55:32 2009 +0100 gdi32: Implement SetVirtualResolution. --- dlls/gdi32/dc.c | 16 +++------- dlls/gdi32/enhmfdrv/init.c | 2 + dlls/gdi32/gdi_private.h | 4 ++ dlls/gdi32/mapping.c | 70 +++++++++++++++++++++++++++++++++++++++----- dlls/gdi32/mfdrv/init.c | 2 + 5 files changed, 75 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 04e4942..30bd7a4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -252,6 +252,7 @@ void DC_InitDC( DC* dc ) SelectObject( dc->hSelf, dc->hBrush ); SelectObject( dc->hSelf, dc->hFont ); CLIPPING_UpdateGCRegion( dc ); + SetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); } @@ -386,6 +387,8 @@ INT save_dc_state( HDC hdc ) newdc->vportOrgY = dc->vportOrgY; newdc->vportExtX = dc->vportExtX; newdc->vportExtY = dc->vportExtY; + newdc->virtual_res = dc->virtual_res; + newdc->virtual_size = dc->virtual_size; newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; @@ -524,6 +527,8 @@ BOOL restore_dc_state( HDC hdc, INT level ) dc->vportOrgY = dcs->vportOrgY; dc->vportExtX = dcs->vportExtX; dc->vportExtY = dcs->vportExtY; + dc->virtual_res = dcs->virtual_res; + dc->virtual_size = dcs->virtual_size; if (dcs->hClipRgn) { @@ -2103,17 +2108,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } -/*********************************************************************** - * SetVirtualResolution (GDI32.@) - * - * Undocumented on msdn. Called when PowerPoint XP saves a file. - */ -DWORD WINAPI SetVirtualResolution(HDC hdc, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) -{ - FIXME("(%p %08x %08x %08x %08x): stub!\n", hdc, dw2, dw3, dw4, dw5); - return FALSE; -} - /******************************************************************* * GetMiterLimit [GDI32.@] * diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5d2453a..dd0b89e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -358,6 +358,8 @@ HDC WINAPI CreateEnhMetaFileW( physDev->numcolors = GetDeviceCaps(hRefDC, NUMCOLORS); physDev->restoring = 0; + SetVirtualResolution(dc->hSelf, 0, 0, 0, 0); + physDev->emh->iType = EMR_HEADER; physDev->emh->nSize = size; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index da66ade..d7f1d91 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -263,6 +263,8 @@ typedef struct tagDC INT vportOrgY; INT vportExtX; /* Viewport extent */ INT vportExtY; + SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ + SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ FLOAT miterLimit; int flags; @@ -511,4 +513,6 @@ extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN BOOL WINAPI FontIsLinked(HDC); +BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size); + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index c802a10..e199dd3 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -37,10 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); */ static void MAPPING_FixIsotropic( DC * dc ) { - double xdim = fabs((double)dc->vportExtX * GetDeviceCaps( dc->hSelf, HORZSIZE ) / - (GetDeviceCaps( dc->hSelf, HORZRES ) * dc->wndExtX)); - double ydim = fabs((double)dc->vportExtY * GetDeviceCaps( dc->hSelf, VERTSIZE ) / - (GetDeviceCaps( dc->hSelf, VERTRES ) * dc->wndExtY)); + double xdim = fabs((double)dc->vportExtX * dc->virtual_size.cx / + (dc->virtual_res.cx * dc->wndExtX)); + double ydim = fabs((double)dc->vportExtY * dc->virtual_size.cy / + (dc->virtual_res.cy * dc->wndExtY)); if (xdim > ydim) { @@ -137,10 +137,10 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) if (mode == dc->MapMode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) goto done; - horzSize = GetDeviceCaps( hdc, HORZSIZE ); - vertSize = GetDeviceCaps( hdc, VERTSIZE ); - horzRes = GetDeviceCaps( hdc, HORZRES ); - vertRes = GetDeviceCaps( hdc, VERTRES ); + horzSize = dc->virtual_size.cx; + vertSize = dc->virtual_size.cy; + horzRes = dc->virtual_res.cx; + vertRes = dc->virtual_res.cy; switch(mode) { case MM_TEXT: @@ -481,3 +481,57 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, release_dc_ptr( dc ); return ret; } + +/*********************************************************************** + * SetVirtualResolution (GDI32.@) + * + * Undocumented on msdn. + * + * Changes the values of screen size in pixels and millimeters used by + * the mapping mode functions. + * + * PARAMS + * hdc [I] Device context + * horz_res [I] Width in pixels (equivalent to HORZRES device cap). + * vert_res [I] Height in pixels (equivalent to VERTRES device cap). + * horz_size [I] Width in mm (equivalent to HORZSIZE device cap). + * vert_size [I] Height in mm (equivalent to VERTSIZE device cap). + * + * RETURNS + * TRUE if successful. + * FALSE if any (but not all) of the last four params are zero. + * + * NOTES + * This doesn't change the values returned by GetDeviceCaps, just the + * scaling of the mapping modes. + * + * Calling with the last four params equal to zero sets the values + * back to their defaults obtained by calls to GetDeviceCaps. + */ +BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, + DWORD horz_size, DWORD vert_size) +{ + DC * dc; + TRACE("(%p %d %d %d %d)\n", hdc, horz_res, vert_res, horz_size, vert_size); + + if(horz_res == 0 && vert_res == 0 && horz_size == 0 && vert_size == 0) + { + horz_res = GetDeviceCaps(hdc, HORZRES); + vert_res = GetDeviceCaps(hdc, VERTRES); + horz_size = GetDeviceCaps(hdc, HORZSIZE); + vert_size = GetDeviceCaps(hdc, VERTSIZE); + } + else if(horz_res == 0 || vert_res == 0 || horz_size == 0 || vert_size == 0) + return FALSE; + + dc = get_dc_ptr( hdc ); + if (!dc) return FALSE; + + dc->virtual_res.cx = horz_res; + dc->virtual_res.cy = vert_res; + dc->virtual_size.cx = horz_size; + dc->virtual_size.cy = vert_size; + + release_dc_ptr( dc ); + return TRUE; +} diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index ad29cb0..a5b18d3 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -197,6 +197,8 @@ static DC *MFDRV_AllocMetaFile(void) physDev->mh->mtMaxRecord = 0; physDev->mh->mtNoParameters = 0; + SetVirtualResolution(dc->hSelf, 0, 0, 0, 0); + return dc; }

1 0

Alexandre Julliard : winedbg: Don't display the crash dialog for winedevice .exe, it only confuses users.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 8c7feab0f99ad104e5803537ada839e15280fb10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7feab0f99ad104e5803537a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 16:20:33 2009 +0200 winedbg: Don't display the crash dialog for winedevice.exe, it only confuses users. --- programs/winedbg/crashdlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 3b32adb..db25021 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -153,6 +153,8 @@ static INT_PTR WINAPI DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) BOOL display_crash_dialog(void) { + static const WCHAR winedeviceW[] = {'w','i','n','e','d','e','v','i','c','e','.','e','x','e',0}; + INT_PTR result; /* dbg_curr_process->handle is not set */ HANDLE hProcess; @@ -163,6 +165,7 @@ BOOL display_crash_dialog(void) hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid); g_ProgramName = get_program_name(hProcess); CloseHandle(hProcess); + if (!strcmpW( g_ProgramName, winedeviceW )) return TRUE; result = DialogBoxW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDD_CRASH_DLG), NULL, DlgProc); if (result == ID_DEBUG) { AllocConsole();

1 0

Jacek Caban : urlmon: Query for IHtmlNegotiate[2] interfaces when needed.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 150f79b5876016b93dc384bb0919e2798326a7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150f79b5876016b93dc384bb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 23 14:53:10 2009 +0200 urlmon: Query for IHtmlNegotiate[2] interfaces when needed. --- dlls/urlmon/bindctx.c | 91 +++++++++++++++++++---------------------------- dlls/urlmon/tests/url.c | 6 --- 2 files changed, 37 insertions(+), 60 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 8c1949b..7438383 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -37,13 +37,6 @@ typedef struct { IBindStatusCallback *callback; IServiceProvider *serv_prov; - - IHttpNegotiate *http_negotiate; - BOOL init_http_negotiate; - IHttpNegotiate2 *http_negotiate2; - BOOL init_http_negotiate2; - IAuthenticate *authenticate; - BOOL init_authenticate; } BindStatusCallback; #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) @@ -51,6 +44,18 @@ typedef struct { #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpAuthenticateVtbl) +static void *get_callback_iface(BindStatusCallback *This, REFIID riid) +{ + void *ret; + HRESULT hres; + + hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + if(FAILED(hres) && This->serv_prov) + IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); + + return ret; +} + #define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -112,12 +117,6 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) if(!ref) { if(This->serv_prov) IServiceProvider_Release(This->serv_prov); - if(This->http_negotiate) - IHttpNegotiate_Release(This->http_negotiate); - if(This->http_negotiate2) - IHttpNegotiate2_Release(This->http_negotiate2); - if(This->authenticate) - IAuthenticate_Release(This->authenticate); IBindStatusCallback_Release(This->callback); heap_free(This); } @@ -250,46 +249,16 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface, if(IsEqualGUID(&IID_IHttpNegotiate, guidService)) { TRACE("(%p)->(IID_IHttpNegotiate %s %p)\n", This, debugstr_guid(riid), ppv); - - if(!This->init_http_negotiate) { - This->init_http_negotiate = TRUE; - hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IHttpNegotiate, - (void**)&This->http_negotiate); - if(FAILED(hres) && This->serv_prov) - IServiceProvider_QueryService(This->serv_prov, &IID_IHttpNegotiate, - &IID_IHttpNegotiate, (void**)&This->http_negotiate); - } - return IBindStatusCallback_QueryInterface(STATUSCLB(This), riid, ppv); } if(IsEqualGUID(&IID_IHttpNegotiate2, guidService)) { TRACE("(%p)->(IID_IHttpNegotiate2 %s %p)\n", This, debugstr_guid(riid), ppv); - - if(!This->init_http_negotiate2) { - This->init_http_negotiate2 = TRUE; - hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IHttpNegotiate2, - (void**)&This->http_negotiate2); - if(FAILED(hres) && This->serv_prov) - IServiceProvider_QueryService(This->serv_prov, &IID_IHttpNegotiate2, - &IID_IHttpNegotiate2, (void**)&This->http_negotiate2); - } - return IBindStatusCallback_QueryInterface(STATUSCLB(This), riid, ppv); } if(IsEqualGUID(&IID_IAuthenticate, guidService)) { TRACE("(%p)->(IID_IAuthenticate %s %p)\n", This, debugstr_guid(riid), ppv); - - if(!This->init_authenticate) { - This->init_authenticate = TRUE; - hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IAuthenticate, - (void**)&This->authenticate); - if(FAILED(hres) && This->serv_prov) - IServiceProvider_QueryService(This->serv_prov, &IID_IAuthenticate, - &IID_IAuthenticate, (void**)&This->authenticate); - } - return IBindStatusCallback_QueryInterface(STATUSCLB(This), riid, ppv); } @@ -342,17 +311,22 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate2 *ifa LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { BindStatusCallback *This = HTTPNEG2_THIS(iface); + IHttpNegotiate *http_negotiate; + HRESULT hres = S_OK; TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); *pszAdditionalHeaders = NULL; - if(!This->http_negotiate) - return S_OK; + http_negotiate = get_callback_iface(This, &IID_IHttpNegotiate); + if(http_negotiate) { + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, szURL, szHeaders, + dwReserved, pszAdditionalHeaders); + IHttpNegotiate_Release(http_negotiate); + } - return IHttpNegotiate_BeginningTransaction(This->http_negotiate, szURL, szHeaders, - dwReserved, pszAdditionalHeaders); + return hres; } static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, @@ -361,14 +335,18 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD { BindStatusCallback *This = HTTPNEG2_THIS(iface); LPWSTR additional_headers = NULL; + IHttpNegotiate *http_negotiate; HRESULT hres = S_OK; TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - if(This->http_negotiate) - hres = IHttpNegotiate_OnResponse(This->http_negotiate, dwResponseCode, szResponseHeaders, - szRequestHeaders, &additional_headers); + http_negotiate = get_callback_iface(This, &IID_IHttpNegotiate); + if(http_negotiate) { + hres = IHttpNegotiate_OnResponse(http_negotiate, dwResponseCode, szResponseHeaders, + szRequestHeaders, &additional_headers); + IHttpNegotiate_Release(http_negotiate); + } if(pszAdditionalRequestHeaders) *pszAdditionalRequestHeaders = additional_headers; @@ -382,14 +360,19 @@ static HRESULT WINAPI BSCHttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { BindStatusCallback *This = HTTPNEG2_THIS(iface); + IHttpNegotiate2 *http_negotiate2; + HRESULT hres = E_FAIL; TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); - if(!This->http_negotiate2) - return E_NOTIMPL; + http_negotiate2 = get_callback_iface(This, &IID_IHttpNegotiate2); + if(http_negotiate2) { + hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, pbSecurityId, + pcbSecurityId, dwReserved); + IHttpNegotiate2_Release(http_negotiate2); + } - return IHttpNegotiate2_GetRootSecurityId(This->http_negotiate2, pbSecurityId, - pcbSecurityId, dwReserved); + return hres; } #undef HTTPNEG2_THIS diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1dbc0a3..545c461 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -601,7 +601,6 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(QueryInterface_IHttpNegotiate); hres = IHttpNegotiate_BeginningTransaction(http_negotiate, urls[test_protocol], NULL, 0, &additional_headers); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate); CHECK_CALLED(BeginningTransaction); IHttpNegotiate_Release(http_negotiate); @@ -618,7 +617,6 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, sec_id, &size, 0); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate2); CHECK_CALLED(GetRootSecurityId); IHttpNegotiate2_Release(http_negotiate2); @@ -773,7 +771,6 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, SET_EXPECT(QueryInterface_IHttpNegotiate); SET_EXPECT(OnResponse); hres = IHttpNegotiate_OnResponse(http_negotiate, 200, header, NULL, NULL); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate); CHECK_CALLED(OnResponse); IHttpNegotiate_Release(http_negotiate); @@ -1951,7 +1948,6 @@ static BOOL test_bscholder(IBindStatusCallback *holder) SET_EXPECT(QueryInterface_IHttpNegotiate); SET_EXPECT(BeginningTransaction); hres = IHttpNegotiate_BeginningTransaction(http_negotiate_serv, urls[test_protocol], emptyW, 0, &wstr); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate); /* IE8 */ CHECK_CALLED(BeginningTransaction); ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); @@ -1980,7 +1976,6 @@ static BOOL test_bscholder(IBindStatusCallback *holder) SET_EXPECT(GetRootSecurityId); hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, (void*)0xdeadbeef, (void*)0xdeadbeef, 0); ok(hres == E_NOTIMPL, "GetRootSecurityId failed: %08x\n", hres); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate2); /* IE8 */ CHECK_CALLED(GetRootSecurityId); @@ -2001,7 +1996,6 @@ static BOOL test_bscholder(IBindStatusCallback *holder) wstr = (void*)0xdeadbeef; hres = IHttpNegotiate_OnResponse(http_negotiate, 200, emptyW, NULL, NULL); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); - todo_wine CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate); /* IE8 */ CHECK_CALLED(OnResponse);

1 0

Jacek Caban : urlmon: Fixed tests on IE8.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: c32925aecd31feb62d677b81a665bc2fa3905dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32925aecd31feb62d677b81a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 23 14:52:23 2009 +0200 urlmon: Fixed tests on IE8. --- dlls/urlmon/tests/url.c | 76 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 52 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c32925aecd31feb62d677…

1 0

Jacek Caban : urlmon.idl: Added IBindStatusCallbackEx declaration.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: c907d2bbdc6bf3981763bb99b28b96119f0d4794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c907d2bbdc6bf3981763bb99b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 23 15:08:30 2009 +0200 urlmon.idl: Added IBindStatusCallbackEx declaration. --- include/urlmon.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 13c09be..4e902a2 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -311,6 +311,45 @@ interface IBindStatusCallback : IUnknown } /***************************************************************************** + * IBindStatusCallbackEx interface + */ +[ + object, + uuid(aaa74ef9-8ee7-4659-88d9-f8c504da73cc), + pointer_default(unique) +] +interface IBindStatusCallbackEx : IBindStatusCallback +{ + typedef [unique] IBindStatusCallbackEx *LPBINDSTATUSCALLBACKEX; + + typedef enum { + BINDF2_DISABLEBASICOVERHTTP = 0x00000001, + BINDF2_DISABLEAUTOCOOKIEHANDLING = 0x00000002, + BINDF2_READ_DATA_GREATER_THAN_4GB = 0x00000004, + BINDF2_DISABLE_HTTP_REDIRECT_XSECURITYID = 0x00000008, + BINDF2_RESERVED_3 = 0x20000000, + BINDF2_RESERVED_2 = 0x40000000, + BINDF2_RESERVED_1 = 0x80000000, + } BINDF2; + + [local] + HRESULT GetBindInfoEx( + [out] DWORD *grfBINDF, + [in, out, unique] BINDINFO *pbindinfo, + [out] DWORD *grfBINDF2, + [out] DWORD *pdwReserved); + + [call_as(GetBindInfoEx)] + HRESULT RemoteGetBindInfoEx( + [out] DWORD *grfBINDF, + [in, out, unique] RemBINDINFO *pbindinfo, + [in, out, unique] RemSTGMEDIUM *pstgmed, + [out] DWORD *grfBINDF2, + [out] DWORD *pdwReserved); +} + + +/***************************************************************************** * IAuthenticate interface */ [

1 0

Jörg Höhle : winecfg: Provide trailing \ now required by GetVolumeInformation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 079074e006f94156807b57cfd5cc14b01609591f URL: http://source.winehq.org/git/wine.git/?a=commit;h=079074e006f94156807b57cfd… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 23 09:34:36 2009 +0200 winecfg: Provide trailing \ now required by GetVolumeInformation. --- programs/winecfg/drive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 1afeced..f536bd6 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -260,7 +260,7 @@ BOOL load_drives(void) { DWORD i, size = 1024; HANDLE mgr; - WCHAR root[] = {'A',':',0}; + WCHAR root[] = {'A',':','\\',0}; if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return FALSE;

1 0

Jörg Höhle : winedos: Provide trailing \ now required by GetVolumeInformation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: d3723a9e4443801a45145da494217e015b54742c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3723a9e4443801a45145da49… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 23 09:34:36 2009 +0200 winedos: Provide trailing \ now required by GetVolumeInformation. --- dlls/winedos/int21.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 16b2359..6fd131f 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -3419,7 +3419,7 @@ static BOOL INT21_NetworkFunc (CONTEXT86 *context) static int INT21_GetDiskSerialNumber( CONTEXT86 *context ) { BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); - WCHAR path[] = {'A',':',0}, label[11]; + WCHAR path[] = {'A',':','\\',0}, label[11]; DWORD serial; path[0] += INT21_MapDrive(BL_reg(context)); @@ -3877,7 +3877,7 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun if ((search_attr & ~(FA_UNUSED | FA_ARCHIVE | FA_RDONLY)) == FA_LABEL) { - WCHAR path[] = {' ',':',0}; + WCHAR path[] = {' ',':','\\',0}; if (count) return 0; path[0] = drive + 'A';

1 0

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 June 2009