August 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : winecfg: Update the Romanian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 11fe130cc7afd11cc05d0a512aef0de8a20960e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fe130cc7afd11cc05d0a512… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 17 23:26:44 2009 +0200 winecfg: Update the Romanian translation. --- programs/winecfg/Ro.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index f12949f..5626018 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -124,6 +124,16 @@ BEGIN PUSHBUTTON "Renunță",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Selecția literei de disc" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Renunță",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

Jörg Höhle : wined3d: Check GL_SUPPORT prior to an ARB occlusion call.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 7763da811bdee8ef1bfec9f18763c45b799d41ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7763da811bdee8ef1bfec9f18… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Aug 14 18:12:49 2009 +0200 wined3d: Check GL_SUPPORT prior to an ARB occlusion call. --- dlls/wined3d/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 87416b7..ea664aa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -675,7 +675,8 @@ static void context_destroy_gl_resources(struct wined3d_context *context) GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); } - GL_EXTCALL(glDeleteQueriesARB(context->free_occlusion_query_count, context->free_occlusion_queries)); + if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) + GL_EXTCALL(glDeleteQueriesARB(context->free_occlusion_query_count, context->free_occlusion_queries)); if (GL_SUPPORT(APPLE_FENCE)) GL_EXTCALL(glDeleteFencesAPPLE(context->free_event_query_count, context->free_event_queries));

1 0

Alexandre Julliard : server: Don' t use the cached file mode when setting the security descriptor.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: da1784bb9ea65e5021dfade5acaab14362f67657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1784bb9ea65e5021dfade5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 17:26:51 2009 +0200 server: Don't use the cached file mode when setting the security descriptor. --- server/change.c | 16 ++++++---------- server/file.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/server/change.c b/server/change.c index 2b940fe..06d9e37 100644 --- a/server/change.c +++ b/server/change.c @@ -342,6 +342,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, { struct dir *dir = (struct dir *)obj; const SID *owner; + struct stat st; mode_t mode; int unix_fd; @@ -349,7 +350,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, unix_fd = get_dir_unix_fd( dir ); - if (unix_fd == -1) return 1; + if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) return 1; if (set_info & OWNER_SECURITY_INFORMATION) { @@ -372,18 +373,13 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = dir->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (dir->mode != mode) + if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) { - if (fchmod( unix_fd, mode ) == -1) - { - file_set_error(); - return 0; - } - - dir->mode = mode; + file_set_error(); + return 0; } } return 1; diff --git a/server/file.c b/server/file.c index bbcd6f4..a74de14 100644 --- a/server/file.c +++ b/server/file.c @@ -535,6 +535,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd { struct file *file = (struct file *)obj; const SID *owner; + struct stat st; mode_t mode; int unix_fd; @@ -542,7 +543,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd unix_fd = get_file_unix_fd( file ); - if (unix_fd == -1) return 1; + if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) return 1; if (set_info & OWNER_SECURITY_INFORMATION) { @@ -567,18 +568,13 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = file->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (file->mode != mode) + if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) { - if (fchmod( unix_fd, mode ) == -1) - { - file_set_error(); - return 0; - } - - file->mode = mode; + file_set_error(); + return 0; } } return 1;

1 0

Alexandre Julliard : server: Properly initialize mode and uid for file and directory objects.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 74a63029c7ba4ea8079983a69dbbe681335a7d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a63029c7ba4ea8079983a69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 17:18:54 2009 +0200 server: Properly initialize mode and uid for file and directory objects. --- server/change.c | 4 +++- server/file.c | 3 ++- server/file.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/change.c b/server/change.c index 773fa1c..2b940fe 100644 --- a/server/change.c +++ b/server/change.c @@ -1108,7 +1108,7 @@ static int dir_add_to_existing_notify( struct dir *dir ) #endif /* USE_INOTIFY */ -struct object *create_dir_obj( struct fd *fd ) +struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ) { struct dir *dir; @@ -1123,6 +1123,8 @@ struct object *create_dir_obj( struct fd *fd ) dir->inode = NULL; grab_object( fd ); dir->fd = fd; + dir->mode = mode; + dir->uid = ~(uid_t)0; set_fd_user( fd, &dir_fd_ops, &dir->obj ); dir_add_to_existing_notify( dir ); diff --git a/server/file.c b/server/file.c index 98017b9..bbcd6f4 100644 --- a/server/file.c +++ b/server/file.c @@ -147,6 +147,7 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_ if (!file) return NULL; file->access = access; file->mode = mode; + file->uid = ~(uid_t)0; file->fd = fd; grab_object( fd ); set_fd_user( fd, &file_fd_ops, &file->obj ); @@ -206,7 +207,7 @@ static struct object *create_file( const char *nameptr, data_size_t len, unsigne if (!fd) goto done; if (S_ISDIR(mode)) - obj = create_dir_obj( fd ); + obj = create_dir_obj( fd, access, mode ); else if (S_ISCHR(mode) && is_serial_fd( fd )) obj = create_serial( fd ); else diff --git a/server/file.h b/server/file.h index aef40f7..77de546 100644 --- a/server/file.h +++ b/server/file.h @@ -120,7 +120,7 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner extern void do_change_notify( int unix_fd ); extern void sigio_callback(void); -extern struct object *create_dir_obj( struct fd *fd ); +extern struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ); /* completion */

1 0

Huw Davies : widl: Add a structure packing command line option.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: bbb3a85c51c05aa42ed4eeff5f27911d0e98e46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb3a85c51c05aa42ed4eeff5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 17 15:16:54 2009 +0100 widl: Add a structure packing command line option. --- tools/widl/typegen.c | 13 ++++++++++++- tools/widl/widl.c | 10 ++++++++-- tools/widl/widl.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b820430..dc22fb2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -108,6 +108,7 @@ const char *string_of_type(unsigned char type) case RPC_FC_CARRAY: return "FC_CARRAY"; case RPC_FC_CVARRAY: return "FC_CVARRAY"; case RPC_FC_BOGUS_ARRAY: return "FC_BOGUS_ARRAY"; + case RPC_FC_ALIGNM2: return "FC_ALIGNM2"; case RPC_FC_ALIGNM4: return "FC_ALIGNM4"; case RPC_FC_ALIGNM8: return "FC_ALIGNM8"; case RPC_FC_POINTER: return "FC_POINTER"; @@ -1094,6 +1095,7 @@ static unsigned int field_memsize(const type_t *type, unsigned int *offset) static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { unsigned int size = 0; + unsigned int max_align; const var_t *v; if (!fields) return 0; @@ -1102,11 +1104,15 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); if (*align < falign) *align = falign; + if (falign > packing) falign = packing; size = ROUND_SIZE(size, falign); size += fsize; } - size = ROUND_SIZE(size, *align); + max_align = *align; + if(max_align > packing) max_align = packing; + size = ROUND_SIZE(size, max_align); + return size; } @@ -1144,6 +1150,7 @@ int get_padding(const var_list_t *fields) type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); + if (align > packing) align = packing; if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; @@ -2210,6 +2217,7 @@ static void write_struct_members(FILE *file, const type_t *type, type_t *ft = field->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); + if(align > packing) align = packing; if (salign < align) salign = align; if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) @@ -2219,6 +2227,9 @@ static void write_struct_members(FILE *file, const type_t *type, unsigned char fc = 0; switch (align) { + case 2: + fc = RPC_FC_ALIGNM2; + break; case 4: fc = RPC_FC_ALIGNM4; break; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 98e7a51..38e05cf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -44,7 +44,6 @@ #include "header.h" /* future options to reserve characters for: */ -/* a = alignment of structures */ /* A = ACF input filename */ /* J = do not search standard include path */ /* O = generate interpreted stubs */ @@ -53,6 +52,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" +" -a n Set structure alignment to 'n'\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" " -C file Name of client stub file (default is infile_c.c)\n" @@ -111,6 +111,7 @@ int no_preprocess = 0; int old_names = 0; int do_win32 = 1; int do_win64 = 1; +int packing = 8; char *input_name; char *header_name; @@ -153,7 +154,7 @@ enum { }; static const char short_options[] = - "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; + "a:b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { { "dlldata", 1, 0, DLLDATA_OPTION }, { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, @@ -521,6 +522,11 @@ int main(int argc,char *argv[]) do_win32 = 0; do_win64 = 1; break; + case 'a': + packing = strtol(optarg, NULL, 0); + if(packing != 2 && packing != 4 && packing != 8) + error("Packing must be one of 2, 4 or 8\n"); + break; case 'b': set_target( optarg ); break; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index e34e64b..d6a46fc 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -46,6 +46,7 @@ extern int do_dlldata; extern int old_names; extern int do_win32; extern int do_win64; +extern int packing; extern char *input_name; extern char *header_name;

1 0

Huw Davies : rpcrt4: Add support for FC_ALIGNM2.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 70804336aa72130e25d714921e604b79e568c6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70804336aa72130e25d714921… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 17 14:35:31 2009 +0100 rpcrt4: Add support for FC_ALIGNM2. --- dlls/rpcrt4/ndr_marshall.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1777c49..9846d9e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2727,6 +2727,9 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void *); break; } + case RPC_FC_ALIGNM2: + ALIGN_POINTER(pMemory, 2); + break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); break; @@ -2852,6 +2855,9 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void *); break; } + case RPC_FC_ALIGNM2: + ALIGN_POINTER_CLEAR(pMemory, 2); + break; case RPC_FC_ALIGNM4: ALIGN_POINTER_CLEAR(pMemory, 4); break; @@ -2966,6 +2972,9 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pPointer += 4; pMemory += sizeof(void*); break; + case RPC_FC_ALIGNM2: + ALIGN_POINTER(pMemory, 2); + break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); break; @@ -3049,6 +3058,9 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, pPointer += 4; pMemory += sizeof(void *); break; + case RPC_FC_ALIGNM2: + ALIGN_POINTER(pMemory, 2); + break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); break; @@ -3161,6 +3173,9 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, size += sizeof(void *); break; } + case RPC_FC_ALIGNM2: + ALIGN_LENGTH(size, 2); + break; case RPC_FC_ALIGNM4: ALIGN_LENGTH(size, 4); break; @@ -3224,6 +3239,9 @@ ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_POINTER: size += sizeof(void *); break; + case RPC_FC_ALIGNM2: + ALIGN_LENGTH(size, 2); + break; case RPC_FC_ALIGNM4: ALIGN_LENGTH(size, 4); break;

1 0

Huw Davies : include: Add ALIGNM2 format character.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 86f0634dae9d2c2825f8dba5e7de36f2d4cfb8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f0634dae9d2c2825f8dba5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 17 14:29:50 2009 +0100 include: Add ALIGNM2 format character. --- include/wine/rpcfc.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 34878e2..ee7ba7f 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -87,6 +87,7 @@ #define RPC_FC_POINTER 0x36 +#define RPC_FC_ALIGNM2 0x37 #define RPC_FC_ALIGNM4 0x38 #define RPC_FC_ALIGNM8 0x39

1 0

Michael Karcher : server: Don't report LOAD_DLL debug event for exe module.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: a0eb2ed4134bce2bbe3a811789ff19c2627a3e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0eb2ed4134bce2bbe3a81178… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Mon Aug 17 09:19:53 2009 +0200 server: Don't report LOAD_DLL debug event for exe module. --- dlls/kernel32/tests/process.c | 9 +++++++++ server/debugger.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d8087a6..21f3c52 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1241,6 +1241,7 @@ static void test_SuspendFlag(void) static void test_DebuggingFlag(void) { char buffer[MAX_PATH]; + void *processbase = NULL; PROCESS_INFORMATION info; STARTUPINFOA startup, us; DEBUG_EVENT de; @@ -1261,7 +1262,15 @@ static void test_DebuggingFlag(void) { ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + if (!dbg) + { + ok(de.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, + "first event: %d\n", de.dwDebugEventCode); + processbase = de.u.CreateProcessInfo.lpBaseOfImage; + } if (de.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) dbg++; + ok(de.dwDebugEventCode != LOAD_DLL_DEBUG_EVENT || + de.u.LoadDll.lpBaseOfDll != processbase, "got LOAD_DLL for main module\n"); } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); ok(dbg, "I have seen a debug event\n"); diff --git a/server/debugger.c b/server/debugger.c index c01ab45..faade98 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -514,7 +514,7 @@ void generate_startup_debug_events( struct process *process, client_ptr_t entry /* generate dll events (in loading order, i.e. reverse list order) */ ptr = list_tail( &process->dlls ); - while (ptr) + while (ptr != list_head( &process->dlls )) { struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll );

1 0

Rein Klazes : winecfg: Let the user specify the drive letter of a to be added drive.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 9d6d3b3b3c76f9cba64c3ecff00143dee715b613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6d3b3b3c76f9cba64c3ecff… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Aug 16 20:37:10 2009 +0200 winecfg: Let the user specify the drive letter of a to be added drive. --- programs/winecfg/En.rc | 10 +++++++++ programs/winecfg/Nl.rc | 10 +++++++++ programs/winecfg/driveui.c | 48 ++++++++++++++++++++++++++++++++++++++++++- programs/winecfg/resource.h | 2 + 4 files changed, 69 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 049aaa7..6aa5120 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -124,6 +124,16 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Select Drive Letter" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 4cd45f0..2fbba6a 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -125,6 +125,16 @@ BEGIN PUSHBUTTON "Annuleren",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Selecteer Stationsletter" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index de54f21..87af06c 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -291,6 +291,47 @@ static void on_options_click(HWND dialog) SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); } +static INT_PTR CALLBACK drivechoose_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static int i, sel; + char c; + char drive[] = "X:"; + + switch(uMsg) + { + case WM_INITDIALOG: + { + ULONG mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ + for( c = 'A'; c<= 'Z'; c++){ + drive[0] = c; + if(!( mask & (1 << (c - 'A')))) + SendDlgItemMessageA( hwndDlg, IDC_DRIVESA2Z, CB_ADDSTRING, 0, (LPARAM) drive); + } + drive[0] = lParam; + SendDlgItemMessageA( hwndDlg, IDC_DRIVESA2Z, CB_SELECTSTRING, 0, (LPARAM) drive); + return TRUE; + } + case WM_COMMAND: + if(HIWORD(wParam) != BN_CLICKED) break; + switch (LOWORD(wParam)) + { + case IDOK: + i = SendDlgItemMessageA( hwndDlg, IDC_DRIVESA2Z, CB_GETCURSEL, 0, 0); + if( i != CB_ERR){ + SendDlgItemMessageA( hwndDlg, IDC_DRIVESA2Z, CB_GETLBTEXT, i, (LPARAM) drive); + sel = drive[0]; + } else + sel = -1; + EndDialog(hwndDlg, sel); + return TRUE; + case IDCANCEL: + EndDialog(hwndDlg, -1); + return TRUE; + } + } + return FALSE; +} + static void on_add_click(HWND dialog) { /* we should allocate a drive letter automatically. We also need @@ -313,7 +354,12 @@ static void on_add_click(HWND dialog) } } - WINE_TRACE("allocating drive letter %c\n", new); + + new = DialogBoxParam(0, MAKEINTRESOURCE(IDD_DRIVECHOOSE), dialog, drivechoose_dlgproc, new); + + if( new == -1) return; + + WINE_TRACE("selected drive letter %c\n", new); if (new == 'C') { diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 27736b7..f006861 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -146,6 +146,8 @@ #define IDS_COL_DRIVELETTER 8208 #define IDS_COL_DRIVEMAPPING 8209 #define IDS_NO_DRIVE_C 8210 +#define IDD_DRIVECHOOSE 8211 +#define IDC_DRIVESA2Z 8212 /* graphics */ #define IDC_ENABLE_MANAGED 1100

1 0

Alexandre Julliard : winex11: Add handling of take focus event on the desktop window.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 12d1ff8ef6c34533a20008f4cfeb73ee4c601a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d1ff8ef6c34533a20008f4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 16:32:45 2009 +0200 winex11: Add handling of take focus event on the desktop window. --- dlls/winex11.drv/event.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c746546..9a489cd 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -566,6 +566,14 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) return; } } + else if (hwnd == GetDesktopWindow()) + { + hwnd = GetForegroundWindow(); + if (!hwnd) hwnd = last_focus; + if (!hwnd) hwnd = GetDesktopWindow(); + set_focus( event->display, hwnd, event_time ); + return; + } /* try to find some other window to give the focus to */ hwnd = GetFocus(); if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT );

1 0