April 2013 - Wine-Commits - list.winehq.org

Piotr Caban : mshtml: Allocate smaller cookies buffer size in HTMLDocument_get_cookie.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: b885ce8f55966f7d96a9eb297ba935cfd029f1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b885ce8f55966f7d96a9eb297… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:50:23 2013 +0200 mshtml: Allocate smaller cookies buffer size in HTMLDocument_get_cookie. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 36308f0..c6a7193 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -708,7 +708,7 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) return S_OK; } - *p = SysAllocStringLen(NULL, size-1); + *p = SysAllocStringLen(NULL, size/sizeof(WCHAR)-1); if(!*p) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : wined3d: Get rid of device-> view_ident.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: c371af0d5c49e08d7554ed73fec238136d29d377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c371af0d5c49e08d7554ed73f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:57 2013 +0200 wined3d: Get rid of device->view_ident. --- dlls/wined3d/device.c | 15 --------------- dlls/wined3d/state.c | 33 ++++++++------------------------- dlls/wined3d/stateblock.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 6 +----- 4 files changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4e18be8..7b6a253 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -53,17 +53,6 @@ const struct wined3d_light WINED3D_default_light = 0.0f /* Phi */ }; -/********************************************************** - * Global variable / Constants follow - **********************************************************/ -const struct wined3d_matrix identity = -{{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, -}}}; /* When needed for comparisons */ - /* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these * actually have the same values in GL and D3D. */ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) @@ -1208,8 +1197,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, create_dummy_textures(device, context); - /* Initialize the current view state */ - device->view_ident = 1; device->contexts[0]->last_was_rhw = 0; switch (wined3d_settings.offscreen_rendering_mode) @@ -1684,8 +1671,6 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->stateBlock->state.transforms[d3dts] = *matrix; - if (d3dts == WINED3D_TS_VIEW) - device->view_ident = !memcmp(matrix, &identity, sizeof(identity)); if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) device_invalidate_state(device, STATE_TRANSFORM(d3dts)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4eb466e..38b4153 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3801,19 +3801,10 @@ static void transform_world(struct wined3d_context *context, const struct wined3 } else { - /* In the general case, the view matrix is the identity matrix */ - if (context->swapchain->device->view_ident) - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - } - else - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); - checkGLcall("glMultMatrixf"); - } + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); + checkGLcall("glMultMatrixf"); } } @@ -3883,18 +3874,10 @@ static void transform_worldex(struct wined3d_context *context, const struct wine /* World matrix 0 is multiplied with the view matrix because d3d uses 3 * matrices while gl uses only 2. To avoid weighting the view matrix * incorrectly it has to be multiplied into every GL modelview matrix. */ - if (context->swapchain->device->view_ident) - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - } - else - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); - checkGLcall("glMultMatrixf"); - } + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); + checkGLcall("glMultMatrixf"); } static void state_vertexblend_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8e17d23..aaf425c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1161,6 +1161,13 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) unsigned int i; struct wined3d_swapchain *swapchain; struct wined3d_surface *backbuffer; + static const struct wined3d_matrix identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; TRACE("stateblock %p.\n", stateblock); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 438f4d1..73862cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -863,9 +863,6 @@ do { \ #define checkGLcall(A) do {} while(0) #endif -/* Global variables */ -extern const struct wined3d_matrix identity DECLSPEC_HIDDEN; - enum wined3d_ffp_idx { WINED3D_FFP_POSITION = 0, @@ -1704,7 +1701,6 @@ struct wined3d_device DWORD vs_clipping; UINT instance_count; - WORD view_ident : 1; /* true iff view matrix is identity */ WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ WORD isRecordingState : 1; WORD isInDraw : 1; @@ -1714,7 +1710,7 @@ struct wined3d_device WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ WORD useDrawStridedSlow : 1; WORD filter_messages : 1; - WORD padding : 6; + WORD padding : 7; BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */

1 0

Sergey Guralnik : extrac32: Add /D switch support.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 9d08045ad1f8766aeee18c9c0d83647fff3515b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d08045ad1f8766aeee18c9c0… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Mon Apr 22 10:43:17 2013 +0300 extrac32: Add /D switch support. --- programs/extrac32/extrac32.c | 46 ++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 2126c04..63205e8 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(extrac32); static BOOL force_mode; +static BOOL show_content; static void create_target_directory(LPWSTR Target) { @@ -56,12 +57,37 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par { case SPFILENOTIFY_FILEINCABINET: pInfo = (FILE_IN_CABINET_INFO_W*)Param1; - lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); - lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); - /* SetupIterateCabinet() doesn't create full path to target by itself, - so we should do it manually */ - create_target_directory(pInfo->FullTargetName); - return FILEOP_DOIT; + if(show_content) + { + FILETIME ft; + SYSTEMTIME st; + CHAR date[12], time[12], buf[2 * MAX_PATH]; + int count; + DWORD dummy; + + /* DosDate and DosTime already represented at local time */ + DosDateTimeToFileTime(pInfo->DosDate, pInfo->DosTime, &ft); + FileTimeToSystemTime(&ft, &st); + GetDateFormatA(0, 0, &st, "MM'-'dd'-'yyyy", date, sizeof date); + GetTimeFormatA(0, 0, &st, "HH':'mm':'ss", time, sizeof time); + count = wsprintfA(buf, "%s %s %c%c%c%c %15u %S\n", date, time, + pInfo->DosAttribs & FILE_ATTRIBUTE_ARCHIVE ? 'A' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_HIDDEN ? 'H' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_READONLY ? 'R' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_SYSTEM ? 'S' : '-', + pInfo->FileSize, pInfo->NameInCabinet); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, count, &dummy, NULL); + return FILEOP_SKIP; + } + else + { + lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); + lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + /* SetupIterateCabinet() doesn't create full path to target by itself, + so we should do it manually */ + create_target_directory(pInfo->FullTargetName); + return FILEOP_DOIT; + } case SPFILENOTIFY_FILEEXTRACTED: pFilePaths = (FILEPATHS_W*)Param1; WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target)); @@ -281,14 +307,14 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Copy file */ copy_file(cabfile, path); break; + case 'D': + /* Display CAB archive */ + show_content = TRUE; + /* Fall through */ case 'E': /* Extract CAB archive */ extract(cabfile, path); break; - case 'D': - /* Display CAB archive */ - WINE_FIXME("/D not implemented\n"); - break; } return 0; }

1 0

Piotr Caban : wininet: Load persistent cookies from other paths in get_cookie function.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 103693e43b97d9133ab8d0f9b5cacc8f7c540b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103693e43b97d9133ab8d0f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 15:43:31 2013 +0200 wininet: Load persistent cookies from other paths in get_cookie function. --- dlls/wininet/cookie.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 61aa53b..d20ad26 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -533,8 +533,11 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain) DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size) { + static const WCHAR empty_path[] = { '/',0 }; + unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; - WCHAR *ptr = cookie_data; + WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; + const WCHAR *p; cookie_domain *domain; FILETIME tm; @@ -542,8 +545,30 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD EnterCriticalSection(&cookie_cs); - load_persistent_cookie(host, path); + len = strlenW(host); + p = host+len; + while(p>host && p[-1]!='.') p--; + while(p != host) { + p--; + while(p>host && p[-1]!='.') p--; + if(p == host) break; + + load_persistent_cookie(p, empty_path); + } + + len = strlenW(path); + assert(len+1 < INTERNET_MAX_PATH_LENGTH); + memcpy(subpath, path, (len+1)*sizeof(WCHAR)); + ptr = subpath+len; + do { + *ptr = 0; + load_persistent_cookie(host, subpath); + + ptr--; + while(ptr>subpath && ptr[-1]!='/') ptr--; + }while(ptr != subpath); + ptr = cookie_data; LIST_FOR_EACH_ENTRY(domain, &domain_list, cookie_domain, entry) { struct list *cursor, *cursor2;

1 0

Stefan Dösinger : d3d9/tests: Add r500 fp_special results.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 6f8d25635d73f127005085754502621f271e718b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8d25635d73f127005085754… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:54 2013 +0200 d3d9/tests: Add r500 fp_special results. --- dlls/d3d9/tests/visual.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5069c57..772c299 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12385,6 +12385,7 @@ static void fp_special_test(IDirect3DDevice9 *device) const char *name; const DWORD *ops; DWORD size; + D3DCOLOR r500; D3DCOLOR r600; D3DCOLOR nv40; D3DCOLOR nv50; @@ -12403,17 +12404,17 @@ static void fp_special_test(IDirect3DDevice9 *device) * * There are considerable differences between graphics cards in how * these are handled, but pow and nrm never generate INF or NAN. */ - {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x0000ff00, 0x000000ff}, - {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x0000ff00, 0x00ff0000}, - {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, - {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x0000ff00, 0x00007f00}, - {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, - {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, + {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff}, + {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000}, + {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

Stefan Dösinger : d3d9/tests: Correct nv40 results.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 67e57c84b9992230cf2bc21fb8bb2104b8215871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e57c84b9992230cf2bc21fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:53 2013 +0200 d3d9/tests: Correct nv40 results. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 88c776a..5069c57 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12411,9 +12411,9 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, - {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x00007f00, 0x00007f00}, - {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, - {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, + {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x0000ff00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

Piotr Caban : mshtml: Added IOmHistory::get_length test.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 8bc118cf17309988ba7bf68954cbe33efd8241ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc118cf17309988ba7bf6895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:50:01 2013 +0200 mshtml: Added IOmHistory::get_length test. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7531a40..c8ed4d4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3309,10 +3309,13 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl) return E_NOTIMPL; } +static IBrowserService BrowserService; static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { CHECK_EXPECT(CountEntries); - return E_NOTIMPL; + + ok(punk == (IUnknown*)&BrowserService, "punk != &BrowserService (%p)\n", punk); + return 0; } static HRESULT WINAPI TravelLog_Revert(ITravelLog *iface) @@ -5761,6 +5764,29 @@ static void test_load_history(IHTMLDocument2 *doc) history_stream = NULL; } +static void test_OmHistory(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *win; + IOmHistory *hist; + short len; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &win); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_history(win, &hist); + ok(hres == S_OK, "get_history failed: %08x\n", hres); + IHTMLWindow2_Release(win); + + SET_EXPECT(CountEntries); + hres = IOmHistory_get_length(hist, &len); + CHECK_CALLED(CountEntries); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(len == 0, "len = %d\n", len); + + IOmHistory_Release(hist); +} + static void test_refresh(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; @@ -7292,6 +7318,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0); if(support_wbapp) { test_load_history(doc); + test_OmHistory(doc); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); }

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BOOL-> VARIANT.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: b4b45471ca988fa6a75967a1ffbef71cc8cf70ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b45471ca988fa6a75967a1f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 14:36:34 2013 +1000 oledb32: Implement DataConvert DBTYPE_BOOL->VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f2c4c29..07b9342 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -752,6 +752,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(src_type) { + case DBTYPE_BOOL: + V_VT(v) = VT_BOOL; + V_BOOL(v) = *(VARIANT_BOOL*)src; + hr = S_OK; + break; case DBTYPE_I4: V_VT(v) = VT_I4; V_I4(v) = *(signed int*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51dc0f6..58b6965 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2564,6 +2564,7 @@ static void test_converttovar(void) DATE date; INT i4; LARGE_INTEGER i8; + VARIANT_BOOL boolean = VARIANT_TRUE; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2617,6 +2618,16 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_VARIANT, sizeof(boolean), &dst_len, &boolean, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_BOOL, "got %d\n", V_VT(&dst)); + ok(V_BOOL(&dst) == VARIANT_TRUE, "got %d\n", V_BOOL(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Dan Kegel : user32: Add assembly wrapper for calling hook procedures.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: c9d1a1906e9342a707a63d73b4afffcc0577ed11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d1a1906e9342a707a63d73b… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Apr 24 08:15:56 2013 -0700 user32: Add assembly wrapper for calling hook procedures. --- dlls/user32/hook.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index c9e9e20..633704b 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -202,6 +202,48 @@ static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, return handle; } +#ifdef __i386__ +/* Some apps pass a non-stdcall proc to SetWindowsHookExA, + * so we need a small assembly wrapper to call the proc. + */ +extern LRESULT HOOKPROC_wrapper( HOOKPROC proc, + INT code, WPARAM wParam, LPARAM lParam ); +__ASM_GLOBAL_FUNC( HOOKPROC_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline LRESULT HOOKPROC_wrapper( HOOKPROC proc, + INT code, WPARAM wParam, LPARAM lParam ) +{ + return proc( code, wParam, lParam ); +} +#endif /* __i386__ */ + /*********************************************************************** * call_hook_AtoW @@ -210,7 +252,8 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; UNICODE_STRING usBuffer; - if (id != WH_CBT || code != HCBT_CREATEWND) ret = proc( code, wparam, lparam ); + if (id != WH_CBT || code != HCBT_CREATEWND) + ret = HOOKPROC_wrapper( proc, code, wparam, lparam ); else { CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lparam; @@ -233,7 +276,7 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); csW.lpszClass = classW = usBuffer.Buffer; } - ret = proc( code, wparam, (LPARAM)&cbtcwW ); + ret = HOOKPROC_wrapper( proc, code, wparam, (LPARAM)&cbtcwW ); cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; HeapFree( GetProcessHeap(), 0, nameW ); HeapFree( GetProcessHeap(), 0, classW ); @@ -249,7 +292,8 @@ static LRESULT call_hook_WtoA( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; - if (id != WH_CBT || code != HCBT_CREATEWND) ret = proc( code, wparam, lparam ); + if (id != WH_CBT || code != HCBT_CREATEWND) + ret = HOOKPROC_wrapper( proc, code, wparam, lparam ); else { CBT_CREATEWNDW *cbtcwW = (CBT_CREATEWNDW *)lparam; @@ -277,7 +321,7 @@ static LRESULT call_hook_WtoA( HOOKPROC proc, INT id, INT code, WPARAM wparam, L csA.lpszClass = classA; } - ret = proc( code, wparam, (LPARAM)&cbtcwA ); + ret = HOOKPROC_wrapper( proc, code, wparam, (LPARAM)&cbtcwA ); cbtcwW->hwndInsertAfter = cbtcwA.hwndInsertAfter; HeapFree( GetProcessHeap(), 0, nameA ); HeapFree( GetProcessHeap(), 0, classA );

1 0

Piotr Caban : wininet: Fix cache container prefix initialization.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: cf227b5f237b73d28f764a32e1955788e7b392fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf227b5f237b73d28f764a32e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:25:19 2013 +0200 wininet: Fix cache container prefix initialization. --- dlls/wininet/urlcache.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 34337c6..f0a731b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -698,11 +698,11 @@ static void cache_container_close_index(cache_container *pContainer) pContainer->mapping = NULL; } -static BOOL cache_containers_add(LPCWSTR cache_prefix, - LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) +static BOOL cache_containers_add(const char *cache_prefix, LPCWSTR path, + DWORD default_entry_type, LPWSTR mutex_name) { cache_container *pContainer = heap_alloc(sizeof(cache_container)); - int cache_prefix_len = strlenW(cache_prefix); + int cache_prefix_len = strlen(cache_prefix); if (!pContainer) { @@ -720,7 +720,7 @@ static BOOL cache_containers_add(LPCWSTR cache_prefix, return FALSE; } - pContainer->cache_prefix = heap_alloc((cache_prefix_len + 1) * sizeof(WCHAR)); + pContainer->cache_prefix = heap_alloc(cache_prefix_len+1); if (!pContainer->cache_prefix) { heap_free(pContainer->path); @@ -728,7 +728,7 @@ static BOOL cache_containers_add(LPCWSTR cache_prefix, return FALSE; } - memcpy(pContainer->cache_prefix, cache_prefix, (cache_prefix_len + 1) * sizeof(WCHAR)); + memcpy(pContainer->cache_prefix, cache_prefix, cache_prefix_len+1); CharLowerW(mutex_name); cache_container_create_object_name(mutex_name, '!'); @@ -760,22 +760,19 @@ static void cache_container_delete_container(cache_container *pContainer) static void cache_containers_init(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; - static const WCHAR UrlPrefix[] = {0}; static const WCHAR HistorySuffix[] = {'H','i','s','t','o','r','y','.','I','E','5',0}; - static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; static const WCHAR CookieSuffix[] = {0}; - static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; static const struct { int nFolder; /* CSIDL_* constant */ - const WCHAR * shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ - const WCHAR * cache_prefix; /* prefix used to reference the container */ + const WCHAR *shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ + const char *cache_prefix; /* prefix used to reference the container */ DWORD default_entry_type; } DefaultContainerData[] = { - { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix, NORMAL_CACHE_ENTRY }, - { CSIDL_HISTORY, HistorySuffix, HistoryPrefix, URLHISTORY_CACHE_ENTRY }, - { CSIDL_COOKIES, CookieSuffix, CookiePrefix, COOKIE_CACHE_ENTRY }, + { CSIDL_INTERNET_CACHE, UrlSuffix, "", NORMAL_CACHE_ENTRY }, + { CSIDL_HISTORY, HistorySuffix, "Visited:", URLHISTORY_CACHE_ENTRY }, + { CSIDL_COOKIES, CookieSuffix, "Cookie:", COOKIE_CACHE_ENTRY }, }; DWORD i;

1 0