wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Henri Verbeet : wined3d: Add an initial shader_sm4_read_src_param() implementation.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 9381a416811a38e73fb8cd50f5b84e2a4bd7f969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381a416811a38e73fb8cd50f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:46 2009 +0200 wined3d: Add an initial shader_sm4_read_src_param() implementation. --- dlls/wined3d/shader_sm4.c | 70 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 9 +++++ 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cdfaa08..5ec8688 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -31,14 +31,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) +#define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 +#define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3 << WINED3D_SM4_IMMCONST_TYPE_SHIFT) + #define WINED3D_SM4_WRITEMASK_SHIFT 4 #define WINED3D_SM4_WRITEMASK_MASK (0xf << WINED3D_SM4_WRITEMASK_SHIFT) +#define WINED3D_SM4_SWIZZLE_SHIFT 4 +#define WINED3D_SM4_SWIZZLE_MASK (0xff << WINED3D_SM4_SWIZZLE_SHIFT) + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, +}; + +enum wined3d_sm4_immconst_type +{ + WINED3D_SM4_IMMCONST_FLOAT = 0x1, + WINED3D_SM4_IMMCONST_FLOAT4 = 0x2, }; struct wined3d_sm4_data @@ -48,9 +61,11 @@ struct wined3d_sm4_data static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, }; static void *shader_sm4_init(const DWORD *byte_code) @@ -101,8 +116,53 @@ static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) { - FIXME("ptr %p, src_param %p, src_rel_addr %p, shader_version %#x stub!\n", - ptr, src_param, src_rel_addr, shader_version); + DWORD token = *(*ptr)++; + enum wined3d_sm4_register_type register_type; + + register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; + if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + { + FIXME("Unhandled register type %#x\n", register_type); + src_param->register_type = WINED3DSPR_TEMP; + } + else + { + src_param->register_type = register_type_table[register_type]; + } + + if (register_type == WINED3D_SM4_RT_IMMCONST) + { + enum wined3d_sm4_immconst_type immconst_type = + (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; + src_param->swizzle = WINED3DSP_NOSWIZZLE; + + switch(immconst_type) + { + case WINED3D_SM4_IMMCONST_FLOAT: + src_param->immconst_type = WINED3D_IMMCONST_FLOAT; + memcpy(src_param->immconst_data, *ptr, 1 * sizeof(DWORD)); + *ptr += 1; + break; + + case WINED3D_SM4_IMMCONST_FLOAT4: + src_param->immconst_type = WINED3D_IMMCONST_FLOAT4; + memcpy(src_param->immconst_data, *ptr, 4 * sizeof(DWORD)); + *ptr += 4; + break; + + default: + FIXME("Unhandled immediate constant type %#x\n", immconst_type); + break; + } + } + else + { + src_param->register_idx = *(*ptr)++; + src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; + } + + src_param->modifiers = 0; + src_param->rel_addr = NULL; } static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85811e7..38c8e1e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -322,8 +322,15 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_MISCTYPE = 17, WINED3DSPR_LABEL = 18, WINED3DSPR_PREDICATE = 19, + WINED3DSPR_IMMCONST, } WINED3DSHADER_PARAM_REGISTER_TYPE; +enum wined3d_immconst_type +{ + WINED3D_IMMCONST_FLOAT, + WINED3D_IMMCONST_FLOAT4, +}; + typedef enum _WINED3DVS_RASTOUT_OFFSETS { WINED3DSRO_POSITION = 0, @@ -645,6 +652,8 @@ struct wined3d_shader_src_param DWORD swizzle; DWORD modifiers; const struct wined3d_shader_src_param *rel_addr; + enum wined3d_immconst_type immconst_type; + DWORD immconst_data[4]; }; struct wined3d_shader_instruction

1 0

Henri Verbeet : wined3d: Add an initial shader_sm4_read_dst_param() implementation.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 7f9cde5a31af9bd682f3b3e6b35024fdc822b58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9cde5a31af9bd682f3b3e6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:46 2009 +0200 wined3d: Add an initial shader_sm4_read_dst_param() implementation. --- dlls/wined3d/shader_sm4.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 99b6523..cdfaa08 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,11 +28,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_OPCODE_MASK 0xff +#define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 +#define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) + +#define WINED3D_SM4_WRITEMASK_SHIFT 4 +#define WINED3D_SM4_WRITEMASK_MASK (0xf << WINED3D_SM4_WRITEMASK_SHIFT) + +enum wined3d_sm4_register_type +{ + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, +}; + struct wined3d_sm4_data { const DWORD *end; }; +static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = +{ + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, +}; + static void *shader_sm4_init(const DWORD *byte_code) { struct wined3d_sm4_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); @@ -88,8 +108,26 @@ static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_s static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version) { - FIXME("ptr %p, dst_param %p, dst_rel_addr %p, shader_version %#x stub!\n", - ptr, dst_param, dst_rel_addr, shader_version); + DWORD token = *(*ptr)++; + UINT register_idx = *(*ptr)++; + enum wined3d_sm4_register_type register_type; + + register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; + if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + { + FIXME("Unhandled register type %#x\n", register_type); + dst_param->register_type = WINED3DSPR_TEMP; + } + else + { + dst_param->register_type = register_type_table[register_type]; + } + + dst_param->register_idx = register_idx; + dst_param->write_mask = (token & WINED3D_SM4_WRITEMASK_MASK) >> WINED3D_SM4_WRITEMASK_SHIFT; + dst_param->modifiers = 0; + dst_param->shift = 0; + dst_param->rel_addr = NULL; } static void shader_sm4_read_semantic(const DWORD **ptr, struct wined3d_shader_semantic *semantic)

1 0

Henri Verbeet : wined3d: Shift the writemask in the frontend.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 699eae0cf7461bf6bc771ef5dae03ff99a4cb57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=699eae0cf7461bf6bc771ef5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:45 2009 +0200 wined3d: Shift the writemask in the frontend. --- dlls/wined3d/shader_sm1.c | 6 +++++- dlls/wined3d/wined3d_private.h | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index a353f48..d13df03 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -76,6 +76,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3DSP_DSTSHIFT_SHIFT 24 #define WINED3DSP_DSTSHIFT_MASK (0xf << WINED3DSP_DSTSHIFT_SHIFT) +/* Write mask */ +#define WINED3D_SM1_WRITEMASK_SHIFT 16 +#define WINED3D_SM1_WRITEMASK_MASK (0xf << WINED3D_SM1_WRITEMASK_SHIFT) + /* Swizzle mask */ #define WINED3DSP_SWIZZLE_SHIFT 16 #define WINED3DSP_SWIZZLE_MASK (0xff << WINED3DSP_SWIZZLE_SHIFT) @@ -351,7 +355,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->register_idx = param & WINED3DSP_REGNUM_MASK; - dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; + dst->write_mask = (param & WINED3D_SM1_WRITEMASK_MASK) >> WINED3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->rel_addr = rel_addr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 282814a..85811e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -351,11 +351,11 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE WINED3DSPSM_NOT = 13, } WINED3DSHADER_PARAM_SRCMOD_TYPE; -#define WINED3DSP_WRITEMASK_0 0x00010000 /* .x r */ -#define WINED3DSP_WRITEMASK_1 0x00020000 /* .y g */ -#define WINED3DSP_WRITEMASK_2 0x00040000 /* .z b */ -#define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */ -#define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */ +#define WINED3DSP_WRITEMASK_0 0x1 /* .x r */ +#define WINED3DSP_WRITEMASK_1 0x2 /* .y g */ +#define WINED3DSP_WRITEMASK_2 0x4 /* .z b */ +#define WINED3DSP_WRITEMASK_3 0x8 /* .w a */ +#define WINED3DSP_WRITEMASK_ALL 0xf /* all */ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE {

1 0

Henri Verbeet : wined3d: Fix some more indentation.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 2576bf3dddf4fd6d1d3e2c2ede54dcb8f3cf4295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2576bf3dddf4fd6d1d3e2c2ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:45 2009 +0200 wined3d: Fix some more indentation. --- dlls/wined3d/pixelshader.c | 156 +++++++++++++++++++++--------------------- dlls/wined3d/vertexshader.c | 116 ++++++++++++++++---------------- 2 files changed, 135 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2576bf3dddf4fd6d1d3e2…

1 0

Henri Verbeet : wined3d: Remove some redundant code.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 46b4c15a3165c3c375a1c2a729e8d4c14cb6e863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b4c15a3165c3c375a1c2a72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:44 2009 +0200 wined3d: Remove some redundant code. --- dlls/wined3d/pixelshader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 108f5d3..5dcd5ae 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -341,18 +341,10 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps CONST DWORD *function = This->baseShader.function; GLuint retval; SHADER_BUFFER buffer; - const struct wined3d_shader_frontend *fe; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; TRACE("(%p) : function %p\n", This, function); - fe = shader_select_frontend(This->baseShader.reg_maps.shader_version); - if (!fe) - { - FIXME("Unable to find frontend for shader.\n"); - return WINED3DERR_INVALIDCALL; - } - pixelshader_update_samplers(&This->baseShader.reg_maps, ((IWineD3DDeviceImpl *)This->baseShader.device)->stateBlock->textures);

1 0

Rein Klazes : programs: Make some of the open file dialogs of a few programs resizable.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 9e8f2a70243205f4d7a33c8e02a0cad55c952209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8f2a70243205f4d7a33c8e0… Author: Rein Klazes <wijn(a)online.nl> Date: Wed May 6 08:41:15 2009 +0200 programs: Make some of the open file dialogs of a few programs resizable. --- programs/notepad/dialog.c | 4 ++-- programs/oleview/oleview.c | 2 +- programs/regedit/framewnd.c | 1 + programs/winhlp32/winhelp.c | 2 +- programs/wordpad/wordpad.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 8a3389b..65f9b09 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -306,7 +306,7 @@ VOID DIALOG_FileOpen(VOID) openfilename.nMaxFile = SIZEOF(szPath); openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | - OFN_HIDEREADONLY; + OFN_HIDEREADONLY | OFN_ENABLESIZING; openfilename.lpstrDefExt = szDefaultExt; @@ -345,7 +345,7 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.nMaxFile = SIZEOF(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | - OFN_HIDEREADONLY; + OFN_HIDEREADONLY | OFN_ENABLESIZING; saveas.lpstrDefExt = szDefaultExt; if (GetSaveFileName(&saveas)) { diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index e56342c..5f0fdc5 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -137,7 +137,7 @@ static void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter, pofn->nFilterIndex = 0; pofn->lpstrFile = wszFileName; pofn->nMaxFile = MAX_LOAD_STRING; - pofn->Flags = OFN_HIDEREADONLY; + pofn->Flags = OFN_HIDEREADONLY | OFN_ENABLESIZING; } static void CopyClsid(HTREEITEM item) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d88ef0e..a737d8d 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -341,6 +341,7 @@ static BOOL ImportRegistryFile(HWND hWnd) WCHAR title[128]; InitOpenFileName(hWnd, &ofn); + ofn.Flags |= OFN_ENABLESIZING; LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ddd58ad..7f74d8b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -179,7 +179,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) openfilename.nMaxFileTitle = 0; openfilename.lpstrInitialDir = szDir; openfilename.lpstrTitle = 0; - openfilename.Flags = 0; + openfilename.Flags = OFN_ENABLESIZING; openfilename.nFileOffset = 0; openfilename.nFileExtension = 0; openfilename.lpstrDefExt = 0; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a8a7fb0..022b9b1 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -870,7 +870,7 @@ static void DialogSaveFile(void) ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); - sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; + sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; sfn.hwndOwner = hMainWnd; sfn.lpstrFilter = wszFilter; sfn.lpstrFile = wszFile; @@ -964,7 +964,7 @@ static void DialogOpenFile(void) ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = wszFilter; ofn.lpstrFile = wszFile;

1 0

Rein Klazes : winecfg: Make the open file dialogs resizable.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 64dbec13ef523efe46e6d9653e280a6c2b434875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dbec13ef523efe46e6d9653… Author: Rein Klazes <wijn(a)online.nl> Date: Wed May 6 08:41:14 2009 +0200 winecfg: Make the open file dialogs resizable. --- programs/winecfg/appdefaults.c | 3 ++- programs/winecfg/theme.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 28ec4fe..8e48949 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -319,7 +319,8 @@ static void on_add_app_click(HWND dialog) OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, /*hInst*/0, 0, NULL, 0, 0, NULL, 0, NULL, 0, pathC, 0, - OFN_SHOWHELP | OFN_HIDEREADONLY, 0, 0, NULL, 0, NULL }; + OFN_SHOWHELP | OFN_HIDEREADONLY | OFN_ENABLESIZING, + 0, 0, NULL, 0, NULL }; LoadStringW (GetModuleHandle (NULL), IDS_SELECT_EXECUTABLE, selectExecutableStr, sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0])); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 537a113..afbd6de 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -642,7 +642,7 @@ static void on_theme_install(HWND dialog) ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); ofn.lpstrInitialDir = NULL; ofn.lpstrTitle = title; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; ofn.nFileOffset = 0; ofn.nFileExtension = 0; ofn.lpstrDefExt = NULL;

1 0

Francois Gouget : notepad: Make NOTEPAD_DoReplace(All)?() static.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: cdc82702ba48dd73b41b4b11ffd13a1d47d0bd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc82702ba48dd73b41b4b11f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:34:02 2009 +0200 notepad: Make NOTEPAD_DoReplace(All)?() static. --- programs/notepad/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 5d462a0..fcea9e3 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -415,7 +415,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } -void NOTEPAD_DoReplace(FINDREPLACE *fr) +static void NOTEPAD_DoReplace(FINDREPLACE *fr) { LPTSTR content; int len = lstrlen(fr->lpstrFindWhat); @@ -447,7 +447,7 @@ void NOTEPAD_DoReplace(FINDREPLACE *fr) NOTEPAD_DoFind(fr); } -void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) +static void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) { LPTSTR content; LPTSTR found;

1 0

Francois Gouget : rpcrt4: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 082147d906cc5db3f0cf901008da2849b4e6ebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082147d906cc5db3f0cf90100… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 6 03:43:50 2009 +0200 rpcrt4: Remove WINAPI on static functions where not needed. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 390a7d4..d078d69 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1808,7 +1808,7 @@ typedef struct _HttpTimerThreadData HANDLE timer_cancelled; } HttpTimerThreadData; -static VOID CALLBACK rpcrt4_http_keep_connection_active_timer_proc(PVOID param, BOOLEAN dummy) +static VOID rpcrt4_http_keep_connection_active_timer_proc(PVOID param, BOOLEAN dummy) { HINTERNET in_request = param; RpcPktHdr *idle_pkt;

1 0

Francois Gouget : credui: Remove spaces before '\n'.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 5ecc5f73d25e3cf5b8d8149037957a56a68ee9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecc5f73d25e3cf5b8d814903… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 6 03:43:12 2009 +0200 credui: Remove spaces before '\n'. --- dlls/credui/credui_Ro.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 73a1140..3d3367e 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -47,7 +47,7 @@ STRINGTABLE DISCARDABLE IDS_INCORRECTPASSWORDTITLE "Autentificare eșuată" IDS_INCORRECTPASSWORD "Verificați numele de utilizator și parola." IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" - IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit. \n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." + IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } #pragma code_page(default)

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
80
Older →

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