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

Stefan Dösinger : wined3d: Work around a bad crash in fglrx.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 668328a697aaed3a7863c8c7e099e99471774bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=668328a697aaed3a7863c8c7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 6 19:36:08 2009 +0200 wined3d: Work around a bad crash in fglrx. --- dlls/wined3d/context.c | 10 ++++------ dlls/wined3d/directx.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 15 +++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a510d2e..2c6703f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -895,12 +895,10 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } } - if(GL_SUPPORT(ARB_POINT_SPRITE)) { - for(s = 0; s < GL_LIMITS(textures); s++) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); - } + for(s = 0; s < GL_LIMITS(point_sprite_units); s++) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); } LEAVE_GL(); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 61927fc..d1f851a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1014,7 +1014,11 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } - + if(gl_info->supported[ARB_POINT_SPRITE]) { + gl_info->max_point_sprite_units = gl_info->max_textures; + } else { + gl_info->max_point_sprite_units = 0; + } } checkGLcall("extension detection\n"); @@ -4031,6 +4035,13 @@ static BOOL match_apple_nonr500ati(const WineD3D_GL_Info *gl_info) { return TRUE; } +static BOOL match_fglrx(const WineD3D_GL_Info *gl_info) { + if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; + if(match_apple(gl_info)) return FALSE; + if(strstr(gl_info->gl_renderer, "DRI")) return FALSE; /* Filter out Mesa DRI drivers */ + return TRUE; +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; @@ -4048,6 +4059,26 @@ static void quirk_apple_glsl_constants(WineD3D_GL_Info *gl_info) { gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } +/* fglrx crashes with a very bad kernel panic if GL_POINT_SPRITE_ARB is set to GL_COORD_REPLACE_ARB + * on more than one texture unit. This means that the d3d9 visual point size test will cause a + * kernel panic on any machine running fglrx 9.3(latest that supports r300 to r500 cards). This + * quirk only enables point sprites on the first texture unit. This keeps point sprites working in + * most games, but avoids the crash + * + * A more sophisticated way would be to find all units that need texture coordinates and enable + * point sprites for one if only one is found, and software emulate point sprites in drawStridedSlow + * if more than one unit needs texture coordinates(This requires software ffp and vertex shaders though) + * + * Note that disabling the extension entirely does not gain predictability because there is no point + * sprite capability flag in d3d, so the potential rendering bugs are the same if we disable the extension. + */ +static void quirk_one_point_sprite(WineD3D_GL_Info *gl_info) { + if(gl_info->supported[ARB_POINT_SPRITE]) { + TRACE("Limiting point sprites to one texture unit\n"); + gl_info->max_point_sprite_units = 1; + } +} + static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { quirk_arb_constants(gl_info); @@ -4146,6 +4177,11 @@ struct driver_quirk quirk_table[] = { match_apple_nonr500ati, quirk_texcoord_w, "Init texcoord .w for Apple ATI >= r600 GPU driver" + }, + { + match_fglrx, + quirk_one_point_sprite, + "Fglrx point sprite crash workaround" } }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b1fbadf..ad1593c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1503,14 +1503,25 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + BOOL warned = FALSE; /* TODO: NV_POINT_SPRITE */ - if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - TRACE("Point sprites not supported\n"); + if (!warned && stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { + /* A FIXME, not a WARN because point sprites should be software emulated if not supported by HW */ + FIXME("Point sprites not supported\n"); + warned = TRUE; } } static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { + BOOL warned = FALSE; + if(GL_LIMITS(point_sprite_units) < GL_LIMITS(textures) && !warned) { + if(use_ps(stateblock) || stateblock->lowest_disabled_stage > GL_LIMITS(point_sprite_units)) { + FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n"); + warned = TRUE; + } + } + glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2072391..1a9c925 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3933,6 +3933,7 @@ typedef struct _WineD3D_GL_Info { UINT max_texture_size; UINT max_texture3d_size; float max_pointsize, max_pointsizemin; + UINT max_point_sprite_units; UINT max_blends; UINT max_anisotropy; UINT max_glsl_varyings;

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_glsl_get_register_name().
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 4a18697246f3111ef95930fadf7cf8fffeb5e048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a18697246f3111ef95930fad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 78 +++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a18697246f3111ef9593…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_is_scalar().
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 96005c0fcaeecf97c55c2b1fa0504aa011681d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96005c0fcaeecf97c55c2b1fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_is_scalar(). --- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3be9422..92be8dc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1242,7 +1242,7 @@ static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *p { DWORD mask = param->write_mask; - if (shader_is_scalar(param->reg.type, param->reg.idx)) + if (shader_is_scalar(&param->reg)) { mask = WINED3DSP_WRITEMASK_0; *write_mask = '\0'; @@ -1285,7 +1285,7 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param, BOOL fixup, DWORD mask, char *swizzle_str) { - if (shader_is_scalar(param->reg.type, param->reg.idx)) + if (shader_is_scalar(&param->reg)) *swizzle_str = '\0'; else shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); @@ -1970,7 +1970,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0].reg.type, ins->src[0].reg.idx)) + if (shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8bda76a..2b63364 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2594,13 +2594,13 @@ static inline BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) { - switch (register_type) + switch (reg->type) { case WINED3DSPR_RASTOUT: /* oFog & oPts */ - if (register_idx != 0) return TRUE; + if (reg->idx != 0) return TRUE; /* oPos */ return FALSE; @@ -2611,7 +2611,7 @@ static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_t return TRUE; case WINED3DSPR_MISCTYPE: - switch(register_idx) + switch(reg->idx) { case 0: /* vPos */ return FALSE;

1 0

Henri Verbeet : wined3d: Group register information into struct wined3d_shader_register.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 5e473cb17f69d60a506e96e6ffb3467f3e4f48b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e473cb17f69d60a506e96e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:07 2009 +0200 wined3d: Group register information into struct wined3d_shader_register. --- dlls/wined3d/arb_program_shader.c | 116 ++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 58 +++++++++--------- dlls/wined3d/glsl_shader.c | 95 ++++++++++++++++--------------- dlls/wined3d/shader_sm1.c | 12 ++-- dlls/wined3d/shader_sm4.c | 24 ++++---- dlls/wined3d/vertexshader.c | 6 +- dlls/wined3d/wined3d_private.h | 19 ++++--- 7 files changed, 168 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e473cb17f69d60a506e9…

1 0

Henri Verbeet : wined3d: Fix shader_glsl_get_register_name() indentation.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 448dc84b6eb39f6f33d7c45ec2446a53221cd9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=448dc84b6eb39f6f33d7c45ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:07 2009 +0200 wined3d: Fix shader_glsl_get_register_name() indentation. --- dlls/wined3d/glsl_shader.c | 279 ++++++++++++++++++++++---------------------- 1 files changed, 142 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448dc84b6eb39f6f33d7c…

1 0

Henri Verbeet : wined3d: Add support for immediate constants to the GLSL backend.
by Alexandre Julliard May 8, 2009

May 8, 2009

Module: wine Branch: master Commit: 69cbb57bfde091039b30050cee8d17374b1da58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cbb57bfde091039b30050ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 7 16:36:08 2009 +0200 wined3d: Add support for immediate constants to the GLSL backend. --- dlls/wined3d/glsl_shader.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92be8dc..0370fde 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1220,6 +1220,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } break; + case WINED3DSPR_IMMCONST: + switch (reg->immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + break; + + case WINED3D_IMMCONST_FLOAT4: + sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", + *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], + *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + break; + + default: + FIXME("Unhandled immconst type %#x\n", reg->immconst_type); + sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); + } + break; + default: FIXME("Unhandled register name Type(%d)\n", reg->type); sprintf(register_name, "unrecognized_register"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b63364..c5f74fb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2621,6 +2621,15 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) return FALSE; } + case WINED3DSPR_IMMCONST: + switch(reg->immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + return TRUE; + default: + return FALSE; + } + default: return FALSE; }

1 0

Giuseppe Bilotta : comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 585c3abb6b9ab2ab558e6c963e7fb0cbf339ede2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585c3abb6b9ab2ab558e6c963… Author: Giuseppe Bilotta <giuseppe.bilotta(a)gmail.com> Date: Thu May 7 11:13:16 2009 +0200 comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size. --- dlls/comctl32/toolbar.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c5aa8f4..867bac8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3435,9 +3435,6 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) INT nIndex; LPWSTR lpText; - if (lParam == 0) - return -1; - nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) return -1; @@ -3445,7 +3442,7 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); return WideCharToMultiByte( CP_ACP, 0, lpText, -1, - (LPSTR)lParam, 0x7fffffff, NULL, NULL ) - 1; + (LPSTR)lParam, lParam ? 0x7fffffff : 0, NULL, NULL ) - 1; }

1 0

Giuseppe Bilotta : comctl32/toolbar: Skip iString field for separators.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: fcc9b57c7aee38fa9d47ed55b7e274188cdb76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b57c7aee38fa9d47ed55b… Author: Giuseppe Bilotta <giuseppe.bilotta(a)gmail.com> Date: Thu May 7 11:13:15 2009 +0200 comctl32/toolbar: Skip iString field for separators. --- dlls/comctl32/toolbar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c3add77..c5aa8f4 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1841,7 +1841,9 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; btnPtr->dwData = lpTbb[iButton].dwData; - if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) + if (btnPtr->fsStyle & BTNS_SEP) + btnPtr->iString = -1; + else if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) { if (fUnicode) Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString );

1 0

Detlef Riekenberg : winspool: Move remaining Xcv support to the backend.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 0bc112cfe48fecd86ce6538f62d611ed0d448342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc112cfe48fecd86ce6538f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 7 00:11:33 2009 +0200 winspool: Move remaining Xcv support to the backend. --- dlls/localspl/provider.c | 69 +++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 88 ++++------------------------------------------ 2 files changed, 75 insertions(+), 82 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4e3289d..79541db 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1724,6 +1724,73 @@ static BOOL WINAPI fpOpenPrinter(LPWSTR lpPrinterName, HANDLE *pPrinter, return (*pPrinter != 0); } +/****************************************************************************** + * fpXcvData [exported through PRINTPROVIDOR] + * + * Execute commands in the Printmonitor DLL + * + * PARAMS + * hXcv [i] Handle from fpOpenPrinter (with XcvMonitor or XcvPort) + * pszDataName [i] Name of the command to execute + * pInputData [i] Buffer for extra Input Data (needed only for some commands) + * cbInputData [i] Size in Bytes of Buffer at pInputData + * pOutputData [o] Buffer to receive additional Data (needed only for some commands) + * cbOutputData [i] Size in Bytes of Buffer at pOutputData + * pcbOutputNeeded [o] PTR to receive the minimal Size in Bytes of the Buffer at pOutputData + * pdwStatus [o] PTR to receive the win32 error code from the Printmonitor DLL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Returning "TRUE" does mean, that the Printmonitor DLL was called successful. + * The execution of the command can still fail (check pdwStatus for ERROR_SUCCESS). + * + * Minimal List of commands, that a Printmonitor DLL should support: + * + *| "MonitorUI" : Return the Name of the Userinterface-DLL as WSTR in pOutputData + *| "AddPort" : Add a Port + *| "DeletePort": Delete a Port + * + * Many Printmonitors support additional commands. Examples for localspl.dll: + * "GetDefaultCommConfig", "SetDefaultCommConfig", + * "GetTransmissionRetryTimeout", "ConfigureLPTPortCommandOK" + * + */ +static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, + DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, + PDWORD pcbOutputNeeded, PDWORD pdwStatus) +{ + printer_t *printer = (printer_t * ) hXcv; + + TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName), + pInputData, cbInputData, pOutputData, + cbOutputData, pcbOutputNeeded, pdwStatus); + + if (!printer || (!printer->hXcv)) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!pcbOutputNeeded) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pszDataName || !pdwStatus || (!pOutputData && (cbOutputData > 0))) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + *pcbOutputNeeded = 0; + + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + return TRUE; +} + /***************************************************** * setup_provider [internal] */ @@ -1806,7 +1873,7 @@ void setup_provider(void) NULL, /* fpAddPerMachineConnection */ NULL, /* fpDeletePerMachineConnection */ NULL, /* fpEnumPerMachineConnections */ - NULL, /* fpXcvData */ + fpXcvData, fpAddPrinterDriverEx, NULL, /* fpSplReadPrinter */ NULL, /* fpDriverUnloadComplete */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d2a40d0..95908b3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -109,8 +109,6 @@ typedef struct { typedef struct { LPWSTR name; LPWSTR printername; - monitor_t *pm; - HANDLE hXcv; HANDLE backend_printer; jobqueue_t *queue; started_doc_t *doc; @@ -244,8 +242,6 @@ static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static const WCHAR emptyStringW[] = {0}; -static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; -static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; @@ -1127,9 +1123,6 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault opened_printer_t *printer = NULL; LPWSTR servername; LPCWSTR printername; - HKEY hkeyPrinters; - HKEY hkeyPrinter; - DWORD len; if ((backend == NULL) && !load_backend()) return NULL; @@ -1207,69 +1200,6 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault goto end; } - if (printername) { - len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; - if (strncmpW(printername, XcvMonitorW, len) == 0) { - /* OpenPrinter(",XcvMonitor " detected */ - TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); - printer->pm = monitor_load(&printername[len], NULL); - if (printer->pm == NULL) { - SetLastError(ERROR_UNKNOWN_PORT); - handle = 0; - goto end; - } - } - else - { - len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; - if (strncmpW( printername, XcvPortW, len) == 0) { - /* OpenPrinter(",XcvPort " detected */ - TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); - printer->pm = monitor_load_by_port(&printername[len]); - if (printer->pm == NULL) { - SetLastError(ERROR_UNKNOWN_PORT); - handle = 0; - goto end; - } - } - } - - if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } - if (printer->hXcv == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); - handle = 0; - goto end; - } - } - else - { - /* Does the Printer exist? */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - handle = 0; - goto end; - } - if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { - WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); - handle = 0; - goto end; - } - RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); - } - } - else - { - TRACE("using the local printserver\n"); - } - if(queue) printer->queue = queue; else @@ -1290,8 +1220,6 @@ end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { /* Something failed: Free all resources */ - if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); - monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); @@ -2897,9 +2825,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { struct list *cursor, *cursor2; - TRACE("%p: %s (hXcv: %p) for %s (doc: %p)\n", printer->pm, - debugstr_w(printer->pm ? printer->pm->dllname : NULL), - printer->hXcv, debugstr_w(printer->name), printer->doc ); + TRACE("closing %s (doc: %p)\n", debugstr_w(printer->name), printer->doc); if (printer->backend_printer) { backend->fpClosePrinter(printer->backend_printer); @@ -2917,8 +2843,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) } HeapFree(GetProcessHeap(), 0, printer->queue); } - if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); - monitor_unload(printer->pm); + HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); HeapFree(GetProcessHeap(), 0, printer); @@ -7088,8 +7013,10 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); + if ((backend == NULL) && !load_backend()) return FALSE; + printer = get_opened_printer(hXcv); - if (!printer || (!printer->hXcv)) { + if (!printer || (!printer->backend_printer)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -7106,10 +7033,9 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, - pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + return backend->fpXcvData(printer->backend_printer, pszDataName, pInputData, + cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); - return TRUE; } /*****************************************************************************

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::PreserveKey.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 45c3ff2ff827bbc11d39a15ba524e55e5b65ab9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c3ff2ff827bbc11d39a15ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 08:31:32 2009 -0500 msctf: Implement ITfKeystrokeMgr::PreserveKey. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 59 +++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8d6579b..d29b319 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -409,7 +409,7 @@ static void test_KeystrokeMgr(void) todo_wine ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); - todo_wine ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index fcd4dae..5580410 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -56,6 +56,15 @@ typedef struct tagThreadMgrSink { } interfaces; } ThreadMgrSink; +typedef struct tagPreservedKey +{ + struct list entry; + GUID guid; + TF_PRESERVEDKEY prekey; + LPWSTR description; + TfClientId tid; +} PreservedKey; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; @@ -68,6 +77,8 @@ typedef struct tagACLMulti { ITfDocumentMgr *focus; + struct list CurrentPreservedKeys; + /* kept as separate lists to reduce unnecessary iterations */ struct list ActiveLanguageProfileNotifySink; struct list DisplayAttributeNotifySink; @@ -155,6 +166,14 @@ static void ThreadMgr_Destructor(ThreadMgr *This) free_sink(sink); } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + } + HeapFree(GetProcessHeap(),0,This); } @@ -537,8 +556,42 @@ static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, const WCHAR *pchDesc, ULONG cchDesc) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + PreservedKey *newkey; + + TRACE("(%p) %x %s (%x,%x) %s\n",This,tid, debugstr_guid(rguid),(prekey)?prekey->uVKey:0,(prekey)?prekey->uModifiers:0,debugstr_wn(pchDesc,cchDesc)); + + if (!tid || ! rguid || !prekey || (cchDesc && !pchDesc)) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && prekey->uVKey == key->prekey.uVKey && prekey->uModifiers == key->prekey.uModifiers) + return TF_E_ALREADY_EXISTS; + } + + newkey = HeapAlloc(GetProcessHeap(),0,sizeof(PreservedKey)); + if (!newkey) + return E_OUTOFMEMORY; + + newkey->guid = *rguid; + newkey->prekey = *prekey; + newkey->tid = tid; + if (cchDesc) + { + newkey->description = HeapAlloc(GetProcessHeap(),0,cchDesc * sizeof(WCHAR)); + if (!newkey->description) + { + HeapFree(GetProcessHeap(),0,newkey); + return E_OUTOFMEMORY; + } + memcpy(newkey->description, pchDesc, cchDesc*sizeof(WCHAR)); + } + + list_add_head(&This->CurrentPreservedKeys,&newkey->entry); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, @@ -866,6 +919,8 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); + list_init(&This->CurrentPreservedKeys); + list_init(&This->ActiveLanguageProfileNotifySink); list_init(&This->DisplayAttributeNotifySink); list_init(&This->KeyTraceEventSink);

1 0